Skip to content

Commit c4a8041

Browse files
fabpotfabpot
committed
Merge branch '2.5' into 2.6
* 2.5: CS fixes [2.3] More cs fixes Removed unused imports CS fixes bumped Symfony version to 2.5.9 updated VERSION for 2.5.8 update CONTRIBUTORS for 2.5.8 updated CHANGELOG for 2.5.8 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/Component/Console/Helper/ProgressBar.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Security/Http/HttpUtils.php src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
2 parents 7224bde + 002595a commit c4a8041

File tree

106 files changed

+300
-283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+300
-283
lines changed

‎CHANGELOG-2.3.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ in 2.3 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.3.0...v2.3.1
99

10+
* 2.3.23 (2014-12-03)
11+
12+
* bug #12811 Configure firewall's kernel exception listener with configured entry point or a default entry point (rjkip)
13+
* bug #12784 [DependencyInjection] make paths relative to __DIR__ in the generated container (nicolas-grekas)
14+
* bug #12716 [ClassLoader] define constant only if it wasn't defined before (xabbuh)
15+
* bug #12553 [Debug] fix error message on double exception (nicolas-grekas)
16+
* bug #12550 [FrameworkBundle] backport #12489 (xabbuh)
17+
* bug #12570 Fix initialized() with aliased services (Daniel Wehner)
18+
* bug #12137 [FrameworkBundle] cache:clear command fills *.php.meta files with wrong data (Strate)
19+
1020
* 2.3.22 (2014-11-20)
1121

1222
* bug #12525 [Bundle][FrameworkBundle] be smarter when guessing the document root (xabbuh)

‎CHANGELOG-2.5.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ in 2.5 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.5.0...v2.5.1
99

10+
* 2.5.8 (2014-12-03)
11+
12+
* bug #12811 Configure firewall's kernel exception listener with configured entry point or a default entry point (rjkip)
13+
* bug #12784 [DependencyInjection] make paths relative to __DIR__ in the generated container (nicolas-grekas)
14+
* bug #12716 [ClassLoader] define constant only if it wasn't defined before (xabbuh)
15+
* bug #12553 [Debug] fix error message on double exception (nicolas-grekas)
16+
* bug #12550 [FrameworkBundle] backport #12489 (xabbuh)
17+
* bug #12570 Fix initialized() with aliased services (Daniel Wehner)
18+
* bug #12267 [Form][WebProfiler] Empty form names fix (kix)
19+
* bug #12137 [FrameworkBundle] cache:clear command fills *.php.meta files with wrong data (Strate)
20+
1021
* 2.5.7 (2014-11-20)
1122

1223
* bug #12525 [Bundle][FrameworkBundle] be smarter when guessing the document root (xabbuh)

0 commit comments

Comments
 (0)