geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-10-25 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert previous merge partially

Browse Source
This commit is contained in:
Fabien Potencier
2019-10-01 12:35:06 +02:00
parent 92c4287b81
commit 6a50ca0639
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+10 -11
View File
@@ -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
tests/Cache/FilesystemTest.php
+2 -2
View File
@@ -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);
tests/Extension/SandboxTest.php
+1 -1
View File
@@ -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',
tests/TokenStreamTest.php
+1 -1
View File
@@ -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),