Fix tests and update for PHP 8.5

Author: johnstevenson

.github/workflows/continuous-integration.yml

@@ -26,16 +26,17 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
         os: [ubuntu-latest]
         experimental: [false]
         include:
           - php-version: "7.2"
             os: windows-latest
             experimental: false
-          - php-version: "8.3"
+          - php-version: "8.4"
             os: windows-latest
             experimental: false
-          - php-version: "8.4"
+          - php-version: "8.5"
             os: ubuntu-latest
             experimental: true
 
@@ -55,7 +56,7 @@ jobs:
         if: ${{ !matrix.experimental }}
         run: vendor/bin/phpunit
 
-      # Show deprecations on PHP 8.4
+      # Show deprecations on latest PHP
       - name: Run tests (experimental)
         if: ${{ matrix.experimental }}
         run: vendor/bin/phpunit --display-deprecations

.github/workflows/functional.yml

@@ -20,17 +20,17 @@ jobs:
       matrix:
         php-version:
           - "7.2"
-          - "8.3"
+          - "8.4"
         os: [ubuntu-latest]
         experimental: [false]
         include:
           - php-version: "7.2"
             os: windows-latest
             experimental: false
-          - php-version: "8.3"
+          - php-version: "8.4"
             os: windows-latest
             experimental: false
-          - php-version: "8.4"
+          - php-version: "8.5"
             os: ubuntu-latest
             experimental: true
 
@@ -48,9 +48,10 @@ jobs:
 
       - name: Run tests
         if: ${{ !matrix.experimental }}
+        # Include --fail-on-skipped when min PHP is > 7.2.5
         run: vendor/bin/phpunit --group functional
 
-      # Show deprecations on PHP 8.4
+      # Show deprecations on latest PHP
       - name: Run tests (experimental)
         if: ${{ matrix.experimental }}
-        run: vendor/bin/phpunit --group functional --display-deprecations
+        run: vendor/bin/phpunit --group functional --fail-on-skipped --display-deprecations

tests/Mocks/CoreMock.php

@@ -97,7 +97,7 @@ public static function createAndCheck($loaded, ?self $parentProcess = null, arra
         static::$settings = $settings;
 
         $xdebug->check();
-        return $xdebug->childProcess !==null ? $xdebug->childProcess : $xdebug;
+        return $xdebug->childProcess !== null ? $xdebug->childProcess : $xdebug;
     }
 
     final public function __construct(bool $loaded, ?string $mode)
@@ -108,24 +108,16 @@ final public function __construct(bool $loaded, ?string $mode)
         $this->parentXdebugVersion = $loaded ? static::TEST_VERSION : null;
 
         // Set private static xdebugVersion
-        $prop = $this->refClass->getProperty('xdebugVersion');
-        $prop->setAccessible(true);
-        $prop->setValue($this, $this->parentXdebugVersion);
+        $this->setProperty('xdebugVersion', $this->parentXdebugVersion);
 
         // Set private static xdebugMode
-        $prop = $this->refClass->getProperty('xdebugMode');
-        $prop->setAccessible(true);
-        $prop->setValue($this, $mode);
+        $this->setProperty('xdebugMode', $mode);
 
         // Set private static xdebugActive
-        $prop = $this->refClass->getProperty('xdebugActive');
-        $prop->setAccessible(true);
-        $prop->setValue($this, $loaded && $mode !== 'off');
+        $this->setProperty('xdebugActive', $loaded && $mode !== 'off');
 
         // Ensure static private skipped is unset
-        $prop = $this->refClass->getProperty('skipped');
-        $prop->setAccessible(true);
-        $prop->setValue($this, null);
+        $this->setProperty('skipped', null);
 
         $this->restarted = false;
     }
@@ -156,6 +148,20 @@ protected function restart(array $command): void
         static::createAndCheck(false, $this, static::$settings);
     }
 
+    /**
+     * @param string|null|bool $value
+     */
+    private function setProperty(string $name, $value): void
+    {
+        $prop = $this->refClass->getProperty($name);
+
+        if (PHP_VERSION_ID < 80100) {
+            $prop->setAccessible(true);
+        }
+
+        $prop->setValue($this, $value);
+    }
+
     private static function updateServerEnvironment(): void
     {
         $names = [