diff --git a/.travis.yml b/.travis.yml index 14c7704c4c7bf..cecdc9500c054 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,16 @@ php: matrix: allow_failures: - php: hhvm-nightly + include: + - php: 5.5 + env: components=yes services: mongodb +env: + global: + - components=no + before_install: - travis_retry sudo apt-get install parallel - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi;' @@ -25,8 +32,9 @@ before_install: # - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "5.3.3" ]; then phpunit --self-update; fi;' install: - - COMPOSER_ROOT_VERSION=dev-master composer --prefer-source install + - sh -c 'if [ "$components" = "no" ]; then sh -c "COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install"; fi;' script: - - ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo "Running {} tests"; phpunit --exclude-group tty,benchmark {};' - - echo "Running tests requiring tty"; phpunit --group tty + - sh -c 'if [ "$components" = "no" ]; then sh -c "ls -d src/Symfony/*/* | parallel --gnu --keep-order '\''echo \"Running {} tests\"; phpunit --exclude-group tty,benchmark {};'\''"; fi;' + - sh -c 'if [ "$components" = "no" ]; then sh -c "echo "\""Running tests requiring tty"\""; phpunit --group tty"; fi;' + - sh -c 'if [ "$components" = "yes" ]; then sh -c "find src/Symfony -mindepth 3 -type f -name '\''phpunit.xml.dist'\'' | sed '\''s#\(.*\)/.*#\1#'\'' | parallel --gnu --keep-order '\''echo \"Running {} tests\"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install; phpunit --exclude-group tty,benchmark;'\''"; fi;' diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index e657db70d1bba..30f4586427530 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -25,7 +25,7 @@ "symfony/form": "~2.2", "symfony/http-kernel": "~2.2", "symfony/security": "~2.2", - "symfony/validator": "~2.2", + "symfony/validator": "~2.3.0", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.2", "doctrine/orm": "~2.2,>=2.2.3" diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json index 4d3abb604815e..c4a59154ce97c 100644 --- a/src/Symfony/Bridge/ProxyManager/composer.json +++ b/src/Symfony/Bridge/ProxyManager/composer.json @@ -20,6 +20,9 @@ "symfony/dependency-injection": "~2.3", "ocramius/proxy-manager": ">=0.3.1,<0.4-dev" }, + "require-dev": { + "symfony/config": "2.3" + }, "autoload": { "psr-0": { "Symfony\\Bridge\\ProxyManager\\": "" diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index daa1eee38b641..8fc450f7daece 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -29,11 +29,15 @@ "doctrine/common": "~2.2" }, "require-dev": { + "symfony/browser-kit": "~2.3", + "symfony/console": "~2.0", "symfony/finder": "~2.0", "symfony/security": "~2.3", - "symfony/form": "~2.3", + "symfony/form": "~2.3.0", "symfony/class-loader": "~2.1", - "symfony/validator": "~2.1" + "symfony/process": "~2.0", + "symfony/validator": "~2.1", + "symfony/yaml": "~2.0" }, "suggest": { "symfony/console": "", diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index 776f590bc87c1..a41dff51c1525 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -21,9 +21,12 @@ "symfony/http-kernel": "~2.2" }, "require-dev": { + "symfony/browser-kit": "~2.3", + "symfony/form": "~2.3", "symfony/framework-bundle": "~2.2", "symfony/twig-bundle": "~2.2", "symfony/form": "~2.1", + "symfony/process": "~2.0", "symfony/validator": "~2.2", "symfony/yaml": "~2.0" }, diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php index bff1919aa9b1a..c10449d323ce7 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php @@ -11,12 +11,11 @@ namespace Symfony\Bundle\WebProfilerBundle\Tests\Controller; -use Symfony\Bundle\FrameworkBundle\Tests\TestCase; use Symfony\Bundle\WebProfilerBundle\Controller\ProfilerController; use Symfony\Component\HttpKernel\Profiler\Profile; use Symfony\Component\HttpFoundation\Request; -class ProfilerControllerTest extends TestCase +class ProfilerControllerTest extends \PHPUnit_Framework_TestCase { /** * @dataProvider getEmptyTokenCases diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index c3f20e87e7943..e384965bf418e 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -23,6 +23,7 @@ }, "require-dev": { "symfony/config": "~2.2", + "symfony/console": "~2.3", "symfony/dependency-injection": "~2.0", "symfony/stopwatch": "~2.2" }, diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 14f9dadce40a2..f55a042086369 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -23,7 +23,8 @@ "symfony/property-access": "~2.3" }, "require-dev": { - "symfony/validator": "~2.2", + "doctrine/collections": "~1.0", + "symfony/validator": "~2.3.0", "symfony/http-foundation": "~2.2" }, "suggest": { diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index 9a737c6b0287b..18c06d3501f38 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -20,6 +20,7 @@ }, "require-dev": { "symfony/config": "~2.2", + "symfony/http-foundation": "~2.3", "symfony/yaml": "~2.0", "doctrine/common": "~2.2", "psr/log": "~1.0" diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index 96a8e662a8ad7..e65668b43fa33 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -20,6 +20,7 @@ }, "require-dev": { "symfony/config": "~2.0", + "symfony/intl": "~2.3", "symfony/yaml": "~2.2" }, "suggest": {