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
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
-------
0cbc2b0Fixed#12845 adding a listener to an event that is currently being dispatched will not result into a fatal error in TraceableEventDispatcher [EventDispatcher]
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
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
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.
This PR was merged into the 2.5 branch.
Discussion
----------
[2.5] Remove possible call_user_func()
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Remove possible call_user_func() introduced in 2.5
Commits
-------
94a04cb [2.5] Remove possible call_user_func()
This PR was merged into the 2.3 branch.
Discussion
----------
[2.3] Remove possible call_user_func()
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Merging this in 2.3 enhances performance a bit, but more importantly will ease future merges into 3.0.
Commits
-------
fad7aba [2.3] Remove possible call_user_func()
This PR was merged into the 2.3 branch.
Discussion
----------
[DependencyInjection] Perf php dumper
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
This PR came up after this comment to reduce the number of calls to dirname():
https://github.com/symfony/symfony/pull/12784#issuecomment-65619179
Commits
-------
375f83e Revert "[DependencyInjection] backport perf optim"
fcd8ff9 [DependencyInjection] perf optim: call dirname() at most 5x
c11535b [DependencyInjection] backport perf optim
This PR was merged into the 2.3 branch.
Discussion
----------
[2.3] [WebProfilerBundle] replaced pattern to path attribute in routes definitions
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | ~
| License | MIT
| Doc PR | ~
Commits
-------
123e054 [WebProfilerBundle] replaced pattern to path attribute in routes definitions.
This PR was merged into the 2.3 branch.
Discussion
----------
[FrameworkBundle][Template name] avoid error message for the shortcut n...
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Fixed tickets | #12249, #12254
| Tests pass? | yes
| License | MIT
Commits
-------
055129c [FrameworkBundle][Template name] avoid error message for the shortcut notation.
This PR was merged into the 2.5 branch.
Discussion
----------
[Console] fixes some typos and phpdoc.
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | ~
| License | MIT
| Doc PR | ~
Commits
-------
86840df [Console] fixes some typos and phpdoc.
This PR was merged into the 2.3 branch.
Discussion
----------
[ClassLoader] Fix undefined index in ClassCollectionLoader
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Commits
-------
cfdb925 [ClassLoader] Fix undefined index in ClassCollectionLoader
This PR was merged into the 2.3 branch.
Discussion
----------
Minor phpcs fixes
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | ?
| Fixed tickets | N/A
| License | MIT
| Doc PR | N/A
Small phpcs fixes
Commits
-------
9a0d5c3 Minor phpcs fixes
This PR was merged into the 2.5 branch.
Discussion
----------
[2.5] CS Fixes And Removed Unused Imports
| 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 some cs issues in symfony 2.5.
I've applied the same set of fixes that I did to the 2.3 branch.
There are far fewer fixes than there were for 2.3, so I've just done them all at once.
Commits
-------
ed4fb54 CS fixes
* 2.3:
[2.3] More cs fixes
Removed unused imports
CS fixes
bumped Symfony version to 2.3.24
updated VERSION for 2.3.23
update CONTRIBUTORS for 2.3.23
updated CHANGELOG for 2.3.23
Conflicts:
src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
This PR was squashed before being merged into the 2.3 branch (closes#12840).
Discussion
----------
[2.3] More cs 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 some more cs issues in symfony 2.3.
I should be done with cs fixes to the 2.3 branch now. Sorry I missed these in my last pull.
Commits
-------
b034b08 [2.3] More cs fixes
This PR was merged into the 2.3 branch.
Discussion
----------
[2.3] CS Fixes And Removed Unused Imports
| 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 some cs issues in symfony 2.3.
As far as I understand, symfony's coding standards dictate that there should be no blank lines between imports and imports should not be prefixed with a slash. There are one or two other tiny fixes in here too.
Also, we should only import things that we actually *use*. :)
Commits
-------
0e4f0e7 Removed unused imports
0fc3369 CS fixes