Merge branch '2.15' into 2.16

PHP-CS-Fixer · Nov 25, 2019 · e72ce13 · e72ce13
2 parents e60b2ac + dbe278f
commit e72ce13
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/php-cs-fixer b/php-cs-fixer
@@ -27,8 +27,8 @@ if (defined('HHVM_VERSION_ID')) {
     } else {
         exit(1);
     }
-} elseif (!defined('PHP_VERSION_ID') || \PHP_VERSION_ID < 50600 || \PHP_VERSION_ID >= 70400) {
-    fwrite(STDERR, "PHP needs to be a minimum version of PHP 5.6.0 and maximum version of PHP 7.3.*.\n");
+} elseif (!defined('PHP_VERSION_ID') || \PHP_VERSION_ID < 50600 || \PHP_VERSION_ID >= 70500) {
+    fwrite(STDERR, "PHP needs to be a minimum version of PHP 5.6.0 and maximum version of PHP 7.4.*.\n");
 
     if (getenv('PHP_CS_FIXER_IGNORE_ENV')) {
         fwrite(STDERR, "Ignoring environment requirements because `PHP_CS_FIXER_IGNORE_ENV` is set. Execution may be unstable.\n");

diff --git a/tests/Fixtures/Integration/misc/PHP7.test → tests/Fixtures/Integration/misc/PHP7_0.test b/tests/Fixtures/Integration/misc/PHP7.test → tests/Fixtures/Integration/misc/PHP7_0.test
@@ -1,5 +1,5 @@
 --TEST--
-PHP 7 test.
+PHP 7.0 test.
 --RULESET--
 {
     "@Symfony": true,

diff --git a/tests/Smoke/CiIntegrationTest.php b/tests/Smoke/CiIntegrationTest.php
@@ -139,7 +139,7 @@ public function testIntegration(
             $steps[4],
         ]);
 
-        $optionalIncompatibilityWarning = 'PHP needs to be a minimum version of PHP 5.6.0 and maximum version of PHP 7.3.*.
+        $optionalIncompatibilityWarning = 'PHP needs to be a minimum version of PHP 5.6.0 and maximum version of PHP 7.4.*.
 Ignoring environment requirements because `PHP_CS_FIXER_IGNORE_ENV` is set. Execution may be unstable.
 ';