Commit Graph

10614 Commits

Author SHA1 Message Date
Fabien Potencier
5ada72e161 Merge branch '2.6' into 2.7
* 2.6:
  fixed wrong merge
2014-12-02 22:48:45 +01:00
Fabien Potencier
7a5762c198 Merge branch '2.5' into 2.6
* 2.5:
  fixed wrong merge
2014-12-02 22:48:38 +01:00
Fabien Potencier
b8a37bdf34 fixed wrong merge 2014-12-02 22:48:32 +01:00
Fabien Potencier
eee117285a Merge branch '2.6' into 2.7
* 2.6:
  Configure firewall's kernel exception listener with configured entry point or a default entry point
  PSR-2 fixes
  [DependencyInjection] make paths relative to __DIR__ in the generated container
  [FrameworkBundle][Router Cmd] use debug namespace.
  [FrameworkBundle] Update deprecated service call
  Removed a dev annotation from a version constraint
  Fixed the syntax of a composer.json file
  Fixed the symfony/config version constraint
  Tweaked the password-compat version constraint
  Docblock fixes
  [Filesystem] fix lock file permissions
  Remove dialog usage
  define constant only if it wasn't defined before
  Fix incorrect spanish translation
  Fixed typos
  Fixed a docblock
  bumped Symfony version to 2.6.1
  updated VERSION for 2.6.0
  updated CHANGELOG for 2.6.0
  removed unneeded check

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-12-02 21:19:50 +01:00
Fabien Potencier
83ee704816 Merge branch '2.5' into 2.6
* 2.5:
  Configure firewall's kernel exception listener with configured entry point or a default entry point
  PSR-2 fixes
  [DependencyInjection] make paths relative to __DIR__ in the generated container
  Fixed the syntax of a composer.json file
  Fixed the symfony/config version constraint
  Tweaked the password-compat version constraint
  Docblock fixes
  Remove dialog usage
  define constant only if it wasn't defined before
  Fix incorrect spanish translation
  Fixed typos

Conflicts:
	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/OptionsResolver/Options.php
	src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
	src/Symfony/Component/Process/ProcessPipes.php
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
	src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
	src/Symfony/Component/Validator/ConstraintViolation.php
	src/Symfony/Component/Yaml/Inline.php
	src/Symfony/Component/Yaml/Parser.php
2014-12-02 21:19:20 +01:00
Fabien Potencier
ab1e9f3f81 Merge branch '2.3' into 2.5
* 2.3:
  Configure firewall's kernel exception listener with configured entry point or a default entry point
  PSR-2 fixes
  [DependencyInjection] make paths relative to __DIR__ in the generated container
  Fixed the syntax of a composer.json file
  Fixed the symfony/config version constraint
  Tweaked the password-compat version constraint
  Docblock fixes
  define constant only if it wasn't defined before
  Fix incorrect spanish translation
  Fixed typos

Conflicts:
	composer.json
	src/Symfony/Bridge/Twig/TwigEngine.php
	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
	src/Symfony/Component/HttpFoundation/Response.php
	src/Symfony/Component/HttpFoundation/StreamedResponse.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
	src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
	src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	src/Symfony/Component/Stopwatch/StopwatchEvent.php
	src/Symfony/Component/Stopwatch/StopwatchPeriod.php
	src/Symfony/Component/Templating/PhpEngine.php
	src/Symfony/Component/Templating/TemplateReference.php
	src/Symfony/Component/Templating/TemplateReferenceInterface.php
	src/Symfony/Component/Translation/TranslatorInterface.php
	src/Symfony/Component/Validator/ConstraintViolation.php
	src/Symfony/Component/Validator/ExecutionContextInterface.php
	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
	src/Symfony/Component/Validator/MetadataFactoryInterface.php
2014-12-02 21:15:53 +01:00
Graham Campbell
eda746bad5 PSR-2 fixes 2014-12-02 19:42:47 +00:00
Fabien Potencier
b604b0ae75 bug #12784 [DependencyInjection] make paths relative to __DIR__ in the generated container (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] make paths relative to __DIR__ in the generated container

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6484, #3079, partially #9238, #10894, #10999
| License       | MIT
| Doc PR        | n/a

This is an alternative approach to #10999 for removing absolute paths from the generated container:
instead of trying to fix the container file after it has been dumped, telling to the PhpDumper where its output will be written allows it to replace parts of strings by an equivalent value based on `__DIR__`.
This should be safe, thus the PR is on 2.3.

Commits
-------

edd7057 [DependencyInjection] make paths relative to __DIR__ in the generated container
2014-12-02 13:16:33 +01:00
Nicolas Grekas
edd705716a [DependencyInjection] make paths relative to __DIR__ in the generated container 2014-12-02 11:32:16 +01:00
Fabien Potencier
c68ff54aac minor #12774 Docblock Fixes (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

Docblock Fixes

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A

##### This pull request fixes the docblock alignment as requested in #12760.

It was also necessary for me to ensure the `@return` annotations were correctly separated in order to accurately align the `@param` annotations.

Commits
-------

443307e Docblock fixes
2014-11-30 17:59:09 +01:00
Jason Woods
ada9a58f55 Fix PHP Fatal error: Cannot call constructor in symfony/console/Symfony/Component/Console/Helper/DialogHelper.php on line 37 2014-11-30 15:28:47 +00:00
Graham Campbell
f703e5661a Tweaked the password-compat version constraint 2014-11-30 14:39:13 +00:00
Graham Campbell
443307edc1 Docblock fixes 2014-11-30 13:33:44 +00:00
Fabien Potencier
9c6b377116 minor #12763 [Validator] [Deprecated] Add a deprecation note about ElementMetadata (davidromani)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] [Deprecated] Add a deprecation note about ElementMetadata

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #12682
| License       | MIT
| Doc PR        |

Commits
-------

21c32b5 add trigger message
2014-11-30 13:49:41 +01:00
Fabien Potencier
0d32310448 minor #12759 Append to PR #12737 referring Ticket #12704 (rodrigobb)
This PR was squashed before being merged into the 2.7 branch (closes #12759).

Discussion
----------

Append to PR #12737 referring Ticket #12704

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12704
| License       | MIT
| Doc PR        | -

Commits
-------

b57ce38 Append to PR #12737 referring Ticket #12704
2014-11-30 13:47:13 +01:00
Rodrigo Borrego Bernabé
b57ce38bf0 Append to PR #12737 referring Ticket #12704 2014-11-30 13:47:11 +01:00
Fabien Potencier
03aa6f7622 minor #12671 Issue #12658 Add a deprecation note about Translator's setFallbackLocale... (javiernuber)
This PR was squashed before being merged into the 2.7 branch (closes #12671).

Discussion
----------

Issue #12658 Add a deprecation note about Translator's setFallbackLocale...

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #12658
| License       | MIT
| Doc PR        |

Commits
-------

cd05026 Issue #12658 Add a deprecation note about Translator's setFallbackLocale...
2014-11-30 12:28:39 +01:00
Fco Javier Núñez Berrocoso
cd0502660d Issue #12658 Add a deprecation note about Translator's setFallbackLocale... 2014-11-30 12:28:38 +01:00
Fabien Potencier
996ac0b714 minor #12680 Issue #12606 Adding warning logs about the deprecation of [...]/Tests/FormIntegration... (csuarez)
This PR was squashed before being merged into the 2.7 branch (closes #12680).

Discussion
----------

Issue #12606 Adding warning logs about the deprecation of [...]/Tests/FormIntegration...

This fixes Issue #12606

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #12606
| License       | MIT
| Doc PR        | x

Commits
-------

2267749 Issue #12606 Adding warning logs about the deprecation of [...]/Tests/FormIntegration...
2014-11-30 12:27:42 +01:00
César Suárez Ortega
226774966e Issue #12606 Adding warning logs about the deprecation of [...]/Tests/FormIntegration... 2014-11-30 12:27:41 +01:00
Fabien Potencier
bfc5c06d3b minor #12699 Hackday deprecated 12621 (arnaugm)
This PR was squashed before being merged into the 2.7 branch (closes #12699).

Discussion
----------

Hackday deprecated 12621

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12621
| License       | MIT
| Doc PR        | -

[MonologBridge] added the deprecated error trigger in the monolog logger emerg(), crit(), err() and warn() methods
[HttpKernel] added the deprecated error trigger in the NullLogger emerg(), crit(), err() and warn() methods

Commits
-------

88b9500 Hackday deprecated 12621
2014-11-30 12:26:29 +01:00
Arnau González
88b9500c8b Hackday deprecated 12621 2014-11-30 12:26:28 +01:00
Fabien Potencier
445fabd336 minor #12723 Added deprecation log for validate and validateValue on ExecutionContext... (Lenard Palko)
This PR was squashed before being merged into the 2.7 branch (closes #12723).

Discussion
----------

Added deprecation log for validate and validateValue on ExecutionContext...

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #12685
| License       | MIT
| Doc PR        |

Commits
-------

deeb652 Added deprecation log for validate and validateValue on ExecutionContext...
2014-11-30 12:24:21 +01:00
Lenard Palko
deeb652bf9 Added deprecation log for validate and validateValue on ExecutionContext... 2014-11-30 12:24:19 +01:00
Fabien Potencier
590b4f358d minor #12734 [Console] [Hackday] [2.7] Add a deprecation note about ProgressHelper (mrcmorales)
This PR was squashed before being merged into the 2.7 branch (closes #12734).

Discussion
----------

[Console] [Hackday] [2.7]  Add a deprecation note about ProgressHelper

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #12706
| License       | MIT
| Doc PR        |

Commits
-------

69fa99a [Console] [Hackday] [2.7]  Add a deprecation note about ProgressHelper
2014-11-30 12:21:08 +01:00
Marc Morales Valldepérez
69fa99a6a6 [Console] [Hackday] [2.7] Add a deprecation note about ProgressHelper 2014-11-30 12:21:07 +01:00
Fabien Potencier
c65864e0a8 minor #12738 [Hackday][2.7] Add a deprecation note about MetadataInterface's accept() method (snoek09)
This PR was squashed before being merged into the 2.7 branch (closes #12738).

Discussion
----------

[Hackday][2.7] Add a deprecation note about MetadataInterface's accept() method

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12676
| License       | MIT

Commits
-------

171377d [Hackday][2.7] Add a deprecation note about MetadataInterface's accept() method
2014-11-30 12:19:53 +01:00
Henry Snoek
171377df7a [Hackday][2.7] Add a deprecation note about MetadataInterface's accept() method 2014-11-30 12:19:51 +01:00
Fabien Potencier
f7bb10a6e0 minor #12745 [Validator] Added a deprecation note about setPropertyAccessor #12698 (MICKtheBIG)
This PR was squashed before being merged into the 2.7 branch (closes #12745).

Discussion
----------

[Validator] Added a deprecation note about setPropertyAccessor #12698

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #12698
| License       | MIT
| Doc PR        |

Commits
-------

c82dc5e [Validator] Added a deprecation note about setPropertyAccessor #12698
2014-11-30 12:18:55 +01:00
Michael Pohlers
c82dc5e21f [Validator] Added a deprecation note about setPropertyAccessor #12698 2014-11-30 12:18:54 +01:00
Fabien Potencier
910a30c0e9 minor #12746 [Locale] Adding a deprecation note about the Locale component (rodrigobb)
This PR was squashed before being merged into the 2.7 branch (closes #12746).

Discussion
----------

[Locale] Adding a deprecation note about the Locale component

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12635
| License       | MIT
| Doc PR        | -

Commits
-------

5580a4f [Locale] Adding a deprecation note about the Locale component
2014-11-30 12:17:45 +01:00
Rodrigo Borrego Bernabé
5580a4f349 [Locale] Adding a deprecation note about the Locale component 2014-11-30 12:17:44 +01:00
Fabien Potencier
b32395bd88 minor #12753 [Validator] added a deprecation note about MetadataFactoryInterface (Ismail Faizi)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] added a deprecation note about MetadataFactoryInterface

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12690
| License       | MIT
| Doc PR        |

Commits
-------

33fa8ff [Validator] added a deprecation note about MetadataFactoryInterface addressing #12690
2014-11-30 12:15:54 +01:00
Fabien Potencier
62a61c34e9 minor #12755 [Validator][Hackday] [2.7] Add a deprecation note about ValidationVisito... (neoshadybeat)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator][Hackday] [2.7] Add a deprecation note about ValidationVisito...

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #12755
| License       | MIT
| Doc PR        | none

Commits
-------

786e509 [Validator][Hackday] [2.7] Add a deprecation note about ValidationVisitorInterface and ValidationVisitor #12675
2014-11-30 12:14:16 +01:00
Nicolas Grekas
ceecb502f8 [Filesystem] fix lock file permissions 2014-11-30 11:30:45 +01:00
David Romaní
f216c819ed [ClassLoader] Add a deprecation note about UniversalClassLoader class 2014-11-30 09:19:10 +01:00
blanchonvincent
844aa54aa2 Remove dialog usage 2014-11-30 09:03:32 +01:00
David Romaní
21c32b5923 add trigger message 2014-11-29 20:05:15 +01:00
Ismail Faizi
33fa8ff25d [Validator] added a deprecation note about MetadataFactoryInterface addressing #12690 2014-11-29 19:16:10 +01:00
Fabien Potencier
c6cc3ebfbe minor #12724 Resolves #12623 [Hackday] [2.7] Add a deprecation note about Debug compo... (davidfuhr)
This PR was merged into the 2.7 branch.

Discussion
----------

Resolves #12623 [Hackday] [2.7] Add a deprecation note about Debug compo...

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #12623
| License       | MIT
| Doc PR        |

Commits
-------

5876f52 [Hackday] [2.7] Add a deprecation note about Debug component classes
2014-11-29 16:35:18 +01:00
David Fuhr
5876f520d4 [Hackday] [2.7] Add a deprecation note about Debug component classes
Resolves #12623
2014-11-29 16:32:40 +01:00
Fabien Potencier
fc41d22043 minor #12732 Ticket 12710 (ioannah)
This PR was squashed before being merged into the 2.7 branch (closes #12732).

Discussion
----------

Ticket 12710

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #12710
| License       | MIT
| Doc PR        |

Commits
-------

ba524b8 Ticket 12710
2014-11-29 16:32:11 +01:00
Ioana Hazsda
ba524b8779 Ticket 12710 2014-11-29 16:32:10 +01:00
neoshadybeat
786e50957f [Validator][Hackday] [2.7] Add a deprecation note about ValidationVisitorInterface and ValidationVisitor #12675 2014-11-29 16:25:47 +01:00
Fabien Potencier
ab16213267 minor #12756 [PHPUnit] ignore E_USER_DEPRECATED notices (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[PHPUnit] ignore E_USER_DEPRECATED notices

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

This updates the PHPUnit configuration files that have not been
updated in #12705.

Commits
-------

dcc1103 [PHPUnit] ignore E_USER_DEPRECATED notices
2014-11-29 16:18:56 +01:00
Christian Flothmann
dcc1103a16 [PHPUnit] ignore E_USER_DEPRECATED notices
This updates the PHPUnit configuration files that have not been
updated in #12705.
2014-11-29 16:15:10 +01:00
Fabien Potencier
6e20596c6a minor #12737 [Console] Adding a deprecation note about DialogHelper (rodrigobb)
This PR was squashed before being merged into the 2.7 branch (closes #12737).

Discussion
----------

[Console] Adding a deprecation note about DialogHelper

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #12704
| License       | MIT
| Doc PR        | -

Commits
-------

673c253 [Console] Adding a deprecation note about DialogHelper
2014-11-29 16:11:49 +01:00
Rodrigo Borrego Bernabé
673c25372b [Console] Adding a deprecation note about DialogHelper 2014-11-29 16:11:48 +01:00
Fabien Potencier
3467bf0e98 minor #12736 [Valid] [Validator] [Constraints] [DEPRECATION] Added deprication note on Valid constraint validator for deep option. (Balazs Csaba)
This PR was merged into the 2.7 branch.

Discussion
----------

[Valid] [Validator] [Constraints] [DEPRECATION] Added deprication note on Valid constraint validator for deep option.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #12695
| License       | MIT
| Doc PR        | -

Commits
-------

46f1eb0 Added deprication note on Valid constraint validator for deep option.
2014-11-29 16:05:59 +01:00
Fabien Potencier
ebcf5dc166 minor #12726 Deprecate interface Symfony\Component\Validator\ExecutionContextInterface (lbrunet)
This PR was merged into the 2.7 branch.

Discussion
----------

Deprecate interface Symfony\Component\Validator\ExecutionContextInterface

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | [#12683]
| License       | MIT

Deprecate interface Symfony\Component\Validator\ExecutionContextInterface

Commits
-------

7ed6d11 Deprecate interface Symfony\Component\Validator\ExecutionContextInterface
2014-11-29 16:00:32 +01:00