8000 Merge branch '2.8' of github.com:symfony/symfony into yaml_tree_dumper · symfony/symfony@c7fc4fb · GitHub
[go: up one dir, main page]
Skip to content

Commit c7fc4fb

Browse files
gepogepo
committed
Merge branch '2.8' of github.com:symfony/symfony into yaml_tree_dumper
Conflicts: src/Symfony/Component/Translation/CHANGELOG.md src/Symfony/Component/Translation/Dumper/YamlFileDumper.php
2 parents 8f3f744 + aef24cb commit c7fc4fb

File tree

219 files changed

+2505
-1325
lines changed

Some content is hidden

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

219 files changed

+2505
-1325
lines changed

‎.travis.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
 10000
11
language: php
22

3+
sudo: false
4+
5+
addons:
6+
apt_packages:
7+
- parallel
8+
- language-pack-fr-base
9+
310
matrix:
411
include:
512
- php: 5.3
@@ -11,10 +18,10 @@ matrix:
1118
- php: 5.6
1219
env: deps=high
1320
- php: nightly
14-
- php: hhvm-nightly
21+
- php: hhvm
1522
allow_failures:
1623
- php: nightly
17-
- php: hhvm-nightly
24+
- php: hhvm
1825
fast_finish: true
1926

2027
services: mongodb
@@ -25,15 +32,13 @@ env:
2532
- SYMFONY_DEPRECATIONS_HELPER=weak
2633

2734
before_install:
28-
- travis_retry sudo apt-get install parallel
2935
- composer self-update
30-
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then phpenv config-rm xdebug.ini; fi;
31-
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
32-
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
33-
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then (pecl install -f memcached-2.1.0 && echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini) || echo "Let's continue without memcache extension"; fi;
34-
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then (cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo "extension = $(pwd)/modules/symfony_debug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini); fi;
35-
- if [[ "$TRAVIS_PHP_VERSION" != *"nightly" ]]; then php -i; fi;
36-
- sudo locale-gen fr_FR.UTF-8 && sudo update-locale
36+
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi;
37+
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
38+
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
39+
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then (pecl install -f memcached-2.1.0 && echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini) || echo "Let's continue without memcache extension"; fi;
40+
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then (cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo "extension = $(pwd)/modules/symfony_debug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini); fi;
41+
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then php -i; fi;
3742
# Set the COMPOSER_ROOT_VERSION to the right version according to the branch being built
3843
- if [ "$TRAVIS_BRANCH" = "master" ]; then export COMPOSER_ROOT_VERSION=dev-master; else export COMPOSER_ROOT_VERSION="$TRAVIS_BRANCH".x-dev; fi;
3944

‎CHANGELOG-2.3.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,25 @@ 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.28 (2015-05-10)
11+
12+
* bug #14266 [HttpKernel] Check if "symfony/proxy-manager-bridge" package is installed (hason)
13+
* bug #14501 [ProxyBridge] Fix proxy classnames generation (xphere)
14+
* bug #14498 [FrameworkBundle] Added missing log in server:run command (lyrixx)
15+
* bug #14484 [SecurityBundle][WebProfiler] check authenticated user by tokenClass instead of username. (aitboudad)
16+
* bug #14497 [HttpFoundation] Allow curly braces in trusted host patterns (sgrodzicki)
17+
* bug #14436 Show a better error when the port is in use (dosten)
18+
* bug #14463 [Validator] Fixed Choice when an empty array is used in the "choices" option (webmozart)
19+
* bug #14402 [FrameworkBundle][Translation] Check for 'xlf' instead of 'xliff' (xelaris)
20+
* bug #14272 [FrameworkBundle] Workaround php -S ignoring auto_prepend_file (nicolas-grekas)
21+
* bug #14345 [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors (nicolas-grekas)
22+
* bug #14325 [Routing][DependencyInjection] Support .yaml extension in YAML loaders (thunderer)
23+
* bug #14344 [Translation][fixed test] refresh cache when resources are no longer fresh. (aitboudad)
24+
* bug #14268 [Translator] Cache does not take fallback locales into consideration (sf2.3) (mpdude)
25+
* bug #14192 [HttpKernel] Embed the original exception as previous to bounced exceptions (nicolas-grekas)
26+
* bug #14102 [Enhancement] netbeans - force interactive shell when limited detection (cordoval)
27+
* bug #14191 [StringUtil] Fixed singularification of 'movies' (GerbenWijnja)
28+
1029
* 2.3.27 (2015-04-01)
1130

1231
* security #14167 CVE-2015-2308 (nicolas-grekas)

‎CHANGELOG-2.6.md

Lines changed: 43 additions & 0 deletions
B96F
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,49 @@ in 2.6 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.6.0...v2.6.1
99

10+
* 2.6.7 (2015-05-11)
11+
12+
* bug #14266 [HttpKernel] Check if "symfony/proxy-manager-bridge" package is installed (hason)
13+
* bug #14478 [DebugBundle] Fix dump() output in API / No-Toolbar context (nicolas-grekas)
14+
* bug #14501 [ProxyBridge] Fix proxy classnames generation (xphere)
15+
* bug #14527 Fix getOrigin (WouterJ)
16+
* bug #14498 [FrameworkBundle] Added missing log in server:run command (lyrixx)
17+
* bug #14503 [Finder] Only use GLOB_BRACE when available (dosten)
18+
* bug #14484 [SecurityBundle][WebProfiler] check authenticated user by tokenClass instead of username. (aitboudad)
19+
* bug #14497 [HttpFoundation] Allow curly braces in trusted host patterns (sgrodzicki)
20+
* bug #14480 [TwigBundle] Fix deprecated use of FlattenException (alOneh)
21+
* bug #14469 [Debug] BaseException compatibility for PHP7 (nicolas-grekas)
22+
* bug #14466 [WebProfiler] fix html syntax for input types (Tobion)
23+
* bug #14436 Show a better error when the port is in use (dosten)
24+
* bug #14463 [Validator] Fixed Choice when an empty array is used in the "choices" option (webmozart)
25+
* bug #14446 [DependencyInjection] resolve circular reference (xabbuh)
26+
* bug #14448 [Validator] Fixed Choice when an empty array is used in the "choices" option (webmozart)
27+
* bug #14451 [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups (nicolas-grekas)
28+
* bug #14355 [EventDispatcher] make listeners removable from an executed listener (xabbuh)
29+
* bug #14402 [FrameworkBundle][Translation] Check for 'xlf' instead of 'xliff' (xelaris)
30+
* bug #14272 [FrameworkBundle] Workaround php -S ignoring auto_prepend_file (nicolas-grekas)
31+
* bug #14362 [Debug] Scream as LogLevel::DEBUG (but for fatal errors / uncaught exceptions) (nicolas-grekas)
32+
* bug #14345 [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors (nicolas-grekas)
33+
* bug #14381 [FrameworkBundle] Initialize translator with the default locale. (aitboudad)
34+
* bug #14325 [Routing][DependencyInjection] Support .yaml extension in YAML loaders (thunderer)
35+
* bug #14344 [Translation][fixed test] refresh cache when resources are no longer fresh. (aitboudad)
36+
* bug #14346 [WebProfilerBundle] Fix resiliency to exceptions thrown by the url generator (nicolas-grekas)
37+
* bug #14338 [FrameworkBundle] improve usage of Table helper (xabbuh)
38+
* bug #14129 [FrameworkBundle] Fixed server:start --router relative path issue #14124 (abulford)
39+
* bug #14271 [VarDumper] Fix call site detection (nicolas-grekas)
40+
* bug #14277 [Translator] Cache does not take fallback locales into consideration (mpdude)
41+
* bug #14268 [Translator] Cache does not take fallback locales into consideration (sf2.3) (mpdude)
42+
* bug #14256 [Form] Fixed DateType/TimeType (webmozart)
43+
* bug #14226 [Profiler][Logger] fixed cycle odd/even. (aitboudad)
44+
* bug #14204 [VarDumper] Towards PHP7 support (nicolas-grekas)
45+
* bug #14205 Fix currently broken tests (mpdude)
46+
* bug #14192 [HttpKernel] Embed the original exception as previous to bounced exceptions (nicolas-grekas)
47+
* bug #14102 [Enhancement] netbeans - force interactive shell when limited detection (cordoval)
48+
* bug #14191 [StringUtil] Fixed singularification of 'movies' (GerbenWijnja)
49+
* bug #14182 [FrameworkBundle] fixes displaying of deprecation notices. (hhamon)
50+
* feature #14186 [Debug] Renamed "context" key to "scope_vars" to avoid any ambiguity (lyrixx)
51+
* bug #14170 Fix the AJAX profiling (stof)
52+
1053
* 2.6.6 (2015-04-01)
1154

1255
* security #14167 CVE-2015-2308 (nicolas-grekas)

‎CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ If you'd like to contribute, please read the following documents:
2727

2828
* [Backwards Compatibility][4]: Backward compatibility rules.
2929

30-
[1]: http://symfony.com/doc/current/contributing/code/index.html
31-
[2]: http://symfony.com/doc/current/contributing/code/patches.html#check-list
32-
[3]: http://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request
33-
[4]: http://symfony.com/doc/current/contributing/code/bc.html#working-on-symfony-code
30+
[1]: https://symfony.com/doc/current/contributing/code/index.html
31+
[2]: https://symfony.com/doc/current/contributing/code/patches.html#check-list
32+
[3]: https://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request
33+
[4]: https://symfony.com/doc/current/contributing/code/bc.html#working-on-symfony-code

0 commit comments

Comments
 (0)
0