php 8.5 compatibility

Author: bkdotcom

tests/Debug/Type/BasicTest.php

@@ -669,12 +669,18 @@ public static function providerTestMethod()
             ),
         );
 
-        // $tests = \array_intersect_key($tests, \array_flip(array('callable')));
+        // phpunit issue with php 8.5 causing INF and NAN tests to fail
+        if (PHP_VERSION_ID >= 80500) {
+            $tests = \array_diff_key($tests, \array_flip(array(
+                'float.inf',
+                'float.NaN',
+            )));
+        }
 
-        return \array_map(function ($test) {
+        return \array_map(static function ($test) {
             return \is_callable($test)
-            ? $test()
-            : $test;
+                ? $test()
+                : $test;
         }, $tests);
     }
 }

tests/Debug/Utility/PhpTest.php

@@ -50,13 +50,11 @@ public function testGetIncludedFiles()
 
     public function testGetIniFiles()
     {
-        self::assertSame(
-            \array_merge(
-                array(\php_ini_loaded_file()),
-                \preg_split('#\s*[,\r\n]+\s*#', \trim(\php_ini_scanned_files()))
-            ),
-            Php::getIniFiles()
-        );
+        $expect = \array_filter(\array_merge(
+            array(\php_ini_loaded_file()),
+            \preg_split('#\s*[,\r\n]+\s*#', \trim(\php_ini_scanned_files()))
+        ));
+        self::assertSame($expect, Php::getIniFiles());
     }
 
     /**

tests/ErrorHandler/ErrorHandlerTest.php

@@ -569,7 +569,7 @@ public function testThrowErrorException()
         $trace = $exception->getTrace();
         self::assertSame($errorVals['file'], $trace[1]['file']);
         self::assertSame($backtraceLine, $trace[1]['line']);
-        PHP_VERSION_ID >= 70000
+        PHP_VERSION_ID >= 70000 && PHP_VERSION_ID < 80500
             ? self::assertSame('bdk\\Test\\ErrorHandler\\ErrorHandlerTest->raiseError', $trace[1]['function'])
             : self::assertSame('bdk\\Test\\ErrorHandler\\AbstractTestCase->raiseError', $trace[1]['function']);
         self::assertSame(__CLASS__ . '->' . __FUNCTION__, $trace[2]['function']);