diff --git a/.travis.yml b/.travis.yml index 23a740532f8c9..e58001df17dce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,8 +45,8 @@ install: - if [ "$deps" != "skip" ] && [ "$deps" != "no" ]; then php .travis.php $TRAVIS_COMMIT_RANGE $TRAVIS_BRANCH $COMPONENTS; fi; script: - - if [ "$deps" = "no" ]; then echo "$COMPONENTS" | parallel --gnu 'echo -e "\\nRunning {} tests"; $PHPUNIT --exclude-group tty,benchmark,intl-data {}'; fi; + - if [ "$deps" = "no" ]; then echo "$COMPONENTS" | parallel --gnu '$PHPUNIT --exclude-group tty,benchmark,intl-data {}'; fi; - if [ "$deps" = "no" ]; then echo -e "\\nRunning tests requiring tty"; $PHPUNIT --group tty; fi; - - if [ "$deps" = "high" ]; then echo "$COMPONENTS" | parallel --gnu -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi; - - if [ "$deps" = "low" ]; then echo "$COMPONENTS" | parallel --gnu -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi; + - if [ "$deps" = "high" ]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer --prefer-source update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi; + - 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; - if [ "$deps" = "skip" ]; then echo 'This matrix line is skipped for pull requests.'; fi; diff --git a/appveyor.yml b/appveyor.yml index a6f29ce6c115a..fd9153e47ee39 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,6 +14,7 @@ init: - SET PHP=1 - SET ANSICON=121x90 (121x90) - SET PHP_INI_MATRIX=php.ini-min php.ini-max + - SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped install: - IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php) @@ -32,6 +33,7 @@ install: - IF %PHP%==1 cd .. - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat - IF %PHP%==1 copy /Y php.ini-development php.ini-min + - IF %PHP%==1 echo max_execution_time=1200 >> php.ini-min - IF %PHP%==1 echo date.timezone="UTC" >> php.ini-min - IF %PHP%==1 echo extension_dir=ext >> php.ini-min - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini-min diff --git a/composer.json b/composer.json index bf85b666a6547..521ccade6dad1 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,6 @@ "symfony/yaml": "self.version" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", "doctrine/orm": "~2.4,>=2.4.5", diff --git a/phpunit b/phpunit index 01d6e0f910dca..74df7131b8b95 100755 --- a/phpunit +++ b/phpunit @@ -28,7 +28,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit")) { // Build a standalone phpunit without symfony/yaml $oldPwd = getcwd(); - mkdir($PHPUNIT_DIR); + @mkdir($PHPUNIT_DIR); chdir($PHPUNIT_DIR); if (extension_loaded('openssl') && ini_get('allow_url_fopen')) { stream_copy_to_stream(fopen("https://github.com/sebastianbergmann/phpunit/archive/$PHPUNIT_VERSION.zip", 'rb'), fopen("$PHPUNIT_VERSION.zip", 'wb')); @@ -41,6 +41,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit")) { $zip->close(); chdir("phpunit-$PHPUNIT_VERSION"); passthru("$COMPOSER remove --no-update symfony/yaml"); + passthru("$COMPOSER require --dev --no-update symfony/phpunit-bridge \">=2.8@dev\""); passthru("$COMPOSER install --prefer-source --no-progress --ansi"); chdir($oldPwd); } @@ -76,10 +77,13 @@ if ($phpIniMatrix) { if (isset($argv[1]) && 'symfony' === $argv[1]) { // Find Symfony components in plain php for Windows portability - $finder = new RecursiveDirectoryIterator(__DIR__.'/src/Symfony', FilesystemIterator::KEY_AS_FILENAME | FilesystemIterator::UNIX_PATHS); + $oldPwd = getcwd(); + chdir(__DIR__); + $finder = new RecursiveDirectoryIterator('src/Symfony', FilesystemIterator::KEY_AS_FILENAME | FilesystemIterator::UNIX_PATHS); $finder = new RecursiveIteratorIterator($finder); $finder->setMaxDepth(3); + $skippedTests = isset($_SERVER['SYMFONY_PHPUNIT_SKIPPED_TESTS']) ? $_SERVER['SYMFONY_PHPUNIT_SKIPPED_TESTS'] : false; $runningProcs = array(); foreach ($finder as $file => $fileInfo) { @@ -88,6 +92,10 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) { // Run phpunit tests in parallel + if ($skippedTests) { + putenv("SYMFONY_PHPUNIT_SKIPPED_TESTS=$component/$skippedTests"); + } + $c = ProcessUtils::escapeArgument($component); if ($proc = proc_open(sprintf($cmd, $c, " > $c/phpunit.stdout 2> $c/phpunit.stderr"), array(), $pipes)) { @@ -98,6 +106,7 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) { } } } + chdir($oldPwd); // Fixes for colors support on appveyor // See https://github.com/appveyor/ci/issues/373 @@ -139,6 +148,9 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) { } unlink($file); } + if ($skippedTests) { + @unlink("$component/$skippedTests"); + } if ($procStatus) { $exit = 1; diff --git a/phpunit.xml.dist b/phpunit.xml.dist index e9c709d14223a..4c890901621fc 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -41,4 +41,8 @@ + + + + diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 7c799262275d8..7012ab771cda0 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -20,7 +20,6 @@ "doctrine/common": "~2.4" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/stopwatch": "~2.2", "symfony/dependency-injection": "~2.0,>=2.0.5", "symfony/form": "~2.3,>=2.3.8", diff --git a/src/Symfony/Bridge/Doctrine/phpunit.xml.dist b/src/Symfony/Bridge/Doctrine/phpunit.xml.dist index 13409e6f0f6b5..3692a77140877 100644 --- a/src/Symfony/Bridge/Doctrine/phpunit.xml.dist +++ b/src/Symfony/Bridge/Doctrine/phpunit.xml.dist @@ -24,4 +24,8 @@ + + + + diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json index 1012587624b7d..bd4cfa54324f9 100644 --- a/src/Symfony/Bridge/Monolog/composer.json +++ b/src/Symfony/Bridge/Monolog/composer.json @@ -20,9 +20,6 @@ "symfony/http-kernel": "~2.2", "monolog/monolog": "~1.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "autoload": { "psr-0": { "Symfony\\Bridge\\Monolog\\": "" } }, diff --git a/src/Symfony/Bridge/Monolog/phpunit.xml.dist b/src/Symfony/Bridge/Monolog/phpunit.xml.dist index efd48709de90b..55fc79fd00a84 100644 --- a/src/Symfony/Bridge/Monolog/phpunit.xml.dist +++ b/src/Symfony/Bridge/Monolog/phpunit.xml.dist @@ -24,4 +24,8 @@ + + + + diff --git a/src/Symfony/Bridge/Propel1/composer.json b/src/Symfony/Bridge/Propel1/composer.json index 87bd962c96fb3..ab92f4d22e020 100644 --- a/src/Symfony/Bridge/Propel1/composer.json +++ b/src/Symfony/Bridge/Propel1/composer.json @@ -24,7 +24,6 @@ "propel/propel1": "~1.6,>=1.6.5" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/stopwatch": "~2.2" }, "autoload": { diff --git a/src/Symfony/Bridge/Propel1/phpunit.xml.dist b/src/Symfony/Bridge/Propel1/phpunit.xml.dist index 507e12596cbd4..4691fb6d0fc91 100644 --- a/src/Symfony/Bridge/Propel1/phpunit.xml.dist +++ b/src/Symfony/Bridge/Propel1/phpunit.xml.dist @@ -24,4 +24,8 @@ + + + + diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json index 099d36432e503..8a2a81bf17bd6 100644 --- a/src/Symfony/Bridge/ProxyManager/composer.json +++ b/src/Symfony/Bridge/ProxyManager/composer.json @@ -21,7 +21,6 @@ "ocramius/proxy-manager": "~0.3.1" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/config": "~2.3" }, "autoload": { diff --git a/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist b/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist index 363805fdfa6ae..2479485ca3fcc 100644 --- a/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist +++ b/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Bridge/Swiftmailer/composer.json b/src/Symfony/Bridge/Swiftmailer/composer.json index 2a488cbaece0a..09cdce00a6fd1 100644 --- a/src/Symfony/Bridge/Swiftmailer/composer.json +++ b/src/Symfony/Bridge/Swiftmailer/composer.json @@ -19,9 +19,6 @@ "php": ">=5.3.3", "swiftmailer/swiftmailer": ">=4.2.0,<6.0-dev" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "suggest": { "symfony/http-kernel": "" }, diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 4b9b7084297ac..8ba426b6b16bc 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -20,7 +20,6 @@ "twig/twig": "~1.20|~2.0" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/finder": "~2.3", "symfony/form": "~2.3.31", "symfony/http-kernel": "~2.3", diff --git a/src/Symfony/Bridge/Twig/phpunit.xml.dist b/src/Symfony/Bridge/Twig/phpunit.xml.dist index d291324949f2d..6f40919cb1a1f 100644 --- a/src/Symfony/Bridge/Twig/phpunit.xml.dist +++ b/src/Symfony/Bridge/Twig/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 9bec22ef534bb..03d183040bb66 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -30,7 +30,6 @@ "doctrine/common": "~2.2" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/browser-kit": "~2.3", "symfony/console": "~2.3", "symfony/css-selector": "~2.0,>=2.0.5", diff --git a/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist b/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist index eb7c0b0a97a2f..6d1abb32aaa02 100644 --- a/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index 1ceb4ed0ebb8c..f3a001b649896 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -22,7 +22,6 @@ "symfony/http-kernel": "~2.2" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/browser-kit": "~2.3", "symfony/css-selector": "~2.0,>=2.0.5", "symfony/dependency-injection": "~2.3", diff --git a/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist b/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist index 52f420ae5f2fe..2fdc45986f090 100644 --- a/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index a9b9bfeaac26f..ea7e9e72e363a 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -21,7 +21,6 @@ "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/stopwatch": "~2.2", "symfony/dependency-injection": "~2.2", "symfony/config": "~2.2", diff --git a/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist b/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist index 715b0bfa87f47..0bf9c851547d2 100644 --- a/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index 405ce369ed1cc..1bef0d7698247 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -22,7 +22,6 @@ "symfony/twig-bridge": "~2.2" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/config": "~2.2", "symfony/console": "~2.3", "symfony/dependency-injection": "~2.2", diff --git a/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist b/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist index 767f3e066b391..3c109396e29f0 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json index 1308a3c7374aa..13ac1b9b68998 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -20,7 +20,6 @@ "symfony/dom-crawler": "~2.0,>=2.0.5" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/process": "~2.0,>=2.0.5", "symfony/css-selector": "~2.0,>=2.0.5" }, diff --git a/src/Symfony/Component/BrowserKit/phpunit.xml.dist b/src/Symfony/Component/BrowserKit/phpunit.xml.dist index d6ca28bf1c6b5..0d4678bce3fb3 100644 --- a/src/Symfony/Component/BrowserKit/phpunit.xml.dist +++ b/src/Symfony/Component/BrowserKit/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Component/ClassLoader/composer.json b/src/Symfony/Component/ClassLoader/composer.json index 9f2b51c255b7e..447cf1f92654f 100644 --- a/src/Symfony/Component/ClassLoader/composer.json +++ b/src/Symfony/Component/ClassLoader/composer.json @@ -20,7 +20,6 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/finder": "~2.0,>=2.0.5" }, "autoload": { diff --git a/src/Symfony/Component/ClassLoader/phpunit.xml.dist b/src/Symfony/Component/ClassLoader/phpunit.xml.dist index a1b6c82c10161..982955b2db6e8 100644 --- a/src/Symfony/Component/ClassLoader/phpunit.xml.dist +++ b/src/Symfony/Component/ClassLoader/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json index eca48e1baf182..b093afb6d6840 100644 --- a/src/Symfony/Component/Config/composer.json +++ b/src/Symfony/Component/Config/composer.json @@ -19,9 +19,6 @@ "php": ">=5.3.3", "symfony/filesystem": "~2.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "autoload": { "psr-0": { "Symfony\\Component\\Config\\": "" } }, diff --git a/src/Symfony/Component/Config/phpunit.xml.dist b/src/Symfony/Component/Config/phpunit.xml.dist index 2156534e9ce52..5f17ee0be31f6 100644 --- a/src/Symfony/Component/Config/phpunit.xml.dist +++ b/src/Symfony/Component/Config/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json index 9792a9f4db5d0..f3ce3e6b00476 100644 --- a/src/Symfony/Component/Console/composer.json +++ b/src/Symfony/Component/Console/composer.json @@ -19,7 +19,6 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/event-dispatcher": "~2.1" }, "suggest": { diff --git a/src/Symfony/Component/Console/phpunit.xml.dist b/src/Symfony/Component/Console/phpunit.xml.dist index 729c433aa69e8..a7b08dc3e6a89 100644 --- a/src/Symfony/Component/Console/phpunit.xml.dist +++ b/src/Symfony/Component/Console/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Component/CssSelector/composer.json b/src/Symfony/Component/CssSelector/composer.json index cd39313e19605..076852c53a2ab 100644 --- a/src/Symfony/Component/CssSelector/composer.json +++ b/src/Symfony/Component/CssSelector/composer.json @@ -22,9 +22,6 @@ "require": { "php": ">=5.3.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "autoload": { "psr-0": { "Symfony\\Component\\CssSelector\\": "" } }, diff --git a/src/Symfony/Component/CssSelector/phpunit.xml.dist b/src/Symfony/Component/CssSelector/phpunit.xml.dist index bc57cfcdfa8d8..9e075e236bb23 100644 --- a/src/Symfony/Component/CssSelector/phpunit.xml.dist +++ b/src/Symfony/Component/CssSelector/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json index 2be8deac6b597..a3243d77222f5 100644 --- a/src/Symfony/Component/Debug/composer.json +++ b/src/Symfony/Component/Debug/composer.json @@ -22,7 +22,6 @@ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2", "symfony/http-foundation": "~2.1" }, diff --git a/src/Symfony/Component/Debug/phpunit.xml.dist b/src/Symfony/Component/Debug/phpunit.xml.dist index e91766065749a..118d82f3405c4 100644 --- a/src/Symfony/Component/Debug/phpunit.xml.dist +++ b/src/Symfony/Component/Debug/phpunit.xml.dist @@ -24,4 +24,8 @@ + + + + diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index e1269403ea187..9c813a59483eb 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -19,7 +19,6 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/yaml": "~2.1", "symfony/config": "~2.2" }, diff --git a/src/Symfony/Component/DependencyInjection/phpunit.xml.dist b/src/Symfony/Component/DependencyInjection/phpunit.xml.dist index 17a217226da3d..2276d0d6a5e22 100644 --- a/src/Symfony/Component/DependencyInjection/phpunit.xml.dist +++ b/src/Symfony/Component/DependencyInjection/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json index 966128f1fb92c..dda76b8fc704c 100644 --- a/src/Symfony/Component/DomCrawler/composer.json +++ b/src/Symfony/Component/DomCrawler/composer.json @@ -19,7 +19,6 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/css-selector": "~2.0,>=2.0.5" }, "suggest": { diff --git a/src/Symfony/Component/DomCrawler/phpunit.xml.dist b/src/Symfony/Component/DomCrawler/phpunit.xml.dist index d15dd6a48ed1e..8bccfa3c9ba80 100644 --- a/src/Symfony/Component/DomCrawler/phpunit.xml.dist +++ b/src/Symfony/Component/DomCrawler/phpunit.xml.dist @@ -26,4 +26,8 @@ + + + + diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json index 9eb6c6c7b3e50..18703ac346a07 100644 --- a/src/Symfony/Component/EventDispatcher/composer.json +++ b/src/Symfony/Component/EventDispatcher/composer.json @@ -19,7 +19,6 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/dependency-injection": "~2.0,>=2.0.5" }, "suggest": { diff --git a/src/Symfony/Component/EventDispatcher/phpunit.xml.dist b/src/Symfony/Component/EventDispatcher/phpunit.xml.dist index b14fde575007d..d4c0f5b5bf9cb 100644 --- a/src/Symfony/Component/EventDispatcher/phpunit.xml.dist +++ b/src/Symfony/Component/EventDispatcher/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Component/Filesystem/composer.json b/src/Symfony/Component/Filesystem/composer.json index 94f9511815fdb..70a5839126e14 100644 --- a/src/Symfony/Component/Filesystem/composer.json +++ b/src/Symfony/Component/Filesystem/composer.json @@ -18,9 +18,6 @@ "require": { "php": ">=5.3.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "autoload": { "psr-0": { "Symfony\\Component\\Filesystem\\": "" } }, diff --git a/src/Symfony/Component/Filesystem/phpunit.xml.dist b/src/Symfony/Component/Filesystem/phpunit.xml.dist index 32444185a1edc..9ccc35e5dc21e 100644 --- a/src/Symfony/Component/Filesystem/phpunit.xml.dist +++ b/src/Symfony/Component/Filesystem/phpunit.xml.dist @@ -23,4 +23,8 @@ + + + + diff --git a/src/Symfony/Component/Finder/composer.json b/src/Symfony/Component/Finder/composer.json index 4ffc5fda4e003..6b5e01d9b1a5f 100644 --- a/src/Symfony/Component/Finder/composer.json +++ b/src/Symfony/Component/Finder/composer.json @@ -18,9 +18,6 @@ "require": { "php": ">=5.3.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "autoload": { "psr-0": { "Symfony\\Component\\Finder\\": "" } }, diff --git a/src/Symfony/Component/Finder/phpunit.xml.dist b/src/Symfony/Component/Finder/phpunit.xml.dist index bc38ccaa45d1d..7453b3ba45185 100644 --- a/src/Symfony/Component/Finder/phpunit.xml.dist +++ b/src/Symfony/Component/Finder/phpunit.xml.dist @@ -24,4 +24,8 @@ + + + + diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index a845e30067aab..b42fdf6916d07 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -23,7 +23,6 @@ "symfony/property-access": "~2.3" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "doctrine/collections": "~1.0", "symfony/validator": "~2.3.29", "symfony/translation": "~2.0,>=2.0.5", diff --git a/src/Symfony/Component/Form/phpunit.xml.dist b/src/Symfony/Component/Form/phpunit.xml.dist index 104aee4b0b52d..0d998244ec64b 100644 --- a/src/Symfony/Component/Form/phpunit.xml.dist +++ b/src/Symfony/Component/Form/phpunit.xml.dist @@ -24,4 +24,8 @@ + + + + diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json index dcedb1af2c6a3..bae2bc8e90ce3 100644 --- a/src/Symfony/Component/HttpFoundation/composer.json +++ b/src/Symfony/Component/HttpFoundation/composer.json @@ -18,9 +18,6 @@ "require": { "php": ">=5.3.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "autoload": { "psr-0": { "Symfony\\Component\\HttpFoundation\\": "" }, "classmap": [ "Symfony/Component/HttpFoundation/Resources/stubs" ] diff --git a/src/Symfony/Component/HttpFoundation/phpunit.xml.dist b/src/Symfony/Component/HttpFoundation/phpunit.xml.dist index b5b660a39433e..4a7741afbe63b 100644 --- a/src/Symfony/Component/HttpFoundation/phpunit.xml.dist +++ b/src/Symfony/Component/HttpFoundation/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 028a8447aca49..e66ce54a9377d 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -23,7 +23,6 @@ "psr/log": "~1.0" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/browser-kit": "~2.3", "symfony/class-loader": "~2.1", "symfony/config": "~2.0,>=2.0.5", diff --git a/src/Symfony/Component/HttpKernel/phpunit.xml.dist b/src/Symfony/Component/HttpKernel/phpunit.xml.dist index 7901a0b8b5433..35f36ddd7de35 100644 --- a/src/Symfony/Component/HttpKernel/phpunit.xml.dist +++ b/src/Symfony/Component/HttpKernel/phpunit.xml.dist @@ -24,4 +24,8 @@ + + + + diff --git a/src/Symfony/Component/Intl/composer.json b/src/Symfony/Component/Intl/composer.json index 18003527f98df..4247b591c9b02 100644 --- a/src/Symfony/Component/Intl/composer.json +++ b/src/Symfony/Component/Intl/composer.json @@ -27,7 +27,6 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/filesystem": ">=2.1" }, "suggest": { diff --git a/src/Symfony/Component/Intl/phpunit.xml.dist b/src/Symfony/Component/Intl/phpunit.xml.dist index d40a1582bb889..b37ce8d292a06 100644 --- a/src/Symfony/Component/Intl/phpunit.xml.dist +++ b/src/Symfony/Component/Intl/phpunit.xml.dist @@ -30,4 +30,8 @@ + + + + diff --git a/src/Symfony/Component/Locale/composer.json b/src/Symfony/Component/Locale/composer.json index 16e3c223e54aa..8b83867a1752b 100644 --- a/src/Symfony/Component/Locale/composer.json +++ b/src/Symfony/Component/Locale/composer.json @@ -19,9 +19,6 @@ "php": ">=5.3.3", "symfony/intl": "~2.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "autoload": { "psr-0": { "Symfony\\Component\\Locale\\": "" } }, diff --git a/src/Symfony/Component/Locale/phpunit.xml.dist b/src/Symfony/Component/Locale/phpunit.xml.dist index 4633ca6f04375..1e9a8530485ed 100644 --- a/src/Symfony/Component/Locale/phpunit.xml.dist +++ b/src/Symfony/Component/Locale/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Component/OptionsResolver/composer.json b/src/Symfony/Component/OptionsResolver/composer.json index 650f28e335654..80fbbc4b010f2 100644 --- a/src/Symfony/Component/OptionsResolver/composer.json +++ b/src/Symfony/Component/OptionsResolver/composer.json @@ -18,9 +18,6 @@ "require": { "php": ">=5.3.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "autoload": { "psr-0": { "Symfony\\Component\\OptionsResolver\\": "" } }, diff --git a/src/Symfony/Component/OptionsResolver/phpunit.xml.dist b/src/Symfony/Component/OptionsResolver/phpunit.xml.dist index 2398388768711..fcf5910ffdc67 100644 --- a/src/Symfony/Component/OptionsResolver/phpunit.xml.dist +++ b/src/Symfony/Component/OptionsResolver/phpunit.xml.dist @@ -24,4 +24,8 @@ + + + + diff --git a/src/Symfony/Component/Process/composer.json b/src/Symfony/Component/Process/composer.json index 89bc5314ea867..502166df3bcd3 100644 --- a/src/Symfony/Component/Process/composer.json +++ b/src/Symfony/Component/Process/composer.json @@ -18,9 +18,6 @@ "require": { "php": ">=5.3.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "autoload": { "psr-0": { "Symfony\\Component\\Process\\": "" } }, diff --git a/src/Symfony/Component/Process/phpunit.xml.dist b/src/Symfony/Component/Process/phpunit.xml.dist index 07b617be4b5d2..0fa8cc348cec1 100644 --- a/src/Symfony/Component/Process/phpunit.xml.dist +++ b/src/Symfony/Component/Process/phpunit.xml.dist @@ -23,4 +23,8 @@ + + + + diff --git a/src/Symfony/Component/PropertyAccess/composer.json b/src/Symfony/Component/PropertyAccess/composer.json index 74f92da3d44d2..060ff8ef2c133 100644 --- a/src/Symfony/Component/PropertyAccess/composer.json +++ b/src/Symfony/Component/PropertyAccess/composer.json @@ -18,9 +18,6 @@ "require": { "php": ">=5.3.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "autoload": { "psr-0": { "Symfony\\Component\\PropertyAccess\\": "" } }, diff --git a/src/Symfony/Component/PropertyAccess/phpunit.xml.dist b/src/Symfony/Component/PropertyAccess/phpunit.xml.dist index 99858f7b95361..3e96e9b5e94f7 100644 --- a/src/Symfony/Component/PropertyAccess/phpunit.xml.dist +++ b/src/Symfony/Component/PropertyAccess/phpunit.xml.dist @@ -24,4 +24,8 @@ + + + + diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index 3a738b631a615..824561077e187 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -19,7 +19,6 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/config": "~2.2", "symfony/http-foundation": "~2.3", "symfony/yaml": "~2.0,>=2.0.5", diff --git a/src/Symfony/Component/Routing/phpunit.xml.dist b/src/Symfony/Component/Routing/phpunit.xml.dist index fae243c8152b0..6b2e69ed11a44 100644 --- a/src/Symfony/Component/Routing/phpunit.xml.dist +++ b/src/Symfony/Component/Routing/phpunit.xml.dist @@ -24,4 +24,8 @@ + + + + diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index 2026fc48100e8..e62f028b732f8 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -22,7 +22,6 @@ "symfony/http-kernel": "~2.1" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/form": "~2.0,>=2.0.5", "symfony/intl": "~2.3", "symfony/routing": "~2.2", diff --git a/src/Symfony/Component/Security/phpunit.xml.dist b/src/Symfony/Component/Security/phpunit.xml.dist index 9a20f91498ae9..8919f326a12a6 100644 --- a/src/Symfony/Component/Security/phpunit.xml.dist +++ b/src/Symfony/Component/Security/phpunit.xml.dist @@ -24,4 +24,8 @@ + + + + diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json index fdcd7ab9cdfed..dbc270748106a 100644 --- a/src/Symfony/Component/Serializer/composer.json +++ b/src/Symfony/Component/Serializer/composer.json @@ -18,9 +18,6 @@ "require": { "php": ">=5.3.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "autoload": { "psr-0": { "Symfony\\Component\\Serializer\\": "" } }, diff --git a/src/Symfony/Component/Serializer/phpunit.xml.dist b/src/Symfony/Component/Serializer/phpunit.xml.dist index da0540137b19a..7afdf5434a272 100644 --- a/src/Symfony/Component/Serializer/phpunit.xml.dist +++ b/src/Symfony/Component/Serializer/phpunit.xml.dist @@ -24,4 +24,8 @@ + + + + diff --git a/src/Symfony/Component/Stopwatch/composer.json b/src/Symfony/Component/Stopwatch/composer.json index 22453f4ec2ed1..3fb113b796116 100644 --- a/src/Symfony/Component/Stopwatch/composer.json +++ b/src/Symfony/Component/Stopwatch/composer.json @@ -18,9 +18,6 @@ "require": { "php": ">=5.3.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "autoload": { "psr-0": { "Symfony\\Component\\Stopwatch\\": "" } }, diff --git a/src/Symfony/Component/Stopwatch/phpunit.xml.dist b/src/Symfony/Component/Stopwatch/phpunit.xml.dist index 38078d25bb7ee..c617896f02f51 100644 --- a/src/Symfony/Component/Stopwatch/phpunit.xml.dist +++ b/src/Symfony/Component/Stopwatch/phpunit.xml.dist @@ -24,4 +24,8 @@ + + + + diff --git a/src/Symfony/Component/Templating/composer.json b/src/Symfony/Component/Templating/composer.json index 1e2b2347eb5cc..f39b8f3600433 100644 --- a/src/Symfony/Component/Templating/composer.json +++ b/src/Symfony/Component/Templating/composer.json @@ -18,9 +18,6 @@ "require": { "php": ">=5.3.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "autoload": { "psr-0": { "Symfony\\Component\\Templating\\": "" } }, diff --git a/src/Symfony/Component/Templating/phpunit.xml.dist b/src/Symfony/Component/Templating/phpunit.xml.dist index 3da1f5de1371c..8a06747f3788c 100644 --- a/src/Symfony/Component/Templating/phpunit.xml.dist +++ b/src/Symfony/Component/Templating/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index 3bd5ab3097f77..19b2d8ebf6d0e 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -19,7 +19,6 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "symfony/config": "~2.3,>=2.3.12", "symfony/intl": "~2.3", "symfony/yaml": "~2.2" diff --git a/src/Symfony/Component/Translation/phpunit.xml.dist b/src/Symfony/Component/Translation/phpunit.xml.dist index 16cca4afb7c69..c908a7985f72c 100644 --- a/src/Symfony/Component/Translation/phpunit.xml.dist +++ b/src/Symfony/Component/Translation/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index 97240168bb0a4..4510ff3253c59 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -20,7 +20,6 @@ "symfony/translation": "~2.0,>=2.0.5" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7", "doctrine/common": "~2.3", "symfony/http-foundation": "~2.1", "symfony/intl": "~2.3", diff --git a/src/Symfony/Component/Validator/phpunit.xml.dist b/src/Symfony/Component/Validator/phpunit.xml.dist index 1bf4391c3c181..57b15e0165399 100644 --- a/src/Symfony/Component/Validator/phpunit.xml.dist +++ b/src/Symfony/Component/Validator/phpunit.xml.dist @@ -25,4 +25,8 @@ + + + + diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json index 8ca22ff55d882..791dbe2b2640a 100644 --- a/src/Symfony/Component/Yaml/composer.json +++ b/src/Symfony/Component/Yaml/composer.json @@ -18,9 +18,6 @@ "require": { "php": ">=5.3.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "autoload": { "psr-0": { "Symfony\\Component\\Yaml\\": "" } }, diff --git a/src/Symfony/Component/Yaml/phpunit.xml.dist b/src/Symfony/Component/Yaml/phpunit.xml.dist index 8f7741fe393e6..93ab1cd204265 100644 --- a/src/Symfony/Component/Yaml/phpunit.xml.dist +++ b/src/Symfony/Component/Yaml/phpunit.xml.dist @@ -24,4 +24,8 @@ + + + +