[5.x] PHP 8.5 Compatibility (#1667)

* [5.x] PHP 8.5 Compatibility

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

---------

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

.github/workflows/tests.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.2, 8.3, 8.4]
+        php: [8.1, 8.2, 8.3, 8.4, 8.5]
         laravel: [10, 11, 12]
         include:
           - php: '8.0'
@@ -39,6 +39,10 @@ jobs:
             laravel: 12
           - php: 8.4
             laravel: 10
+          - php: 8.5
+            laravel: 10
+          - php: 8.5
+            laravel: 11
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 

composer.json

@@ -26,9 +26,8 @@
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0",
+        "orchestra/testbench": "^7.55|^8.36|^9.15|^10.8",
         "phpstan/phpstan": "^1.10|^2.0",
-        "phpunit/phpunit": "^9.0|^10.4|^11.5|^12.0",
         "predis/predis": "^1.1|^2.0|^3.0"
     },
     "suggest": {
@@ -62,6 +61,9 @@
         }
     },
     "config": {
+        "audit": {
+            "block-insecure": false
+        },
         "sort-packages": true
     },
     "minimum-stability": "dev",

tests/Feature/RedisPayloadTest.php

@@ -125,9 +125,6 @@ public function test_tags_are_correctly_determined_for_listeners()
         $this->assertEquals([FakeModel::class.':42'], $JobPayload->decoded['tags']);
     }
 
-    /**
-     * @requires PHP 7.4
-     */
     public function test_tags_are_correctly_determined_for_listeners_with_property_types()
     {
         $JobPayload = new JobPayload(json_encode(['id' => 1]));

tests/Feature/SupervisorCommandTest.php

@@ -37,6 +37,6 @@ private function myNiceness()
     {
         $pid = getmypid();
 
-        return (int) trim(`ps -p $pid -o nice=`);
+        return (int) trim(shell_exec("ps -p {$pid} -o nice="));
     }
 }

tests/Feature/SupervisorTest.php

@@ -22,6 +22,7 @@
 use Laravel\Horizon\Tests\IntegrationTest;
 use Laravel\Horizon\WorkerCommandString;
 use Mockery;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 
 class SupervisorTest extends IntegrationTest
 {
@@ -50,6 +51,7 @@ protected function tearDown(): void
     }
 
     /** @requires extension redis */
+    #[RequiresPhpExtension('redis')]
     public function test_supervisor_can_start_worker_process_with_given_options()
     {
         Queue::push(new Jobs\BasicJob);
@@ -262,6 +264,7 @@ public function test_supervisor_can_restart_processes()
     }
 
     /** @requires extension redis */
+    #[RequiresPhpExtension('redis')]
     public function test_processes_can_be_paused_and_continued()
     {
         $options = $this->supervisorOptions();