[5.x] Merge develop (#1369)

* [develop] Adds L11 support (#1352) * Adds L11 support * Fixes service provider installation * Fixes service provider installation * Fixes service provider installation * Fixes static analysis * Improves test suite organization * Test without `runInSeparateProcess` * Adjusts installation process (#1353)
laravel · Jan 15, 2024 · b348621 · b348621
1 parent 22408b6
commit b348621
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 30 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -24,18 +24,26 @@ jobs:
       fail-fast: true
       matrix:
         php: [7.3, 7.4, '8.0', 8.1, 8.2, 8.3]
-        laravel: [8, 9, 10]
+        laravel: [8, 9, 10, 11]
         exclude:
           - php: 7.3
             laravel: 9
           - php: 7.3
             laravel: 10
+          - php: 7.3
+            laravel: 11
           - php: 7.4
             laravel: 9
           - php: 7.4
             laravel: 10
+          - php: 7.4
+            laravel: 11
           - php: '8.0'
             laravel: 10
+          - php: '8.0'
+            laravel: 11
+          - php: 8.1
+            laravel: 11
           - php: 8.2
             laravel: 8
           - php: 8.3

diff --git a/composer.json b/composer.json
@@ -14,19 +14,19 @@
         "ext-json": "*",
         "ext-pcntl": "*",
         "ext-posix": "*",
-        "illuminate/contracts": "^8.17|^9.0|^10.0",
-        "illuminate/queue": "^8.17|^9.0|^10.0",
-        "illuminate/support": "^8.17|^9.0|^10.0",
+        "illuminate/contracts": "^8.17|^9.0|^10.0|^11.0",
+        "illuminate/queue": "^8.17|^9.0|^10.0|^11.0",
+        "illuminate/support": "^8.17|^9.0|^10.0|^11.0",
         "nesbot/carbon": "^2.17",
         "ramsey/uuid": "^4.0",
-        "symfony/process": "^5.0|^6.0",
-        "symfony/error-handler": "^5.0|^6.0"
+        "symfony/process": "^5.0|^6.0|^7.0",
+        "symfony/error-handler": "^5.0|^6.0|^7.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^6.0|^7.0|^8.0",
+        "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^9.0",
+        "phpunit/phpunit": "^9.0|^10.4",
         "predis/predis": "^1.1|^2.0"
     },
     "suggest": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -16,8 +16,14 @@
          verbose="true"
 >
     <testsuites>
-        <testsuite name="Laravel Horizon Test Suite">
-            <directory suffix="Test.php">./tests</directory>
+        <testsuite name="Unit">
+            <directory suffix="Test.php">./tests/Unit</directory>
+        </testsuite>
+        <testsuite name="Feature">
+            <directory suffix="Test.php">./tests/Feature</directory>
+        </testsuite>
+        <testsuite name="Controller">
+            <directory suffix="Test.php">./tests/Controller</directory>
         </testsuite>
     </testsuites>
     <php>

diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -3,6 +3,7 @@
 namespace Laravel\Horizon\Console;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
 
 class InstallCommand extends Command
@@ -51,17 +52,22 @@ protected function registerHorizonServiceProvider()
     {
         $namespace = Str::replaceLast('\\', '', $this->laravel->getNamespace());
 
-        $appConfig = file_get_contents(config_path('app.php'));
+        if (file_exists($this->laravel->bootstrapPath('providers.php'))) {
+            // @phpstan-ignore-next-line
+            ServiceProvider::addProviderToBootstrapFile("{$namespace}\\Providers\\HorizonServiceProvider");
+        } else {
+            $appConfig = file_get_contents(config_path('app.php'));
 
-        if (Str::contains($appConfig, $namespace.'\\Providers\\HorizonServiceProvider::class')) {
-            return;
-        }
+            if (Str::contains($appConfig, $namespace.'\\Providers\\HorizonServiceProvider::class')) {
+                return;
+            }
 
-        file_put_contents(config_path('app.php'), str_replace(
-            "{$namespace}\\Providers\EventServiceProvider::class,".PHP_EOL,
-            "{$namespace}\\Providers\EventServiceProvider::class,".PHP_EOL."        {$namespace}\Providers\HorizonServiceProvider::class,".PHP_EOL,
-            $appConfig
-        ));
+            file_put_contents(config_path('app.php'), str_replace(
+                "{$namespace}\\Providers\EventServiceProvider::class,".PHP_EOL,
+                "{$namespace}\\Providers\EventServiceProvider::class,".PHP_EOL."        {$namespace}\Providers\HorizonServiceProvider::class,".PHP_EOL,
+                $appConfig
+            ));
+        }
 
         file_put_contents(app_path('Providers/HorizonServiceProvider.php'), str_replace(
             "namespace App\Providers;",

diff --git a/tests/Controller/DashboardStatsControllerTest.php b/tests/Controller/DashboardStatsControllerTest.php
@@ -6,10 +6,11 @@
 use Laravel\Horizon\Contracts\MasterSupervisorRepository;
 use Laravel\Horizon\Contracts\MetricsRepository;
 use Laravel\Horizon\Contracts\SupervisorRepository;
+use Laravel\Horizon\Tests\ControllerTest;
 use Laravel\Horizon\WaitTimeCalculator;
 use Mockery;
 
-class DashboardStatsControllerTest extends AbstractControllerTest
+class DashboardStatsControllerTest extends ControllerTest
 {
     public function test_all_stats_are_correctly_returned()
     {

diff --git a/tests/Controller/MasterSupervisorControllerTest.php b/tests/Controller/MasterSupervisorControllerTest.php
@@ -7,8 +7,9 @@
 use Laravel\Horizon\MasterSupervisor;
 use Laravel\Horizon\Supervisor;
 use Laravel\Horizon\SupervisorOptions;
+use Laravel\Horizon\Tests\ControllerTest;
 
-class MasterSupervisorControllerTest extends AbstractControllerTest
+class MasterSupervisorControllerTest extends ControllerTest
 {
     public function test_master_supervisor_listing_without_supervisors()
     {

diff --git a/tests/Controller/MonitoringControllerTest.php b/tests/Controller/MonitoringControllerTest.php
@@ -5,9 +5,10 @@
 use Laravel\Horizon\Contracts\JobRepository;
 use Laravel\Horizon\Contracts\TagRepository;
 use Laravel\Horizon\JobPayload;
+use Laravel\Horizon\Tests\ControllerTest;
 use Mockery;
 
-class MonitoringControllerTest extends AbstractControllerTest
+class MonitoringControllerTest extends ControllerTest
 {
     public function test_monitored_tags_and_job_counts_are_returned()
     {

diff --git a/tests/Controller/AbstractControllerTest.php → tests/ControllerTest.php b/tests/Controller/AbstractControllerTest.php → tests/ControllerTest.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Laravel\Horizon\Tests\Controller;
+namespace Laravel\Horizon\Tests;
 
 use Laravel\Horizon\Horizon;
-use Laravel\Horizon\Tests\IntegrationTest;
 
-abstract class AbstractControllerTest extends IntegrationTest
+abstract class ControllerTest extends IntegrationTest
 {
     protected function setUp(): void
     {

diff --git a/tests/Feature/SupervisorCommandTest.php b/tests/Feature/SupervisorCommandTest.php
@@ -25,11 +25,6 @@ public function test_supervisor_command_can_start_paused_supervisors()
         $this->assertFalse($factory->supervisor->working);
     }
 
-    /**
-     * @runInSeparateProcess
-     *
-     * @preserveGlobalState disabled
-     */
     public function test_supervisor_command_can_set_process_niceness()
     {
         $this->app->instance(SupervisorFactory::class, $factory = new FakeSupervisorFactory);