Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
minor #33288 Use PHP 7.4 on deps=low (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

Use PHP 7.4 on deps=low

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Having a job on PHP 7.4 will allow using return type covariance as described in #33236

Commits
-------

21b8702 Use PHP 7.4 on deps=low
  • Loading branch information
nicolas-grekas committed Aug 22, 2019
2 parents 622ce1d + 21b8702 commit 26be947
Show file tree
Hide file tree
Showing 16 changed files with 47 additions and 15 deletions.
14 changes: 11 additions & 3 deletions .travis.yml
Expand Up @@ -23,14 +23,16 @@ env:
matrix:
include:
- php: 5.5
env: php_extra="5.6 7.0 7.1"
- php: 7.2
env: deps=high
env: php_extra="5.6 7.0 7.1 7.2"
- php: 7.3
env: deps=high
- php: 7.4snapshot
env: deps=low
- php: 7.4snapshot
env: deps=
allow_failures:
- php: 7.4snapshot
env: deps=
fast_finish: true

cache:
Expand Down Expand Up @@ -74,6 +76,12 @@ before_install:
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n')
find ~/.phpenv -name xdebug.ini -delete
if [[ $TRAVIS_PHP_VERSION = 7.4* && $deps ]]; then
export PHPUNIT_X="$PHPUNIT_X,issue-32995"
elif [[ $TRAVIS_PHP_VERSION = 7.4* ]]; then
export PHPUNIT_X="$PHPUNIT --group issue-32995"
fi
if [[ $TRAVIS_PHP_VERSION = 5.* || $TRAVIS_PHP_VERSION = hhvm* ]]; then
composer () {
$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)
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -20,7 +20,7 @@
"ext-xml": "*",
"doctrine/common": "~2.4",
"fig/link-util": "^1.0",
"twig/twig": "^1.40|^2.9",
"twig/twig": "^1.41|^2.10",
"psr/cache": "~1.0",
"psr/container": "^1.0",
"psr/link": "^1.0",
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Bridge/Doctrine/composer.json
Expand Up @@ -22,6 +22,7 @@
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
"doctrine/annotations": "~1.7",
"symfony/stopwatch": "~2.8|~3.0|~4.0",
"symfony/dependency-injection": "~3.4|~4.0",
"symfony/form": "^3.3.10|~4.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Twig/composer.json
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": "^5.5.9|>=7.0.8",
"twig/twig": "^1.40|^2.9"
"twig/twig": "^1.41|^2.10"
},
"require-dev": {
"fig/link-util": "^1.0",
Expand Down
Expand Up @@ -22,6 +22,8 @@
class ValidatorCacheWarmerTest extends TestCase
{
/**
* @group issue-32995
*
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
*/
public function testWarmUp()
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Bundle/FrameworkBundle/composer.json
Expand Up @@ -18,7 +18,7 @@
"require": {
"php": "^5.5.9|>=7.0.8",
"ext-xml": "*",
"symfony/cache": "~3.4|~4.0",
"symfony/cache": "~3.4.31|^4.3.4",
"symfony/class-loader": "~3.2",
"symfony/dependency-injection": "^3.4.24|^4.2.5",
"symfony/config": "^3.4.31|^4.3.4",
Expand All @@ -36,7 +36,7 @@
"fig/link-util": "^1.0",
"symfony/asset": "~3.3|~4.0",
"symfony/browser-kit": "~2.8|~3.0|~4.0",
"symfony/console": "~3.4|~4.0",
"symfony/console": "~3.4.31|^4.3.4",
"symfony/css-selector": "~2.8|~3.0|~4.0",
"symfony/dom-crawler": "~2.8|~3.0|~4.0",
"symfony/polyfill-intl-icu": "~1.0",
Expand All @@ -56,7 +56,7 @@
"symfony/property-info": "~3.3|~4.0",
"symfony/lock": "~3.4|~4.0",
"symfony/web-link": "~3.3|~4.0",
"doctrine/annotations": "~1.0",
"doctrine/annotations": "~1.7",
"phpdocumentor/reflection-docblock": "^3.0|^4.0",
"twig/twig": "~1.34|~2.4"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/SecurityBundle/composer.json
Expand Up @@ -44,7 +44,7 @@
"symfony/yaml": "~3.4|~4.0",
"symfony/expression-language": "~2.8|~3.0|~4.0",
"doctrine/doctrine-bundle": "~1.5",
"twig/twig": "~1.34|~2.4"
"twig/twig": "~1.41|~2.10"
},
"conflict": {
"symfony/var-dumper": "<3.3",
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Bundle/TwigBundle/composer.json
Expand Up @@ -23,7 +23,7 @@
"symfony/http-foundation": "~2.8|~3.0|~4.0",
"symfony/http-kernel": "^3.3|~4.0",
"symfony/polyfill-ctype": "~1.8",
"twig/twig": "~1.40|~2.9"
"twig/twig": "~1.41|~2.10"
},
"require-dev": {
"symfony/asset": "~2.8|~3.0|~4.0",
Expand All @@ -37,7 +37,7 @@
"symfony/yaml": "~2.8|~3.0|~4.0",
"symfony/framework-bundle": "^3.3.11|~4.0",
"symfony/web-link": "~3.3|~4.0",
"doctrine/annotations": "~1.0",
"doctrine/annotations": "~1.7",
"doctrine/cache": "~1.0"
},
"conflict": {
Expand Down
Expand Up @@ -76,6 +76,8 @@ public function testExistsKo()
}

/**
* @group issue-32995
*
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
*/
public function testBadParentWithTimestamp()
Expand All @@ -85,6 +87,8 @@ public function testBadParentWithTimestamp()
}

/**
* @group issue-32995
*
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
*/
public function testBadParentWithNoTimestamp()
Expand Down
Expand Up @@ -378,6 +378,8 @@ public function testClassNotFoundThrowsException()
}

/**
* @group issue-32995
*
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
*/
public function testParentClassNotFoundThrowsException()
Expand Down Expand Up @@ -692,6 +694,8 @@ public function getCreateResourceTests()
}

/**
* @group issue-32995
*
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
*/
public function testIgnoreServiceWithClassNotExisting()
Expand Down Expand Up @@ -893,6 +897,8 @@ public function testExceptionWhenAliasExists()
}

/**
* @group issue-32995
*
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
*/
public function testExceptionWhenAliasDoesNotExist()
Expand Down
Expand Up @@ -62,6 +62,8 @@ public function testUnusedBinding()
}

/**
* @group issue-32995
*
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
*/
public function testMissingParent()
Expand Down
Expand Up @@ -894,6 +894,8 @@ public function testInlineSelfRef()
}

/**
* @group issue-32995
*
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
*/
public function testHotPathOptimizations()
Expand Down
Expand Up @@ -108,6 +108,8 @@ public function testRegisterClasses()
}

/**
* @group issue-32995
*
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
*/
public function testRegisterClassesWithExclude()
Expand Down Expand Up @@ -140,6 +142,8 @@ public function testRegisterClassesWithExclude()
}

/**
* @group issue-32995
*
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
*/
public function testNestedRegisterClasses()
Expand Down Expand Up @@ -171,6 +175,8 @@ public function testNestedRegisterClasses()
}

/**
* @group issue-32995
*
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
*/
public function testMissingParentClass()
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/PropertyInfo/composer.json
Expand Up @@ -31,7 +31,7 @@
"symfony/cache": "~3.1|~4.0",
"symfony/dependency-injection": "~3.3|~4.0",
"phpdocumentor/reflection-docblock": "^3.0|^4.0",
"doctrine/annotations": "~1.0"
"doctrine/annotations": "~1.7"
},
"conflict": {
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
Expand Down
5 changes: 3 additions & 2 deletions src/Symfony/Component/Validator/composer.json
Expand Up @@ -32,11 +32,12 @@
"symfony/expression-language": "~2.8|~3.0|~4.0",
"symfony/cache": "~3.1|~4.0",
"symfony/property-access": "~2.8|~3.0|~4.0",
"doctrine/annotations": "~1.0",
"doctrine/annotations": "~1.7",
"doctrine/cache": "~1.0",
"egulias/email-validator": "^1.2.8|~2.0"
"egulias/email-validator": "^2.1.10"
},
"conflict": {
"doctrine/lexer": "<1.0.2",
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
"symfony/dependency-injection": "<3.3",
"symfony/http-kernel": "<3.3.5",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Workflow/composer.json
Expand Up @@ -21,7 +21,7 @@
],
"require": {
"php": "^5.5.9|>=7.0.8",
"symfony/property-access": "~2.3|~3.0|~4.0"
"symfony/property-access": "~3.4.31|^4.3.4"
},
"require-dev": {
"psr/log": "~1.0",
Expand Down

0 comments on commit 26be947

Please sign in to comment.