Merge pull request #989 from IonBazan/feature/php85

Fix PHP 8.5 deprecations

Author: freekmurze

.github/workflows/run-tests.yml

@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.4, 8.3, 8.2, 8.1, 8.0, 7.4]
+        php: [8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.4]
         dependency-version: [prefer-lowest, prefer-stable]
 
     name: P${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
@@ -40,7 +40,7 @@ jobs:
 
       - name: Configure for PHP 8.4
         run: composer require "rector/rector:2.*" --no-interaction --no-update
-        if: matrix.php == '8.4' && matrix.dependency-version == 'prefer-lowest'
+        if: matrix.php >= '8.4' && matrix.dependency-version == 'prefer-lowest'
 
       - name: Install dependencies
         run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction

src/Settings/SettingsFactory.php

@@ -39,6 +39,7 @@ public function getSettingsFromConfigFile(?string $configDirectory = null): arra
 
     protected function searchConfigFiles(?string $configDirectory = null): string
     {
+        $configDirectory ??= '';
         if (! isset(self::$cache[$configDirectory])) {
             self::$cache[$configDirectory] = $this->searchConfigFilesOnDisk($configDirectory);
         }

src/Support/Invador.php

@@ -22,7 +22,9 @@ public function __get(string $name): Ray
     {
         $property = $this->reflected->getProperty($name);
 
-        $property->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $property->setAccessible(true);
+        }
 
         $value = $property->getValue($this->obj);
 
@@ -33,7 +35,9 @@ public function __call(string $name, array $params = []): Ray
     {
         $method = $this->reflected->getMethod($name);
 
-        $method->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $method->setAccessible(true);
+        }
 
         $result = $method->invoke($this->obj, ...$params);