8000 Merge branch '2.7' · symfony/symfony@8f0277d · GitHub
[go: up one dir, main page]
Skip to content

Commit 8f0277d

Browse files
fabpotfabpot
committed
Merge branch '2.7'
* 2.7: (26 commits) removed Propel bridge from Symfony Core [2.7] Added deprecation warning for get request service in controller [Serializer] Normalizers can serialize collections and scalars [FrameworkBundle] Fix title and placeholder rendering in php form templates. [Process] added a deprecation notice [TwigBridge] Removed duplicated code from TwigRenderer [Translator][Logging] implement TranslatorBagInterface. RequestDataCollector - small fix renamed composer.phar to composer to be consistent with the Symfony docs [FrameworkBundle] bumped min version of Routing to 2.3 removed composer --dev option everywhere fixed a test [Console] Fixed output bug, if escaped string in a formatted string. “console help” ignores --raw option Fix form icon position in web profiler [Security] Remove ContextListener's onKernelResponse listener as it is used Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)" Revert "fixed assertion" fixed assertion [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value ... Conflicts: composer.json src/Symfony/Bridge/Propel1/composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
2 parents 081caa2 + fd74507 commit 8f0277d

File tree

108 files changed

+215
-3501
lines changed

Some content is hidden

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

108 files changed

+215
-3501
lines changed

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ before_install:
3434
- if [ "$TRAVIS_BRANCH" = "master" ]; then export COMPOSER_ROOT_VERSION=dev-master; else export COMPOSER_ROOT_VERSION="$TRAVIS_BRANCH".x-dev; fi;
3535

3636
install:
37-
- if [ "$components" = "no" ]; then composer --prefer-source --dev install; fi;
37+
- if [ "$components" = "no" ]; then composer --prefer-source install; fi;
3838

3939
script:
4040
- if [ "$components" = "no" ]; then ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo -e "\\nRunning {} tests"; phpunit --exclude-group tty,benchmark,intl-data {} || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
4141
- if [ "$components" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi;
42-
- if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --dev update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
43-
- if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --dev --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
42+
- if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
43+
- if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;

‎composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"symfony/monolog-bridge": "self.version",
4747
"symfony/options-resolver": "self.version",
4848
"symfony/process": "2.99.99",
49-
"symfony/propel1-bridge": "self.version",
5049
"symfony/property-access": "self.version",
5150
"symfony/proxy-manager-bridge": "self.version",
5251
"symfony/routing": "self.version",

‎src/Symfony/Bridge/Doctrine/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ Resources
1010
You can run the unit tests with the following command:
1111

1212
$ cd path/to/Symfony/Bridge/Doctrine/
13-
$ composer.phar install
13+
$ composer install
1414
$ phpunit

‎src/Symfony/Bridge/Monolog/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ Resources
99
You can run the unit tests with the following command:
1010

1111
$ cd path/to/Symfony/Bridge/Monolog/
12-
$ composer.phar install
12+
$ composer install
1313
$ phpunit

‎src/Symfony/Bridge/Propel1/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/Symfony/Bridge/Propel1/CHANGELOG.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/Symfony/Bridge/Propel1/DataCollector/PropelDataCollector.php

Lines changed: 0 additions & 147 deletions
This file was deleted.

‎src/Symfony/Bridge/Propel1/DependencyInjection/Security/UserProvider/PropelFactory.php

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0