Skip to content

Commit 8b02796

Browse files
nicolas-grekasnicolas-grekas
committed
[2.3] require-dev PHPUnit bridge
1 parent c0dcbed commit 8b02796

File tree

80 files changed

+124
-130
lines changed

Some content is hidden

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

80 files changed

+124
-130
lines changed

‎.travis.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ matrix:
88
- php: 5.5
99
- php: 5.6
1010
- php: 5.3
11-
env: components=low
11+
env: deps=low
1212
- php: 5.6
13-
env: components=high
13+
env: deps=high
1414
- php: hhvm-nightly
1515
allow_failures:
1616
- php: hhvm-nightly
@@ -20,7 +20,8 @@ services: mongodb
2020

2121
env:
2222
global:
23-
- components=no
23+
- deps=no
24+
- SYMFONY_DEPRECATIONS_HELPER=weak
2425

2526
before_install:
2627
- travis_retry sudo apt-get install parallel
@@ -36,10 +37,10 @@ before_install:
3637
- if [ "$TRAVIS_BRANCH" = "master" ]; then export COMPOSER_ROOT_VERSION=dev-master; else export COMPOSER_ROOT_VERSION="$TRAVIS_BRANCH".x-dev; fi;
3738

3839
install:
39-
- if [ "$components" = "no" ]; then composer --prefer-source install; fi;
40+
- if [ "$deps" = "no" ]; then composer --prefer-source install; fi;
4041

4142
script:
42-
- 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;
43-
- if [ "$components" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi;
44-
- 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;
45-
- 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;
43+
- if [ "$deps" = "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;
44+
- if [ "$deps" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi;
45+
- if [ "$deps" = "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,legacy || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
46+
- if [ "$deps" = "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;

‎autoload.php.dist

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

‎composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"symfony/yaml": "self.version"
6262
},
6363
"require-dev": {
64+
"symfony/phpunit-bridge": "~2.7",
6465
"doctrine/data-fixtures": "1.0.*",
6566
"doctrine/dbal": "~2.2",
6667
"doctrine/orm": "~2.2,>=2.2.3",

‎phpunit.xml.dist

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
66
colors="true"
7-
bootstrap="autoload.php.dist"
7+
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<ini name="intl.default_locale" value="en"/>
11-
<ini name="intl.error_level" value="0"/>
12-
<ini name="memory_limit" value="-1"/>
10+
<ini name="error_reporting" value="-1" />
11+
<ini name="intl.default_locale" value="en" />
12+
<ini name="intl.error_level" value="0" />
13+
<ini name="memory_limit" value="-1" />
1314
</php>
1415

1516
<testsuites>

‎src/Symfony/Bridge/Doctrine/Tests/bootstrap.php

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

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"doctrine/common": "~2.3"
2121
},
2222
"require-dev": {
23+
"symfony/phpunit-bridge": "~2.7",
2324
"symfony/stopwatch": "~2.2",
2425
"symfony/dependency-injection": "~2.0,>=2.0.5",
2526
"symfony/form": "~2.3,>=2.3.8",

‎src/Symfony/Bridge/Doctrine/phpunit.xml.dist

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
55
backupGlobals="false"
66
colors="true"
7-
bootstrap="Tests/bootstrap.php"
7+
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony Doctrine Bridge Test Suite">

‎src/Symfony/Bridge/Monolog/composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
"symfony/http-kernel": "~2.2",
2121
"monolog/monolog": "~1.3"
2222
},
23+
"require-dev": {
24+
"symfony/phpunit-bridge": "~2.7"
25+
},
2326
"autoload": {
2427
"psr-0": { "Symfony\\Bridge\\Monolog\\": "" }
2528
},

‎src/Symfony/Bridge/Monolog/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony Monolog Bridge Test Suite">

‎src/Symfony/Bridge/Propel1/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"propel/propel1": "~1.6,>=1.6.5"
2525
},
2626
"require-dev": {
27+
"symfony/phpunit-bridge": "~2.7",
2728
"symfony/stopwatch": "~2.2"
2829
},
2930
"autoload": {

‎src/Symfony/Bridge/Propel1/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony Propel1 Bridge Test Suite">

‎src/Symfony/Bridge/ProxyManager/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"ocramius/proxy-manager": "~0.3.1"
2222
},
2323
"require-dev": {
24+
"symfony/phpunit-bridge": "~2.7",
2425
"symfony/config": "~2.3"
2526
},
2627
"autoload": {

‎src/Symfony/Bridge/ProxyManager/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony ProxyManager Bridge Test Suite">

‎src/Symfony/Bridge/Swiftmailer/composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
"php": ">=5.3.3",
2020
"swiftmailer/swiftmailer": ">=4.2.0,<6.0-dev"
2121
},
22+
"require-dev": {
23+
"symfony/phpunit-bridge": "~2.7"
24+
},
2225
"suggest": {
2326
"symfony/http-kernel": ""
2427
},

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"twig/twig": "~1.12,>=1.12.3"
2121
},
2222
"require-dev": {
23+
"symfony/phpunit-bridge": "~2.7",
2324
"symfony/finder": "~2.3",
2425
"symfony/form": "~2.3.5",
2526
"symfony/http-kernel": "~2.3",

‎src/Symfony/Bridge/Twig/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony Twig Bridge Test Suite">

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"doctrine/common": "~2.2"
3131
},
3232
"require-dev": {
33+
"symfony/phpunit-bridge": "~2.7",
3334
"symfony/browser-kit": "~2.3",
3435
"symfony/console": "~2.3",
3536
"symfony/css-selector": "~2.0,>=2.0.5",

‎src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony FrameworkBundle Test Suite">

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"symfony/http-kernel": "~2.2"
2222
},
2323
"require-dev": {
24+
"symfony/phpunit-bridge": "~2.7",
2425
"symfony/browser-kit": "~2.3",
2526
"symfony/css-selector": "~2.0,>=2.0.5",
2627
"symfony/dependency-injection": "~2.3",

‎src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony SecurityBundle Test Suite">

‎src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2"
2222
},
2323
"require-dev": {
24+
"symfony/phpunit-bridge": "~2.7",
2425
"symfony/stopwatch": "~2.2",
2526
"symfony/dependency-injection": "~2.2",
2627
"symfony/config": "~2.2",

‎src/Symfony/Bundle/TwigBundle/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony TwigBundle Test Suite">

‎src/Symfony/Bundle/WebProfilerBundle/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"symfony/twig-bridge": "~2.2"
2323
},
2424
"require-dev": {
25+
"symfony/phpunit-bridge": "~2.7",
2526
"symfony/config": "~2.2",
2627
"symfony/console": "~2.3",
2728
"symfony/dependency-injection": "~2.2",

‎src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony WebProfilerBundle Test Suite">

‎src/Symfony/Component/BrowserKit/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"symfony/dom-crawler": "~2.0,>=2.0.5"
2121
},
2222
"require-dev": {
23+
"symfony/phpunit-bridge": "~2.7",
2324
"symfony/process": "~2.0,>=2.0.5",
2425
"symfony/css-selector": "~2.0,>=2.0.5"
2526
},

‎src/Symfony/Component/BrowserKit/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony BrowserKit Component Test Suite">

‎src/Symfony/Component/ClassLoader/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"php": ">=5.3.3"
2121
},
2222
"require-dev": {
23+
"symfony/phpunit-bridge": "~2.7",
2324
"symfony/finder": "~2.0,>=2.0.5"
2425
},
2526
"autoload": {

‎src/Symfony/Component/ClassLoader/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony ClassLoader Component Test Suite">

‎src/Symfony/Component/Config/composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
"php": ">=5.3.3",
2020
"symfony/filesystem": "~2.3"
2121
},
22+
"require-dev": {
23+
"symfony/phpunit-bridge": "~2.7"
24+
},
2225
"autoload": {
2326
"psr-0": { "Symfony\\Component\\Config\\": "" }
2427
},

‎src/Symfony/Component/Config/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony Config Component Test Suite">

‎src/Symfony/Component/Console/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"php": ">=5.3.3"
2020
},
2121
"require-dev": {
22+
"symfony/phpunit-bridge": "~2.7",
2223
"symfony/event-dispatcher": "~2.1"
2324
},
2425
"suggest": {

‎src/Symfony/Component/Console/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony Console Component Test Suite">

‎src/Symfony/Component/CssSelector/composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
"require": {
2323
"php": ">=5.3.3"
2424
},
25+
"require-dev": {
26+
"symfony/phpunit-bridge": "~2.7"
27+
},
2528
"autoload": {
2629
"psr-0": { "Symfony\\Component\\CssSelector\\": "" }
2730
},

‎src/Symfony/Component/CssSelector/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony CssSelector Component Test Suite">

‎src/Symfony/Component/Debug/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
2323
},
2424
"require-dev": {
25+
"symfony/phpunit-bridge": "~2.7",
2526
"symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2",
2627
"symfony/http-foundation": "~2.1"
2728
},

‎src/Symfony/Component/Debug/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony Debug Component Test Suite">

‎src/Symfony/Component/DependencyInjection/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"php": ">=5.3.3"
2020
},
2121
"require-dev": {
22+
"symfony/phpunit-bridge": "~2.7",
2223
"symfony/yaml": "~2.1",
2324
"symfony/config": "~2.2"
2425
},

0 commit comments

Comments
 (0)