From 6a50ca063904a8bf657e95cd0cfa89db138dc7ac Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 1 Oct 2019 12:35:06 +0200 Subject: [PATCH] Revert previous merge partially --- .travis.yml | 21 ++++++++++----------- tests/Cache/FilesystemTest.php | 4 ++-- tests/Extension/SandboxTest.php | 2 +- tests/TokenStreamTest.php | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index e38fc912e..ec5694ace 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ cache: env: global: - - SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1 - SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1 before_install: @@ -16,19 +15,19 @@ before_install: install: - travis_retry composer install - - ([[ $TRAVIS_PHP_VERSION = 7.0 ]] || cd extra/cssinliner-extra && travis_retry composer install) - - ([[ $TRAVIS_PHP_VERSION = 7.0 ]] || cd extra/html-extra && travis_retry composer install) - - ([[ $TRAVIS_PHP_VERSION = 7.0 ]] || cd extra/inky-extra && travis_retry composer install) - - ([[ $TRAVIS_PHP_VERSION = 7.0 ]] || cd extra/intl-extra && travis_retry composer install) - - ([[ $TRAVIS_PHP_VERSION = 7.0 ]] || cd extra/markdown-extra && travis_retry composer install) + - cd extra/cssinliner-extra && travis_retry composer install) + - cd extra/html-extra && travis_retry composer install) + - cd extra/inky-extra && travis_retry composer install) + - cd extra/intl-extra && travis_retry composer install) + - cd extra/markdown-extra && travis_retry composer install) script: - ./vendor/bin/simple-phpunit - - ([[ $TRAVIS_PHP_VERSION = 7.0 ]] || cd extra/cssinliner-extra && ./vendor/bin/simple-phpunit) - - ([[ $TRAVIS_PHP_VERSION = 7.0 ]] || cd extra/html-extra && ./vendor/bin/simple-phpunit) - - ([[ $TRAVIS_PHP_VERSION = 7.0 ]] || cd extra/inky-extra && ./vendor/bin/simple-phpunit) - - ([[ $TRAVIS_PHP_VERSION = 7.0 ]] || cd extra/intl-extra && ./vendor/bin/simple-phpunit) - - ([[ $TRAVIS_PHP_VERSION = 7.0 ]] || cd extra/markdown-extra && ./vendor/bin/simple-phpunit) + - cd extra/cssinliner-extra && ./vendor/bin/simple-phpunit) + - cd extra/html-extra && ./vendor/bin/simple-phpunit) + - cd extra/inky-extra && ./vendor/bin/simple-phpunit) + - cd extra/intl-extra && ./vendor/bin/simple-phpunit) + - cd extra/markdown-extra && ./vendor/bin/simple-phpunit) jobs: fast_finish: true diff --git a/tests/Cache/FilesystemTest.php b/tests/Cache/FilesystemTest.php index 20ff68528..0791cb56c 100644 --- a/tests/Cache/FilesystemTest.php +++ b/tests/Cache/FilesystemTest.php @@ -21,7 +21,7 @@ class FilesystemTest extends TestCase private $directory; private $cache; - protected function setUp() + protected function setUp(): void { $nonce = hash('sha256', uniqid(mt_rand(), true)); $this->classname = '__Twig_Tests_Cache_FilesystemTest_Template_'.$nonce; @@ -29,7 +29,7 @@ class FilesystemTest extends TestCase $this->cache = new FilesystemCache($this->directory); } - protected function tearDown() + protected function tearDown(): void { if (file_exists($this->directory)) { FilesystemHelper::removeDir($this->directory); diff --git a/tests/Extension/SandboxTest.php b/tests/Extension/SandboxTest.php index cfaadaa61..3c516d772 100644 --- a/tests/Extension/SandboxTest.php +++ b/tests/Extension/SandboxTest.php @@ -28,7 +28,7 @@ class SandboxTest extends TestCase protected static $params; protected static $templates; - protected function setUp() + protected function setUp(): void { self::$params = [ 'name' => 'Fabien', diff --git a/tests/TokenStreamTest.php b/tests/TokenStreamTest.php index 47e302120..e8cb474b3 100644 --- a/tests/TokenStreamTest.php +++ b/tests/TokenStreamTest.php @@ -20,7 +20,7 @@ class TokenStreamTest extends TestCase { protected static $tokens; - protected function setUp() + protected function setUp(): void { self::$tokens = [ new Token(Token::TEXT_TYPE, 1, 1),