Commit Graph

19191 Commits

Author SHA1 Message Date
Hugo Hamon
28492cfbe0 [SecurityBundle] fixes SecurityDataCollector::getInheritedRoles() documentation. 2014-12-20 00:03:39 +01:00
Fabien Potencier
5f861347b2 feature #12469 [Security] Added the triggering of the security.interactive_login event in SimplePreAuthenticationListener (saro0h)
This PR was merged into the 2.7 branch.

Discussion
----------

[Security] Added the triggering of the security.interactive_login event in SimplePreAuthenticationListener

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

Commits
-------

2d17a0c [Security] Added the triggering of the security.interactive_login event after set of token
2014-12-18 19:09:17 +01:00
sarah khalil
2d17a0cac6 [Security] Added the triggering of the security.interactive_login event after set of token 2014-12-16 23:44:31 +01:00
Nicolas Grekas
176b175043 Merge branch '2.6' into 2.7
* 2.6:
  [2.6] Test lowest versions of dependencies
  Test lowest versions of dependencies
  Fix placeholder date format
  Test components using their lowest possible deps
2014-12-16 21:28:45 +01:00
Nicolas Grekas
ef83a6cd6d minor #13006 [2.6] Test lowest versions of dependencies (nicolas-grekas, fabpot)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] Test lowest versions of dependencies

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

Commits
-------

a29ffa8 [2.6] Test lowest versions of dependencies
5e6959b Merge remote-tracking branch 'symfony/2.5' into lowest-26
b2e0a80 minor #12998 [2.5] Test components using their lowest possible deps (nicolas-grekas, fabpot)
b1b5cca Test lowest versions of dependencies
88d524e Merge remote-tracking branch 'symfony/2.3' into lowest-25
206ebc7 minor #12542 Test components using their lowest possible deps (nicolas-grekas)
25fef27 Test components using their lowest possible deps
2014-12-16 21:20:59 +01:00
Nicolas Grekas
a29ffa82d6 [2.6] Test lowest versions of dependencies 2014-12-16 19:41:39 +01:00
Nicolas Grekas
5e6959b39e Merge remote-tracking branch 'symfony/2.5' into lowest-26
* symfony/2.5:
  Test lowest versions of dependencies
  Test components using their lowest possible deps

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Security/composer.json
2014-12-16 16:44:55 +01:00
Fabien Potencier
b2e0a803a6 minor #12998 [2.5] Test components using their lowest possible deps (nicolas-grekas, fabpot)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] Test components using their lowest possible deps

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

Follow up of #12542

Commits
-------

b1b5cca Test lowest versions of dependencies
88d524e Merge remote-tracking branch 'symfony/2.3' into lowest-25
206ebc7 minor #12542 Test components using their lowest possible deps (nicolas-grekas)
25fef27 Test components using their lowest possible deps
2014-12-16 16:30:07 +01:00
Nicolas Grekas
b1b5cca41c Test lowest versions of dependencies 2014-12-16 16:17:56 +01:00
Fabien Potencier
c11c121e2b bug #12996 [WebProfilerBundle] Fix placeholder date format (mvar)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfilerBundle] Fix placeholder date format

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

Commits
-------

9a44aa8 Fix placeholder date format
2014-12-16 05:12:16 +01:00
Nicolas Grekas
88d524e541 Merge remote-tracking branch 'symfony/2.3' into lowest-25
* symfony/2.3:
  Test components using their lowest possible deps

Conflicts:
	src/Symfony/Bridge/Doctrine/composer.json
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Component/DependencyInjection/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Routing/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Validator/composer.json
2014-12-15 19:38:14 +01:00
Mantas Varatiejus
9a44aa85ac Fix placeholder date format 2014-12-15 20:18:43 +02:00
Fabien Potencier
206ebc7844 minor #12542 Test components using their lowest possible deps (nicolas-grekas)
This PR was squashed before being merged into the 2.3 branch (closes #12542).

Discussion
----------

Test components using their lowest possible deps

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

Once https://github.com/composer/composer/pull/3450 is merged, we'll see if our deps are correct, and ensure that is kept over time by testing each component with its lowest possible deps.

Commits
-------

25fef27 Test components using their lowest possible deps
2014-12-15 11:45:20 +01:00
Nicolas Grekas
25fef27753 Test components using their lowest possible deps 2014-12-15 11:45:17 +01:00
Fabien Potencier
5fc4f278bc Merge branch '2.6' into 2.7
* 2.6:
  Fix failing tests after merge
  fix ocramius/proxy-manager dependency version
2014-12-13 10:20:15 +01:00
Fabien Potencier
08a024230e Merge branch '2.5' into 2.6
* 2.5:
  Fix failing tests after merge
  fix ocramius/proxy-manager dependency version
2014-12-13 10:20:08 +01:00
Fabien Potencier
98c8ec1cbc minor #12967 Fix failing tests after merge (xabbuh, nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

Fix failing tests after merge

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

https://github.com/symfony/symfony/pull/12967/files?w=1

Commits
-------

9b96373 Fix failing tests after merge
6638535 fix ocramius/proxy-manager dependency version
2014-12-13 10:19:48 +01:00
Nicolas Grekas
9b96373d10 Fix failing tests after merge 2014-12-13 10:17:07 +01:00
Christian Flothmann
6638535977 fix ocramius/proxy-manager dependency version
Symfony 2.5 and higher requires ocramius/proxy-manager 0.4.0 or
higher.
2014-12-13 10:17:04 +01:00
Fabien Potencier
7ea7035e72 Merge branch '2.6' into 2.7
* 2.6:
  remove short array syntax
  fix session restart on PHP 5.3
  Avoid missing method when using __invoke
2014-12-13 09:38:56 +01:00
Fabien Potencier
f691ab35e8 Merge branch '2.5' into 2.6
* 2.5:
  remove short array syntax
  fix session restart on PHP 5.3
2014-12-13 09:38:45 +01:00
Fabien Potencier
2874a429b0 Merge branch '2.3' into 2.5
* 2.3:
  remove short array syntax
  fix session restart on PHP 5.3
2014-12-13 09:38:28 +01:00
Fabien Potencier
503c7608ab minor #12962 [SecurityBundle] remove short array syntax (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[SecurityBundle] remove short array syntax

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

The short array syntax was introduced in PHP 5.4 and therefore leads
to failing tests when executed in PHP 5.3 environments.

Commits
-------

697ce4d remove short array syntax
2014-12-13 09:38:09 +01:00
Christian Flothmann
697ce4d794 remove short array syntax
The short array syntax was introduced in PHP 5.4 and therefore leads
to failing tests when executed in PHP 5.3 environments.
2014-12-12 19:44:55 +01:00
Fabien Potencier
7e33b32ccf minor #12958 [WebProfilerBundle] Avoid missing method when using __invoke on a controller (thewilkybarkid)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfilerBundle] Avoid missing method when using __invoke on a controller

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

2.6 added support for using `__invoke` on controllers, but the profiler toolbar still expects a method name, leading to:

![image](https://cloud.githubusercontent.com/assets/1784740/5412993/4553c4da-820a-11e4-899c-50ef9f330cdd.png)

This PR changes it to only include the method section/double dots if the method name is included (and the `link` is moved to the class name).

Commits
-------

fb87558 Avoid missing method when using __invoke
2014-12-12 19:19:01 +01:00
Fabien Potencier
e38b8e68bb bug #12961 fix session restart on PHP 5.3 (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

fix session restart on PHP 5.3

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

this also removes some useless code

Commits
-------

b9d3c92 fix session restart on PHP 5.3
2014-12-12 19:12:22 +01:00
Fabien Potencier
55ca36e746 feature #12896 [DX][Profiler] Show the inherited roles in the web profiler (peterrehm)
This PR was merged into the 2.7 branch.

Discussion
----------

[DX][Profiler] Show the inherited roles in the web profiler

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

Given the following role hierarchy configuration

````php
security:
    role_hierarchy:
        ROLE_SUPER_ADMIN: [ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH]
        ROLE_ADMIN:       [ROLE_EMPLOYEE]
        ROLE_EMPLOYEE:    [ROLE_SALES]
````

If you were checking the user roles in the web profiler as an user with the assigned
role `ROLE_ADMIN` you saw only the following output.

![bildschirmfoto 2014-12-08 um 12 31 25](https://cloud.githubusercontent.com/assets/2010989/5338601/26fd4c90-7ed6-11e4-961b-12103ddddf50.png)

This was kind of tricky since pages where you were checking `is_granted('ROLE_EMPLOYEE')`
granted access. Debugging was hard for newcomers to the project if they did not understand
the role hierarchy.

With this adjustment you will see the assigned roles as well as the inherited roles separately as
follows:

![bildschirmfoto 2014-12-08 um 12 23 59](https://cloud.githubusercontent.com/assets/2010989/5338622/5b0ffc58-7ed6-11e4-9863-27c9105897df.png)

Commits
-------

31dc672 Show the inherited roles in the web profiler
2014-12-12 19:10:09 +01:00
Tobias Schultze
b9d3c92ca9 fix session restart on PHP 5.3
this also removes some useless code
2014-12-12 18:30:52 +01:00
Nicolas Grekas
7185d50649 Merge branch '2.6' into 2.7
* 2.6: (24 commits)
  [Form] fixed a maxlength overring on a guessing
  [Debug] Show only unique class candidates
  [SecurityBundle] Firewall providers building - code cleaning
  [Filesystem] symlink use RealPath instead LinkTarget
  [DependencyInjection] Remove duplicate  declaration in PhpDumper
  terminals are not interactive on Travis
  Revert "[DependencyInjection] backport perf optim"
  [WebProfiler] Tweaked ajax requests toolbar css reset
  [WebProfilerBundle] replaced pattern to path attribute in routes definitions.
  fix phpdoc's alignment
  Fix missing addExpressionLanguageProvider (used by service container to add expression providers)
  Fixed the AuthenticationProviderInterface alignment
  Fixed the proxy-manager version constraint
  Fix missing space in label_attr
  fix DumpDataCollectorTest after CS changes
  avoid risky tests
  Fixed typo in SecurityContext PHPDoc
  [FrameworkBundle][Template name] avoid  error message for the shortcut notation.
  [DependencyInjection] perf optim: call dirname() at most 5x
  [DependencyInjection] backport perf optim
  ...
2014-12-12 17:23:01 +01:00
Nicolas Grekas
ea17bc78a8 Merge branch '2.5' into 2.6
* 2.5:
  [Form] fixed a maxlength overring on a guessing
  [Debug] Show only unique class candidates
  [SecurityBundle] Firewall providers building - code cleaning
  [Filesystem] symlink use RealPath instead LinkTarget
  [DependencyInjection] Remove duplicate  declaration in PhpDumper
  terminals are not interactive on Travis
  Revert "[DependencyInjection] backport perf optim"
  [WebProfilerBundle] replaced pattern to path attribute in routes definitions.
  fix phpdoc's alignment
  Fixed the AuthenticationProviderInterface alignment
  Fixed the proxy-manager version constraint
  [FrameworkBundle][Template name] avoid  error message for the shortcut notation.
  [DependencyInjection] perf optim: call dirname() at most 5x
  [DependencyInjection] backport perf optim
  Fixed #12845 adding a listener to an event that is currently being dispatched will not result into a fatal error in TraceableEventDispatcher [EventDispatcher]
  [2.5] Remove possible call_user_func()
  [2.3] Remove possible call_user_func()

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
2014-12-12 17:21:40 +01:00
Nicolas Grekas
76c35089c5 Merge branch '2.3' into 2.5
* 2.3:
  [SecurityBundle] Firewall providers building - code cleaning
  [Filesystem] symlink use RealPath instead LinkTarget
  Fixed the AuthenticationProviderInterface alignment
  Fixed the proxy-manager version constraint

Conflicts:
	composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
2014-12-12 16:58:22 +01:00
thewilkybarkid
fb87558881 Avoid missing method when using __invoke 2014-12-12 14:38:45 +00:00
Peter Rehm
31dc6723ce Show the inherited roles in the web profiler 2014-12-12 10:24:50 +01:00
Fabien Potencier
1cd4d4804e bug #12548 [Form] fixed a maxlength overring on a guessing (origaminal)
This PR was squashed before being merged into the 2.5 branch (closes #12548).

Discussion
----------

[Form] fixed a maxlength overring on a guessing

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

Commits
-------

7248680 [Form] fixed a maxlength overring on a guessing
2014-12-12 08:47:05 +01:00
origaminal
7248680eba [Form] fixed a maxlength overring on a guessing 2014-12-12 08:47:01 +01:00
Fabien Potencier
2a46e31a3b minor #12453 [Debug] Show only unique class candidates (hason)
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes #12453).

Discussion
----------

[Debug] Show only unique class candidates

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

```
PHPUnit 4.3.5 by Sebastian Bergmann.

Configuration read from .../symfony/phpunit.xml.dist

S....S.............................FFFS.......

Time: 2.29 seconds, Memory: 8.50Mb

There were 3 failures:

1) Symfony\Component\Debug\Tests\FatalErrorHandler\ClassNotFoundFatalErrorHandlerTest::testClassNotFound with data set #2 (array(1, 12, 'foo.php', 'Class \'UndefinedFunctionException\' not found'), 'Attempted to load class "UndefinedFunctionException" from the global namespace.
Did you forget a "use" statement for "Symfony\\Component\\Debug\\Exception\\UndefinedFunctionException"?')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
 Attempted to load class "UndefinedFunctionException" from the global namespace.
-Did you forget a "use" statement for "Symfony\Component\Debug\Exception\UndefinedFunctionException"?
+Did you forget a "use" statement for e.g. "Symfony\Component\Debug\Exception\UndefinedFunctionException" or "Symfony\Component\Debug\Exception\UndefinedFunctionException"?

.../symfony/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php:28

2) Symfony\Component\Debug\Tests\FatalErrorHandler\ClassNotFoundFatalErrorHandlerTest::testClassNotFound with data set #3 (array(1, 12, 'foo.php', 'Class \'PEARClass\' not found'), 'Attempted to load class "PEARClass" from the global namespace.
Did you forget a "use" statement for "Symfony_Component_Debug_Tests_Fixtures_PEARClass"?')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
 Attempted to load class "PEARClass" from the global namespace.
-Did you forget a "use" statement for "Symfony_Component_Debug_Tests_Fixtures_PEARClass"?
+Did you forget a "use" statement for e.g. "Symfony_Component_Debug_Tests_Fixtures_PEARClass" or "Symfony_Component_Debug_Tests_Fixtures_PEARClass"?

.../symfony/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php:28

3) Symfony\Component\Debug\Tests\FatalErrorHandler\ClassNotFoundFatalErrorHandlerTest::testClassNotFound with data set #4 (array(1, 12, 'foo.php', 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found'), 'Attempted to load class "UndefinedFunctionException" from namespace "Foo\\Bar".
Did you forget a "use" statement for "Symfony\\Component\\Debug\\Exception\\UndefinedFunctionException"?')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
 Attempted to load class "UndefinedFunctionException" from namespace "Foo\Bar".
-Did you forget a "use" statement for "Symfony\Component\Debug\Exception\UndefinedFunctionException"?
+Did you forget a "use" statement for e.g. "Symfony\Component\Debug\Exception\UndefinedFunctionException" or "Symfony\Component\Debug\Exception\UndefinedFunctionException"?

.../symfony/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php:28
```

Commits
-------

db8a3ae [Debug] Show only unique class candidates
2014-12-12 08:45:04 +01:00
Martin Hasoň
db8a3ae1a7 [Debug] Show only unique class candidates 2014-12-12 08:45:04 +01:00
Fabien Potencier
f47ade6f41 feature #12295 [FrameworkBundle] make GetSetMethodNormalizer available by default (dunglas)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #12295).

Discussion
----------

[FrameworkBundle] make GetSetMethodNormalizer available by default

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | very limited
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT
| Doc PR        | not yet

The `GetSetMethodNormalizer` has not been enabled by default in #6815 because it was broken by design. Since #12098 has been merged, circular references are handled and that normalizer cannot breaks applications.
This PR makes that normalizer automatically available when the serializer is enabled. To keep BC, I've set a "high" priority for this service (higher than the default `0`).

Commits
-------

4f0aa61 [FrameworkBundle] make GetSetMethodNormalizer available by default
2014-12-12 08:37:42 +01:00
Kévin Dunglas
4f0aa61cb2 [FrameworkBundle] make GetSetMethodNormalizer available by default 2014-12-12 08:37:41 +01:00
Fabien Potencier
39a3379842 minor #12400 [SecurityBundle] Firewall providers building - code cleaning (blanchonvincent)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #12400).

Discussion
----------

[SecurityBundle] Firewall providers building - code cleaning

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | https://github.com/symfony-fr/symfony-docs-fr/pull/609

It seems old code to build firewall provider still exist in the SecurityExtension. The `In-Memory` and `Entity` providers are handled in their own factories.

Commits
-------

c3c904d [SecurityBundle] Firewall providers building - code cleaning
2014-12-12 08:32:09 +01:00
blanchonvincent
c3c904d01f [SecurityBundle] Firewall providers building - code cleaning 2014-12-12 08:32:08 +01:00
Fabien Potencier
b0ab6878ed minor #12917 [2.3] [Security] Fixed The AuthenticationProviderInterface Alignment (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [Security] Fixed The AuthenticationProviderInterface Alignment

| 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 AuthenticationProviderInterface alignment.

Everything was indented by one too many spaces.

Commits
-------

1270327 Fixed the AuthenticationProviderInterface alignment
2014-12-12 08:20:57 +01:00
Fabien Potencier
122e117264 bug #12761 [Filesystem] symlink use RealPath instead LinkTarget (aitboudad)
This PR was squashed before being merged into the 2.3 branch (closes #12761).

Discussion
----------

[Filesystem] symlink use RealPath instead LinkTarget

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

Commits
-------

a8b8d33 [Filesystem] symlink use RealPath instead LinkTarget
2014-12-12 08:08:40 +01:00
Abdellatif Ait boudad
a8b8d33e94 [Filesystem] symlink use RealPath instead LinkTarget 2014-12-12 08:08:37 +01:00
Fabien Potencier
bfdf04b9e9 minor #12776 [2.3] Fixed the proxy-manager version constraint (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Fixed the proxy-manager version constraint

| 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 `ocramius/proxy-manager` version constraint in the 2.3 branch.

`"~0.3.1"` is far cleaner than `">=0.3.1,<0.4-dev"`, and does the same thing.

Commits
-------

ed6c50f Fixed the proxy-manager version constraint
2014-12-12 08:04:42 +01:00
Fabien Potencier
e1e4cfcc7b bug #12848 [EventDispatcher] Fixed #12845 adding a listener to an event that is currently being dispatched (Pieter Jordaan)
This PR was merged into the 2.5 branch.

Discussion
----------

[EventDispatcher] Fixed #12845 adding a listener to an event that is currently being dispatched

[EventDispatcher] Fixed adding listener when event is currently being dispatched

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

Commits
-------

0cbc2b0 Fixed #12845 adding a listener to an event that is currently being dispatched will not result into a fatal error in TraceableEventDispatcher [EventDispatcher]
2014-12-12 08:00:19 +01:00
Fabien Potencier
7d981e0dba minor #12904 [HttpKernel] fix DumpDataCollectorTest after CS changes (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[HttpKernel] fix DumpDataCollectorTest after CS changes

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

Modify the expected line value which was affected by the move of the
`__LINE__` constant in #12872 to make tests pass again.

Commits
-------

1917b70 fix DumpDataCollectorTest after CS changes
2014-12-12 07:57:37 +01:00
Fabien Potencier
b9f0dd1254 minor #12951 [Console] terminals are not interactive on Travis (xabbuh)
This PR was merged into the 2.5 branch.

Discussion
----------

[Console] terminals are not interactive on Travis

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

You cannot assume that the input is always interactive when the tests
for the `Application` class are executed. The expected value depends
on the terminal being interactive.

Commits
-------

d58ac9e terminals are not interactive on Travis
2014-12-12 07:55:42 +01:00
Fabien Potencier
c9f4139850 bug #12935 [2.6] [Security] Fixed ExpressionVoter - addExpressionLanguageProvider (Luca Genuzio)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] [Security] Fixed ExpressionVoter - addExpressionLanguageProvider

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

Fix missing addExpressionLanguageProvider in [ExpressionVoter](https://github.com/symfony/symfony/blob/2.6/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php), used by [AddExpressionLanguageProvidersPass](https://github.com/symfony/symfony/blob/2.6/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php) to add expression providers.

Commits
-------

6c70bc5 Fix missing addExpressionLanguageProvider (used by service container to add expression providers)
2014-12-12 07:54:58 +01:00
Fabien Potencier
c7ea7819aa minor #12953 [DependencyInjection] Remove duplicate $parameters declaration in PhpDumper (sjagr)
This PR was squashed before being merged into the 2.5 branch (closes #12953).

Discussion
----------

[DependencyInjection] Remove duplicate $parameters declaration in PhpDumper

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

2.5 breaks on the latest `composer update` without this fix - after applying and manually deleting `app/cache/*`, everything is hunky-dory

Commits
-------

e3a4cdc [DependencyInjection] Remove duplicate  declaration in PhpDumper
2014-12-12 07:02:15 +01:00