Merge pull request #13 from nanasess/use-githubactions

PHP8.1 support

Author: nanasess

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        php: [ '5.3', '5.4', '5.5', '5.6', '7.1', '7.2', '7.3', '7.4', '8.0' ]
+        php: [ '5.3', '5.4', '5.5', '5.6', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
         dependencies: [ 'lowest', 'highest' ]
     steps:
       - uses: actions/checkout@v2

src/Util/Configuration.php

@@ -514,22 +514,17 @@ public function handlePHPConfiguration()
 
         foreach (array('var', 'post', 'get', 'cookie', 'server', 'files', 'request') as $array) {
             // See https://github.com/sebastianbergmann/phpunit/issues/277
-            switch ($array) {
-                case 'var':
-                    $target = &$GLOBALS;
-                    break;
-
-                case 'server':
-                    $target = &$_SERVER;
-                    break;
-
-                default:
-                    $target = &$GLOBALS['_' . strtoupper($array)];
-                    break;
-            }
-
             foreach ($configuration[$array] as $name => $value) {
-                $target[$name] = $value;
+                switch ($array) {
+                    case 'var':
+                        $GLOBALS[$name] = $value;
+                        break;
+                    case 'server':
+                        $_SERVER[$name] = $value;
+                        break;
+                    default:
+                        $GLOBALS['_' . strtoupper($array)][$name] = $value;
+                }
             }
         }
 

src/Util/Getopt.php

@@ -144,7 +144,7 @@ protected static function parseLongOption($arg, $long_options, &$opts, &$args)
 
             if (substr($long_opt, -1) == '=') {
                 if (substr($long_opt, -2) != '==') {
-                    if (!strlen($opt_arg)) {
+                    if (null === $opt_arg || strlen($opt_arg) < 1) {
                         $opt_arg = current($args);
                         next($args);
                         if (!($opt_arg)) {

tests/Regression/GitHub/1337.phpt

@@ -1,5 +1,9 @@
 --TEST--
 GH-1337: Data Provider with \ at the end of the name breaks with process isolation
+--SKIPIF--
+<?php
+if (PHP_VERSION_ID >= 80100) die('Skipped: PHP 8.1 is deprecated'); ?>
+?>
 --FILE--
 <?php