8000 Merge branch '2.5' · alexpott/symfony@4677e92 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4677e92

Browse files
fabpotfabpot
committed
Merge branch '2.5'
* 2.5: (43 commits) [Form] Fix PHPDoc for builder setData methods The underlying data variable is typed as mixed whereas the methods paramers where typed as array. fixed CS [Intl] Improved bundle reader implementations [Console] guarded against invalid aliases switch before_script to before_install and script to install fixed typo [HttpFoundation] Request - URI - comment improvements [Validator] The ratio of the ImageValidator is rounded to two decimals now [Security] Added more tests remove `service` parameter type from XSD [Intl] Added exception handler to command line scripts [Intl] Fixed a few bugs in TextBundleWriter [Intl] Updated icu.ini up to ICU 53 [Intl] Removed non-working $fallback argument from ArrayAccessibleResourceBundle Use separated function to resolve command and related arguments [SwiftmailerBridge] Bump allowed versions of swiftmailer [FrameworkBundle] Remove invalid markup [Intl] Added "internal" tag to all classes under Symfony\Component\Intl\ResourceBundle Remove routes for removed WebProfiler actions [Security] Fix usage of unexistent method in DoctrineAclCache. ... Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php src/Symfony/Component/HttpKernel/HttpCache/Esi.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php src/Symfony/Component/Yaml/Parser.php src/Symfony/Component/Yaml/Tests/InlineTest.php
2 parents 9046c48 + 687703a commit 4677e92

File tree

107 files changed

+1495
-394
lines changed

Some content is hidden

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

107 files changed

+1495
-394
lines changed

‎.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,23 @@ matrix:
1414

1515
services: mongodb
1616

17-
before_script:
17+
before_install:
1818
- travis_retry sudo apt-get install parallel
1919
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi;'
2020
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
2121
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
2222
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
2323
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
2424
- sudo locale-gen fr_FR.UTF-8 && sudo update-locale
25+
<<<<<<< HEAD
2526
- COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install
27+
=======
28+
>>>>>>> 2.4
2629
# - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "5.3.3" ]; then phpunit --self-update; fi;'
2730

31+
install:
32+
- COMPOSER_ROOT_VERSION=dev-master composer --prefer-source install
33+
2834
script:
2935
- ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo "Running {} tests"; phpunit --exclude-group tty,benchmark {};'
3036
- echo "Running tests requiring tty"; phpunit --group tty

‎CHANGELOG-2.3.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,59 @@ 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.19 (2014-09-03)
11+
12+
* security #11832 CVE-2014-6072 (fabpot)
13+
* security #11831 CVE-2014-5245 (stof)
14+
* security #11830 CVE-2014-4931 (aitboudad, Jérémy Derussé)
15+
* security #11829 CVE-2014-6061 (damz, fabpot)
16+
* security #11828 CVE-2014-5244 (nicolas-grekas, larowlan)
17+
* bug #10197 [FrameworkBundle] PhpExtractor bugfix and improvements (mtibben)
18+
* bug #11772 [Filesystem] Add FTP stream wrapper context option to enable overwrite (Damian Sromek)
19+
* bug #11788 [Yaml] fixed mapping keys containing a quoted # (hvt, fabpot)
20+
* bug #11160 [DoctrineBridge] Abstract Doctrine Subscribers with tags (merk)
21+
* bug #11768 [ClassLoader] Add a __call() method to XcacheClassLoader (tstoeckler)
22+
* bug #11726 [Filesystem Component] mkdir race condition fix #11626 (kcassam)
23+
* bug #11677 [YAML] resolve variables in inlined YAML (xabbuh)
24+
* bug #11639 [DependencyInjection] Fixed factory service not within the ServiceReferenceGraph. (boekkooi)
25+
* bug #11778 [Validator] Fixed wrong translations for Collection constraints (samicemalone)
26+
* bug #11756 [DependencyInjection] fix @return anno created by PhpDumper (jakubkulhan)
27+
* bug #11711 [DoctrineBridge] Fix empty parameter logging in the dbal logger (jakzal)
28+
* bug #11692 [DomCrawler] check for the correct field type (xabbuh)
29+
* bug #11672 [Routing] fix handling of nullable XML attributes (xabbuh)
30+
* bug #11624 [DomCrawler] fix the axes handling in a bc way (xabbuh)
31+
* bug #11676 [Form] Fixed #11675 ValueToDuplicatesTransformer accept "0" value (Nek-)
32+
* bug #11695 [Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise (webmozart)
33+
* bug #11529 [WebProfilerBundle] Fixed double height of canvas (hason)
34+
* bug #11641 [WebProfilerBundle ] Fix toolbar vertical alignment (blaugueux)
35+
* bug #11559 [Validator] Convert objects to string in comparison validators (webmozart)
36+
* feature #11510 [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field (catchamonkey)
37+
* bug #11408 [HttpFoundation] Update QUERY_STRING when overrideGlobals (yguedidi)
38+
* bug #11633 [FrameworkBundle] add missing attribute to XSD (xabbuh)
39+
* bug #11601 [Validator] Allow basic auth in url when using UrlValidator. (blaugueux)
40+
* bug #11609 [Console] fixed style creation when providing an unknown tag option (fabpot)
41+
* bug #10914 [HttpKernel] added an analyze of environment parameters for built-in server (mauchede)
42+
* bug #11598 [Finder] Shell escape and windows support (Gordon Franke, gimler)
43+
* bug #11499 [BrowserKit] Fixed relative redirects for ambiguous paths (pkruithof)
44+
* bug #11516 [BrowserKit] Fix browser kit redirect with ports (dakota)
45+
* bug #11545 [Bundle][FrameworkBundle] built-in server: exit when docroot does not exist (xabbuh)
46+
* bug #11560 Plural fix (1emming)
47+
* bug #11558 [DependencyInjection] Fixed missing 'factory-class' attribute in XmlDumper output (kerdany)
48+
* bug #11548 [Component][DomCrawler] fix axes handling in Crawler::filterXPath() (xabbuh)
49+
* bug #11422 [DependencyInjection] Self-referenced 'service_container' service breaks garbage collection (sun)
50+
* bug #11428 [Serializer] properly handle null data when denormalizing (xabbuh)
51+
* bug #10687 [Validator] Fixed string conversion in constraint violations (eagleoneraptor, webmozart)
52+
* bug #11475 [EventDispatcher] don't count empty listeners (xabbuh)
53+
* bug #11436 fix signal handling in wait() on calls to stop() (xabbuh, romainneutron)
54+
* bug #11469 [BrowserKit] Fixed server HTTP_HOST port uri conversion (bcremer, fabpot)
55+
* bug #11425 Fix issue described in #11421 (Ben, ben-rosio)
56+
* bug #11423 Pass a Scope instance instead of a scope name when cloning a container in the GrahpvizDumper (jakzal)
57+
* bug #11120 [Process] Reduce I/O load on Windows platform (romainneutron)
58+
* bug #11342 [Form] Check if IntlDateFormatter constructor returned a valid object before using it (romainneutron)
59+
* bug #11411 [Validator] Backported #11410 to 2.3: Object initializers are called only once per object (webmozart)
60+
* bug #11403 [Translator][FrameworkBundle] Added @ to the list of allowed chars in Translator (takeit)
61+
* bug #11381 [Process] Use correct test for empty string in UnixPipes (whs, romainneutron)
62+
1063
* 2.3.18 (2014-07-15)
1164

1265
* [Security] Forced validate of locales passed to the translator

‎CHANGELOG-2.4.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,61 @@ in 2.4 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.4.0...v2.4.1
99

10+
* 2.4.9 (2014-09-03)
11+
12+
* security #11832 CVE-2014-6072 (fabpot)
13+
* security #11831 CVE-2014-5245 (stof)
14+
* security #11830 CVE-2014-4931 (aitboudad, Jérémy Derussé)
15+
* security #11829 CVE-2014-6061 (damz, fabpot)
16+
* security #11828 CVE-2014-5244 (nicolas-grekas, larowlan)
17+
* bug #10197 [FrameworkBundle] PhpExtractor bugfix and improvements (mtibben)
18+
* bug #11772 [Filesystem] Add FTP stream wrapper context option to enable overwrite (Damian Sromek)
19+
* bug #11788 [Yaml] fixed mapping keys containing a quoted # (hvt, fabpot)
20+
* bug #11160 [DoctrineBridge] Abstract Doctrine Subscribers with tags (merk)
21+
* bug #11768 [ClassLoader] Add a __call() method to XcacheClassLoader (tstoeckler)
22+
* bug #11726 [Filesystem Component] mkdir race condition fix #11626 (kcassam)
23+
* bug #11677 [YAML] resolve variables in inlined YAML (xabbuh)
24+
* bug #11639 [DependencyInjection] Fixed factory service not within the ServiceReferenceGraph. (boekkooi)
25+
* bug #11778 [Validator] Fixed wrong translations for Collection constraints (samicemalone)
26+
* bug #11756 [DependencyInjection] fix @return anno created by PhpDumper (jakubkulhan)
27+
* bug #11711 [DoctrineBridge] Fix empty parameter logging in the dbal logger (jakzal)
28+
* bug #11692 [DomCrawler] check for the correct field type (xabbuh)
29+
* bug #11672 [Routing] fix handling of nullable XML attributes (xabbuh)
30+
* bug #11624 [DomCrawler] fix the axes handling in a bc way (xabbuh)
31+
* bug #11676 [Form] Fixed #11675 ValueToDuplicatesTransformer accept "0" value (Nek-)
32+
* bug #11695 [Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise (webmozart)
33+
* bug #11529 [WebProfilerBundle] Fixed double height of canvas (hason)
34+
* bug #11641 [WebProfilerBundle ] Fix toolbar vertical alignment (blaugueux)
35+
* bug #11559 [Validator] Convert objects to string in comparison validators (webmozart)
36+
* feature #11510 [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field (catchamonkey)
37+
* bug #11408 [HttpFoundation] Update QUERY_STRING when overrideGlobals (yguedidi)
38+
* bug #11633 [FrameworkBundle] add missing attribute to XSD (xabbuh)
39+
* bug #11601 [Validator] Allow basic auth in url when using UrlValidator. (blaugueux)
40+
* bug #11609 [Console] fixed style creation when providing an unknown tag option (fabpot)
41+
* bug #10914 [HttpKernel] added an analyze of environment parameters for built-in server (mauchede)
42+
* bug #11598 [Finder] Shell escape and windows support (Gordon Franke, gimler)
43+
* bug #11499 [BrowserKit] Fixed relative redirects for ambiguous paths (pkruithof)
44+
* bug #11516 [BrowserKit] Fix browser kit redirect with ports (dakota)
45+
* bug #11545 [Bundle][FrameworkBundle] built-in server: exit when docroot does not exist (xabbuh)
46+
* bug #11560 Plural fix (1emming)
47+
* bug #11558 [DependencyInjection] Fixed missing 'factory-class' attribute in XmlDumper output (kerdany)
48+
* bug #11548 [Component][DomCrawler] fix axes handling in Crawler::filterXPath() (xabbuh)
49+
* bug #11422 [DependencyInjection] Self-referenced 'service_container' service breaks garbage collection (sun)
50+
* bug #11428 [Serializer] properly handle null data when denormalizing (xabbuh)
51+
* bug #10687 [Validator] Fixed string conversion in constraint violations (eagleoneraptor, webmozart)
52+
* bug #11475 [EventDispatcher] don't count empty listeners (xabbuh)
53+
* bug #11436 fix signal handling in wait() on calls to stop() (xabbuh, romainneutron)
54+
* bug #11469 [BrowserKit] Fixed server HTTP_HOST port uri conversion (bcremer, fabpot)
55+
* bug #11425 Fix issue described in #11421 (Ben, ben-rosio)
56+
* bug #11423 Pass a Scope instance instead of a scope name when cloning a container in the GrahpvizDumper (jakzal)
57+
* bug #11448 [MonologBridge] fixed Console handler priorities (fabpot)
58+
* bug #11120 [Process] Reduce I/O load on Windows platform (romainneutron)
59+
* bug #11342 [Form] Check if IntlDateFormatter constructor returned a valid object before using it (romainneutron)
60+
* bug #11439 [ExpressionLanguage] Fixed double quoted string literals containing sharps (pylebecq)
61+
* bug #11411 [Validator] Backported #11410 to 2.3: Object initializers are called only once per object (webmozart)
62+
* bug #11403 [Translator][FrameworkBundle] Added @ to the list of allowed chars in Translator (takeit)
63+
* bug #11381 [Process] Use correct test for empty string in UnixPipes (whs, romainneutron)
64+
1065
* 2.4.8 (2014-07-15)
1166

1267
* [Security] Forced validate of locales passed to the translator

‎CHANGELOG-2.5.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,50 @@ 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.4 (2014-09-03)
11+
12+
* security #11832 CVE-2014-6072 (fabpot)
13+
* security #11831 CVE-2014-5245 (stof)
14+
* security #11830 CVE-2014-4931 (aitboudad, Jérémy Derussé)
15+
* security #11829 CVE-2014-6061 (damz, fabpot)
16+
* security #11828 CVE-2014-5244 (nicolas-grekas, larowlan)
17+
* bug #10197 [FrameworkBundle] PhpExtractor bugfix and improvements (mtibben)
18+
* bug #11772 [Filesystem] Add FTP stream wrapper context option to enable overwrite (Damian Sromek)
19+
* bug #11791 [Process] fix mustRun() in sigchild environments (xabbuh)
20+
* bug #11788 [Yaml] fixed mapping keys containing a quoted # (hvt, fabpot)
21+
* bug #11787 fixed DateComparator if file does not exist (avi123)
22+
* bug #11160 [DoctrineBridge] Abstract Doctrine Subscribers with tags (merk)
23+
* bug #11768 [ClassLoader] Add a __call() method to XcacheClassLoader (tstoeckler)
24+
* bug #11739 [Validator] Pass strict argument into the strict email validator (brianfreytag)
25+
* bug #11749 [TwigBundle] Remove hard dependency of RequestContext in AssetsExtension (pgodel)
26+
* bug #11726 [Filesystem Component] mkdir race condition fix #11626 (kcassam)
27+
* bug #11677 [YAML] resolve variables in inlined YAML (xabbuh)
28+
* bug #11639 [DependencyInjection] Fixed factory service not within the ServiceReferenceGraph. (boekkooi)
29+
* bug #11778 [Validator] Fixed wrong translations for Collection constraints (samicemalone)
30+
* bug #11756 [DependencyInjection] fix @return anno created by PhpDumper (jakubkulhan)
31+
* bug #11711 [DoctrineBridge] Fix empty parameter logging in the dbal logger (jakzal)
32+
* bug #11692 [DomCrawler] check for the correct field type (xabbuh)
33+
* bug #11672 [Routing] fix handling of nullable XML attributes (xabbuh)
34+
* bug #11624 [DomCrawler] fix the axes handling in a bc way (xabbuh)
35+
* bug #11676 [Form] Fixed #11675 ValueToDuplicatesTransformer accept "0" value (Nek-)
36+
* bug #11695 [Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise (webmozart)
37+
* bug #11584 [FrameworkBundle] Fixed validator factory definition when the Validator API is "auto" for PHP < 5.3.9 (webmozart)
38+
* bug #11645 [Form] Fixed ValidatorExtension to work with the 2.5 Validation API (webmozart)
39+
* bug #11529 [WebProfilerBundle] Fixed double height of canvas (hason)
40+
* bug #11666 [DIC] Fixed: anonymous services are always private (lyrixx)
41+
* bug #11641 [WebProfilerBundle ] Fix toolbar vertical alignment (blaugueux)
42+
* bug #11637 fix dependencies on HttpFoundation component (xabbuh)
43+
* bug #11559 [Validator] Convert objects to string in comparison validators (webmozart)
44+
* feature #11510 [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field (catchamonkey)
45+
* bug #11408 [HttpFoundation] Update QUERY_STRING when overrideGlobals (yguedidi)
46+
* bug #11625 [FrameworkBundle] resolve parameters before the configs are processed in the config:debug command (xabbuh)
47+
* bug #11633 [FrameworkBundle] add missing attribute to XSD (xabbuh)
48+
* bug #11601 [Validator] Allow basic auth in url when using UrlValidator. (blaugueux)
49+
* bug #11609 [Console] fixed style creation when providing an unknown tag option (fabpot)
50+
* bug #10914 [HttpKernel] added an analyze of environment parameters for built-in server (mauchede)
51+
* bug #11598 [Finder] Shell escape and windows support (Gordon Franke, gimler)
52+
* bug #11582 [DoctrineBridge] Changed UniqueEntityValidator to use the 2.5 Validation API (webmozart)
53+
1054
* 2.5.3 (2014-08-06)
1155

1256
* bug #11571 [Form] Fixed FormValidator compatibility with the non-BC 2.5 Validation API (webmozart)

0 commit comments

Comments
 (0)
0