Merge branch '8.5' into 9.5

sebastianbergmann · sebastianbergmann · commit de43725339ee · 2021-06-23T06:45:18.000+02:00
diff --git a/build/templates/binary-phar-autoload.php.in b/build/templates/binary-phar-autoload.php.in
@@ -1,6 +1,6 @@
 #!/usr/bin/env php
 <?php
-if (substr(PHP_VERSION, 0 - strlen('-(to be removed in future macOS)')) === '-(to be removed in future macOS)') {
+if (!version_compare(PHP_VERSION, PHP_VERSION, '=')) {
     fwrite(
         STDERR,
         sprintf(
diff --git a/phpunit b/phpunit
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-if (substr(PHP_VERSION, 0 - strlen('-(to be removed in future macOS)')) === '-(to be removed in future macOS)') {
+if (!version_compare(PHP_VERSION, PHP_VERSION, '=')) {
     fwrite(
         STDERR,
         sprintf(
