Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 07cf9272379d · 2019-08-09T14:37:48.000+02:00
* 3.4:
  Bump minimal requirements
  Use PHPUnit 8.3 on Travis when possible
diff --git a/.travis.yml b/.travis.yml
@@ -29,9 +29,6 @@ matrix:
           env: deps=high
         - php: 7.3
           env: deps=low
-        - php: 7.4snapshot
-    allow_failures:
-    - php: 7.4snapshot
     fast_finish: true
 
 cache:
diff --git a/composer.json b/composer.json
@@ -115,7 +115,7 @@
         "psr/http-client": "^1.0",
         "psr/simple-cache": "^1.0",
         "egulias/email-validator": "~1.2,>=1.2.8|~2.0",
-        "symfony/phpunit-bridge": "^3.4.19|^4.1.8|~5.0",
+        "symfony/phpunit-bridge": "^3.4.31|^4.3.4|~5.0",
         "symfony/security-acl": "~2.8|~3.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0"
     },
diff --git a/phpunit b/phpunit
@@ -8,8 +8,8 @@ if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
     exit(1);
 }
 if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
-    if (\PHP_VERSION_ID >= 70400) {
-        putenv('SYMFONY_PHPUNIT_VERSION=8.2');
+    if (\PHP_VERSION_ID >= 70200) {
+        putenv('SYMFONY_PHPUNIT_VERSION=8.3');
     } elseif (\PHP_VERSION_ID >= 70000) {
         putenv('SYMFONY_PHPUNIT_VERSION=6.5');
     }
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -25,7 +25,7 @@
         "symfony/asset": "~3.4|~4.0",
         "symfony/dependency-injection": "~3.4|~4.0",
         "symfony/finder": "~3.4|~4.0",
-        "symfony/form": "^4.3",
+        "symfony/form": "^4.3.4",
         "symfony/http-foundation": "~4.3",
         "symfony/http-kernel": "~3.4|~4.0",
         "symfony/mime": "~4.3",
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -23,7 +23,7 @@
         "symfony/debug": "~4.0",
         "symfony/dependency-injection": "^4.3",
         "symfony/http-foundation": "^4.3",
-        "symfony/http-kernel": "^4.3",
+        "symfony/http-kernel": "^4.3.4",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/filesystem": "~3.4|~4.0",
         "symfony/finder": "~3.4|~4.0",
@@ -38,7 +38,7 @@
         "symfony/css-selector": "~3.4|~4.0",
         "symfony/dom-crawler": "^4.3",
         "symfony/polyfill-intl-icu": "~1.0",
-        "symfony/form": "^4.3",
+        "symfony/form": "^4.3.4",
         "symfony/expression-language": "~3.4|~4.0",
         "symfony/http-client": "^4.3",
         "symfony/mailer": "^4.3",

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {`
`8`	`8`	`exit(1);`
`9`	`9`	`}`
`10`	`10`	`if (!getenv('SYMFONY_PHPUNIT_VERSION')) {`
`11`		`- if (\PHP_VERSION_ID >= 70400) {`
`12`		`- putenv('SYMFONY_PHPUNIT_VERSION=8.2');`
	`11`	`+ if (\PHP_VERSION_ID >= 70200) {`
	`12`	`+ putenv('SYMFONY_PHPUNIT_VERSION=8.3');`
`13`	`13`	`} elseif (\PHP_VERSION_ID >= 70000) {`
`14`	`14`	`putenv('SYMFONY_PHPUNIT_VERSION=6.5');`
`15`	`15`	`}`