diff --git a/.travis.yml b/.travis.yml index df3568fd027bb..fb1f213fa6f86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ install: - if [ "$components" = "no" ]; then COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install; fi; script: - - if [ "$components" = "no" ]; then ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo "Running {} tests"; phpunit --exclude-group tty,benchmark,intl-data {};'; fi; - - if [ "$components" = "no" ]; then echo "Running tests requiring tty"; phpunit --group tty; fi; - - if [ "$components" = "high" ]; then 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,intl-data;'; fi; - - if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j50% 'echo "Running {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data;'; fi; + - 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; + - if [ "$components" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi; + - 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_ROOT_VERSION=dev-master composer --prefer-source --dev update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi; + - 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_ROOT_VERSION=dev-master 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; diff --git a/composer.json b/composer.json index 4cb0f424496e6..1174cb31b76ca 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=5.3.3", - "doctrine/common": "~2.2", - "twig/twig": "~1.12", + "doctrine/common": "~2.3", + "twig/twig": "~1.12,>=1.12.3", "psr/log": "~1.0" }, "replace": { diff --git a/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/DefaultCsrfProviderTest.php b/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/DefaultCsrfProviderTest.php index 3cf62f8db3081..f201f99862c61 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/DefaultCsrfProviderTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/DefaultCsrfProviderTest.php @@ -15,6 +15,7 @@ /** * @runTestsInSeparateProcesses + * @preserveGlobalState disabled */ class DefaultCsrfProviderTest extends \PHPUnit_Framework_TestCase { @@ -24,6 +25,7 @@ public static function setUpBeforeClass() { ini_set('session.save_handler', 'files'); ini_set('session.save_path', sys_get_temp_dir()); + ini_set('error_reporting', -1 & ~E_USER_DEPRECATED); } protected function setUp() diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php index 3f96bdf025732..ab848b6b972ad 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php @@ -20,6 +20,7 @@ * @author Drak * * @runTestsInSeparateProcesses + * @preserveGlobalState disabled */ class NativeFileSessionHandlerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php index 8fba843b7dd56..3437cf08f1d8d 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php @@ -19,6 +19,7 @@ * @author Drak * * @runTestsInSeparateProcesses + * @preserveGlobalState disabled */ class NativeSessionHandlerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php index 371ab6f3fa067..35823d685ddf9 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php @@ -21,6 +21,7 @@ * @author Drak * * @runTestsInSeparateProcesses + * @preserveGlobalState disabled */ class NullSessionHandlerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php index e74f52cb3b1ea..41329e72485e1 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php @@ -27,6 +27,7 @@ * These tests require separate processes. * * @runTestsInSeparateProcesses + * @preserveGlobalState disabled */ class NativeSessionStorageTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php index e712632589bf6..d9f4a30a89a68 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php @@ -22,6 +22,7 @@ * These tests require separate processes. * * @runTestsInSeparateProcesses + * @preserveGlobalState disabled */ class PhpBridgeSessionStorageTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php index 1df28cf1a2c92..ee476a879d0af 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php @@ -96,6 +96,7 @@ public function testIsActivePhp53() /** * @runInSeparateProcess + * @preserveGlobalState disabled */ public function testIsActivePhp54() { @@ -122,6 +123,7 @@ public function testSetActivePhp53() /** * @runInSeparateProcess + * @preserveGlobalState disabled * @expectedException \LogicException */ public function testSetActivePhp54() @@ -135,6 +137,7 @@ public function testSetActivePhp54() /** * @runInSeparateProcess + * @preserveGlobalState disabled */ public function testName() { @@ -159,6 +162,7 @@ public function testNameExceptionPhp53() /** * @runInSeparateProcess + * @preserveGlobalState disabled * @expectedException \LogicException */ public function testNameExceptionPhp54() @@ -173,6 +177,7 @@ public function testNameExceptionPhp54() /** * @runInSeparateProcess + * @preserveGlobalState disabled */ public function testId() { @@ -197,6 +202,7 @@ public function testIdExceptionPhp53() /** * @runInSeparateProcess + * @preserveGlobalState disabled * @expectedException \LogicException */ public function testIdExceptionPhp54() diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php index be9b110d02e10..d2775a80a20f1 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php @@ -19,6 +19,7 @@ * @author Drak * * @runTestsInSeparateProcesses + * @preserveGlobalState disabled */ class SessionHandlerProxyTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php index 7fbf854f29777..bf4cdae26a762 100644 --- a/src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php +++ b/src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php @@ -36,6 +36,7 @@ protected function setUp() * time zone, this test would use it too if not running in a separated process. * * @runInSeparateProcess + * @preserveGlobalState disabled */ public function testFormatWithTimezoneFromEnvironmentVariable() { diff --git a/src/Symfony/Component/Locale/composer.json b/src/Symfony/Component/Locale/composer.json index b43965717374b..121b1333f4e12 100644 --- a/src/Symfony/Component/Locale/composer.json +++ b/src/Symfony/Component/Locale/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/intl": ">=2.3" + "symfony/intl": "~2.3" }, "autoload": { "psr-0": { "Symfony\\Component\\Locale\\": "" } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy