8000 Use PHP 7.4 on deps=low · symfony/symfony@adce470 · GitHub
[go: up one dir, main page]
Skip to content

Commit adce470

Browse files
nicolas-grekasnicolas-grekas
committed
Use PHP 7.4 on deps=low
1 parent 622ce1d commit adce470

File tree

16 files changed

+47
-15
lines changed

16 files changed

+47
-15
lines changed

‎.travis.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,16 @@ env:
2323
matrix:
2424
include:
2525
- php: 5.5
26-
env: php_extra="5.6 7.0 7.1"
27-
- php: 7.2
28-
env: deps=high
26+
env: php_extra="5.6 7.0 7.1 7.2"
2927
- php: 7.3
28+
env: deps=high
29+
- php: 7.4snapshot
3030
env: deps=low
3131
- php: 7.4snapshot
32+
env: deps=
3233
allow_failures:
3334
- php: 7.4snapshot
35+
env: deps=
3436
fast_finish: true
3537

3638
cache:
@@ -74,6 +76,12 @@ before_install:
7476
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n')
7577
find ~/.phpenv -name xdebug.ini -delete
7678
79+
if [[ $TRAVIS_PHP_VERSION = 7.4* && $deps ]]; then
80+
export PHPUNIT_X="$PHPUNIT_X,issue-32995"
81+
elif [[ $TRAVIS_PHP_VERSION = 7.4* ]]; then
82+
export PHPUNIT_X="$PHPUNIT --group issue-32995"
83+
fi
84+
7785
if [[ $TRAVIS_PHP_VERSION = 5.* || $TRAVIS_PHP_VERSION = hhvm* ]]; then
7886
composer () {
7987
$HOME/.phpenv/versions/7.1/bin/php $HOME/.phpenv/versions/7.1/bin/composer config platform.php $(echo ' <?php echo preg_replace("/-.*/", "", PHP_VERSION);' | php /dev/stdin)

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"ext-xml": "*",
2121
"doctrine/common": "~2.4",
2222
"fig/link-util": "^1.0",
23-
"twig/twig": "^1.40|^2.9",
23+
"twig/twig": "^1.41|^2.10",
2424
"psr/cache": "~1.0",
2525
"psr/container": "^1.0",
2626
"psr/link": "^1.0",

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"doctrine/orm": "^2.4.5"
3939
},
4040
"conflict": {
41+
"doctrine/annotations": "<1.7",
4142
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
4243
"symfony/dependency-injection": "<3.4"
4344
},

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": "^5.5.9|>=7.0.8",
20-
"twig/twig": "^1.40|^2.9"
20+
"twig/twig": "^1.41|^2.10"
2121
},
2222
"require-dev": {
2323
"fig/link-util": "^1.0",

‎src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
class ValidatorCacheWarmerTest extends TestCase
2323
{
2424
/**
25+
* @group issue-32995
26+
*
2527
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
2628
*/
2729
public function testWarmUp()

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^5.5.9|>=7.0.8",
2020
"ext-xml": "*",
21-
"symfony/cache": "~3.4|~4.0",
21+
"symfony/cache": "~3.4.31|^4.3.4",
2222
"symfony/class-loader": "~3.2",
2323
"symfony/dependency-injection": "^3.4.24|^4.2.5",
2424
"symfony/config": "^3.4.31|^4.3.4",
@@ -36,7 +36,7 @@
3636
"fig/link-util": "^1.0",
3737
"symfony/asset": "~3.3|~4.0",
3838
"symfony/browser-kit": "~2.8|~3.0|~4.0",
39-
"symfony/console": "~3.4|~4.0",
39+
"symfony/console": "~3.4.31|^4.3.4",
4040
"symfony/css-selector": "~2.8|~3.0|~4.0",
4141
"symfony/dom-crawler": "~2.8|~3.0|~4.0",
4242
"symfony/polyfill-intl-icu": "~1.0",
@@ -56,7 +56,7 @@
5656
"symfony/property-info": "~3.3|~4.0",
5757
"symfony/lock": "~3.4|~4.0",
5858
"symfony/web-link": "~3.3|~4.0",
59-
"doctrine/annotations": "~1.0",
59+
"doctrine/annotations": "~1.7",
6060
"phpdocumentor/reflection-docblock": "^3.0|^4.0",
6161
"twig/twig": "~1.34|~2.4"
6262
},

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"symfony/yaml": "~3.4|~4.0",
4545
"symfony/expression-language": "~2.8|~3.0|~4.0",
4646
"doctrine/doctrine-bundle": "~1.5",
47-
"twig/twig": "~1.34|~2.4"
47+
"twig/twig": "~1.41|~2.10"
4848
},
4949
"conflict": {
5050
"symfony/var-dumper": "<3.3",

‎src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"symfony/http-foundation": "~2.8|~3.0|~4.0",
2424
"symfony/http-kernel": "^3.3|~4.0",
2525
"symfony/polyfill-ctype": "~1.8",
26-
"twig/twig": "~1.40|~2.9"
26+
"twig/twig": "~1.41|~2.10"
2727
},
2828
"require-dev": {
2929
"symfony/asset": "~2.8|~3.0|~4.0",
@@ -37,7 +37,7 @@
3737
"symfony/yaml": "~2.8|~3.0|~4.0",
3838
"symfony/framework-bundle": "^3.3.11|~4.0",
3939
"symfony/web-link": "~3.3|~4.0",
40-
"doctrine/annotations": "~1.0",
40+
"doctrine/annotations": "~1.7",
4141
"doctrine/cache": "~1.0"
4242
},
4343
"conflict": {

‎src/Symfony/Component/Config/Tests/Resource/ClassExistenceResourceTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ public function testExistsKo()
7676
}
7777

7878
/**
79+
* @group issue-32995
80+
*
7981
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
8082
*/
8183
public function testBadParentWithTimestamp()
@@ -85,6 +87,8 @@ public function testBadParentWithTimestamp()
8587
}
8688

8789
/**
90+
* @group issue-32995
91+
*
8892
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
8993
*/
9094
public function testBadParentWithNoTimestamp()

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,8 @@ public function testClassNotFoundThrowsException()
378378
}
379379

380380
/**
381+
* @group issue-32995
382+
*
381383
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
382384
*/
383385
public function testParentClassNotFoundThrowsException()
@@ -692,6 +694,8 @@ public function getCreateResourceTests()
692694
}
693695

694696
/**
697+
* @group issue-32995
698+
*
695699
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
696700
*/
697701
public function testIgnoreServiceWithClassNotExisting()
@@ -893,6 +897,8 @@ public function testExceptionWhenAliasExists()
893897
}
894898

895899
/**
900+
* @group issue-32995
901+
*
896902
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
897903
*/
898904
public function testExceptionWhenAliasDoesNotExist()

0 commit comments

Comments
 (0)
0