geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-16 20:36:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.x' into 3.x

Browse Source 
* 2.x:
  Tweak PHP constraint
  Remove boilerplate to run tests on PHP 8
This commit is contained in:
Fabien Potencier
2020-05-21 07:43:16 +02:00
parent d81a7448ec 997dc9c192
commit 70dc998309
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+7 -14
View File
@@ -18,20 +18,13 @@ before_install:
install:
- travis_retry composer install
- |
# install the phpunit-bridge with PHP 7.4 when testing nightly
if [[ $TRAVIS_PHP_VERSION = nightly ]]; then
(cd / && wget https://storage.googleapis.com/travis-ci-language-archives/php/binaries/ubuntu/16.04/x86_64/php-7.4.tar.bz2 -O - | tar -xj)
phpenv global 7.4;
./vendor/bin/simple-phpunit install;
phpenv global nightly;
fi
- (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)
- (cd extra/string-extra && travis_retry composer install)
- ./vendor/bin/simple-phpunit install
- ([[ $TRAVIS_PHP_VERSION = "nightly" ]] || cd extra/cssinliner-extra && travis_retry composer install)
- ([[ $TRAVIS_PHP_VERSION = "nightly" ]] || cd extra/html-extra && travis_retry composer install)
- ([[ $TRAVIS_PHP_VERSION = "nightly" ]] || cd extra/inky-extra && travis_retry composer install)
- ([[ $TRAVIS_PHP_VERSION = "nightly" ]] || cd extra/intl-extra && travis_retry composer install)
- ([[ $TRAVIS_PHP_VERSION = "nightly" ]] || cd extra/markdown-extra && travis_retry composer install)
- ([[ $TRAVIS_PHP_VERSION = 7.1 ]] || [[ $TRAVIS_PHP_VERSION = "nightly" ]] || (cd extra/string-extra && travis_retry composer install))
script:
- ./vendor/bin/simple-phpunit
composer.json
+2 -2
View File
@@ -25,12 +25,12 @@
}
],
"require": {
"php": "^7.2.5|^8.0",
"php": ">=7.2.5",
"symfony/polyfill-mbstring": "^1.3",
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
"symfony/phpunit-bridge": "^4.4|^5.0",
"symfony/phpunit-bridge": "^4.4.9|^5.0.9",
"psr/container": "^1.0"
},
"autoload": {