8000 Merge branch '3.0' · symfony/symfony@586c58a · GitHub
[go: up one dir, main page]
Skip to content

Commit 586c58a

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.0'
* 3.0: [travis] timeout the sigchild tests at 60s CS: Single line comments should use double slashes (//) and not hash (#). Do not use HttpKernel Extension when not needed for 2.7 bumped Symfony version to 3.0.2 Do not use HttpKernel Extension when not needed updated VERSION for 3.0.1 updated CHANGELOG for 3.0.1 bumped Symfony version to 2.8.2 updated VERSION for 2.8.1 updated CHANGELOG for 2.8.1 bumped Symfony version to 2.7.9 updated VERSION for 2.7.8 updated CHANGELOG for 2.7.8 bumped Symfony version to 2.3.37 updated VERSION for 2.3.36 update CONTRIBUTORS for 2.3.36 updated CHANGELOG for 2.3.36 Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"" Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)" use nowdoc instead of heredoc Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
2 parents a976840 + 3040977 commit 586c58a

File tree

41 files changed

+211
-128
lines changed

Some content is hidden

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

41 files changed

+211
-128
lines changed

‎.php_cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,7 @@ return Symfony\CS\Config\Config::create()
2424
->notPath('src/Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
2525
// test template
2626
->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
27+
// explicit heredoc test
28+
->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
2729
)
2830
;

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ install:
5858
script:
5959
- if [[ ! $deps ]]; then echo "$COMPONENTS" | parallel --gnu '$PHPUNIT --exclude-group tty,benchmark,intl-data {}'; fi;
6060
- if [[ ! $deps ]]; then echo -e "\\nRunning tests requiring tty"; $PHPUNIT --group tty; fi;
61-
- if [[ ! $deps && $TRAVIS_PHP_VERSION = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | parallel --gnu 'echo -e "\\nPHP --enable-sigchild enhanced={}" && ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/'; fi;
61+
- if [[ ! $deps && $TRAVIS_PHP_VERSION = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | parallel --gnu --timeout 60 'echo -e "\\nPHP --enable-sigchild enhanced={}" && ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/'; fi;
6262
- if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer --prefer-source update; $PHPUNIT --exclude-group tty,benchmark,intl-data'$LEGACY; fi;
6363
- if [[ $deps = low ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi;
6464
- if [[ $deps = skip ]]; then echo This matrix line is skipped for pull requests.; fi;

‎CHANGELOG-3.0.md

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,60 @@ in 3.0 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/v3.0.0...v3.0.1
99

10+
* 3.0.1 (2015-12-26)
11+
12+
* bug #16864 [Yaml] fix indented line handling in folded blocks (xabbuh)
13+
* bug #17052 Fixed flatten exception recursion with errors (GrahamCampbell)
14+
* bug #16826 Embedded identifier support (mihai-stancu)
15+
* bug #17079 Also transform inline mappings to objects (WouterJ)
16+
* bug #17129 [Config] Fix array sort on normalization in edge case (romainneutron)
17+
* feature #17035 [DomCrawler] Revert previous restriction, allow selection of every DOMNode object (EdgarPE)
18+
* bug #17094 [Process] More robustness and deterministic tests (nicolas-grekas)
19+
* bug #17112 [PropertyAccess] Reorder elements array after PropertyPathBuilder::replace (alekitto)
20+
* bug #17109 Improved the design of the web debug toolbar (javiereguiluz)
21+
* bug #16797 [Filesystem] Recursivly widen non-executable directories (Slamdunk)
22+
* bug #16926 [DependencyInjection] fixed definition loosing property shared when decorated by a parent definition (wahler)
23+
* bug #17040 [Console] Avoid extra blank lines when rendering exceptions (ogizanagi)
24+
* bug #17044 [Form] fix BC break introduced with prototype_data option (memphys)
25+
* bug #17055 [Security] Verify if a password encoded with bcrypt is no longer than 72 characters (jakzal)
26+
* bug #16959 [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too (HeahDude)
27+
* bug #16806 [Validator] BicValidator - fixed raising violations to a maximum of one (mvhirsch)
28+
* bug #16842 [Ldap] Escape carriage returns in LDAP DNs. (ChadSikorra)
29+
* bug #16860 [Yaml] do not remove "comments" in scalar blocks (xabbuh)
30+
* bug #17002 [Console][Table] fixed render row that contains multiple cells. (aitboudad)
31+
* bug #16964 CSS min-height and min-width should not be "auto" (aschempp)
32+
* bug #16971 [HttpFoundation] Added the ability of using BinaryFileResponse with stream wrappers (jakzal, Sander-Toonen)
33+
* bug #17048 Fix the logout path when not using the router (stof)
34+
* bug #17049 Fix the logout path when not using the router (stof)
35+
* bug #17057 [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands (xabbuh)
36+
* bug #17059 [HttpFoundation] fix error level for deprecation (xabbuh)
37+
* bug #17006 [Form] Fix casting regression in DoctrineChoiceLoader (bendavies)
38+
* bug #16911 [PropertyInfo] Update List Information from ReflectionExtractor (zanderbaldwin)
39+
* bug #16955 [FrameworkBundle] ContainerDebugCommand: pass the right object to the descriptors (xabbuh)
40+
* bug #16970 [HttpKernel] HttpCache: remove an ESI instance checking (voronkovich)
41+
* feature #16760 Show silenced errors in separate tab (peterrehm)
42+
* feature #16937 [PhpUnitBridge] Replace "weak-verbose" by "deprecations upper bound" mode (nicolas-grekas)
43+
* bug #16953 return ajax collector to collectors.php (NothingWeAre)
44+
* bug #16915 [Process] Enhance compatiblity with --enable-sigchild (nicolas-grekas)
45+
* bug #16829 [FrameworkBundle] prevent cache:clear creating too long paths (Tobion)
46+
* bug #16922 [FrameworkBundle] [Bug] Fixes new InputStyle bug #16920 (AlmogBaku)
47+
* bug #16921 Fix short array syntax for php 5.3 (ewgRa)
48+
* bug #16450 [Serializer] Fixed `array_unique` on array of objects in `getAllowedAttributes`. (CornyPhoenix)
49+
* bug #16757 [FrameworkBundle] [Translation] Fixed translations not written when no translations directory in update command (jeremyFreeAgent)
50+
* bug #16902 [Security] Fix a Polyfill import statement in StringUtils (magnetik)
51+
* bug #16871 [FrameworkBundle] Disable built-in server commands when Process component is missing (gnugat, xabbuh)
52+
* bug #16870 [FrameworkBundle] Disable the server:run command when Process component is missing (gnugat, xabbuh)
53+
* feature #16789 [PhpUnitBridge] Add weak-verbose mode and match against message instead of test name (nicolas-grekas)
54+
* minor #16850 [MonologBridge] Added a test case for the Logger class (derrabus)
55+
* bug #16796 [Form] Fix choices defined as Traversable (nicolas-grekas)
56+
* bug #16742 [Console][ProgressBar] redrawFrequency should never be 0 (dritter)
57+
* bug #16846 [MonologBridge] Monolog Bridge 2.8 is incompatible with HttpKernel 3.0 (derrabus)
58+
* bug #16816 [Config] Throw an exception when using cannotBeEmpty() with numeric or boolean nodes (Ener-Getick)
59+
* bug #16799 Improve error message for undefined DIC aliases (mpdude)
60+
* bug #16825 [VarDumper] fix .sf-dump z-index (debug bar conflict) (Antoine LA)
61+
* bug #16772 Refactoring EntityUserProvider::__construct() to not do work, cause cache warm error (weaverryan)
62+
* bug #16788 Reapply the Yaml bugfix of #16745 (stof)
63+
1064
* 3.0.0 (2015-11-30)
1165

1266
* bug #16758 Fix BC for the default root form name (stof)

0 commit comments

Comments
 (0)
0