Fix menu on Octane (#99)

orchidsoftware · Sep 5, 2024 · 020f062 · 020f062
1 parent 2dcd035
commit 020f062
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 68 deletions.
diff --git a/src/CrudServiceProvider.php b/src/CrudServiceProvider.php
@@ -6,7 +6,6 @@
 use Illuminate\Support\ServiceProvider;
 use Orchid\Crud\Commands\ActionCommand;
 use Orchid\Crud\Commands\ResourceCommand;
-use Orchid\Crud\Middleware\BootCrudGenerator;
 use Orchid\Platform\Providers\FoundationServiceProvider;
 use Orchid\Support\Facades\Dashboard;
 
@@ -34,9 +33,15 @@ class CrudServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    public function boot()
+    public function boot(ResourceFinder $finder, Arbitrator $arbitrator)
     {
-        Route::pushMiddlewareToGroup('platform', BootCrudGenerator::class);
+        $resources = $finder
+            ->setNamespace(app()->getNamespace() . 'Orchid\\Resources')
+            ->find(app_path('Orchid/Resources'));
+
+        $arbitrator
+            ->resources($resources)
+            ->boot();
 
         Route::domain((string)config('platform.domain'))
             ->prefix(Dashboard::prefix('/'))

diff --git a/src/Middleware/BootCrudGenerator.php b/src/Middleware/BootCrudGenerator.php
diff --git a/tests/ProviderTest.php b/tests/ProviderTest.php
@@ -5,20 +5,9 @@
 
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
-use Orchid\Crud\Middleware\BootCrudGenerator;
 
 class ProviderTest extends TestCase
 {
-    public function testMiddlewareRegister(): void
-    {
-        $this->assertTrue(Route::hasMiddlewareGroup('platform'));
-
-        $this->assertContains(
-            BootCrudGenerator::class,
-            Route::getMiddlewareGroups()['platform']
-        );
-    }
-
     public function testRouteRegister(): void
     {
         $this->assertTrue(Route::has('platform.resource.create'));

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -6,7 +6,6 @@
 use Orchestra\Testbench\TestCase as Orchestra;
 use Orchid\Crud\Arbitrator;
 use Orchid\Crud\CrudServiceProvider;
-use Orchid\Crud\Middleware\BootCrudGenerator;
 use Orchid\Crud\ResourceFinder;
 use Orchid\Platform\Providers\FoundationServiceProvider;
 use Orchid\Platform\Providers\RouteServiceProvider;
@@ -64,7 +63,7 @@ public function getEnvironmentSetUp($app)
     {
         $app['config']->set('platform.auth', false);
         $app['config']->set('platform.middleware.public', ['web']);
-        $app['config']->set('platform.middleware.private', ['web', BootCrudGenerator::class]);
+        $app['config']->set('platform.middleware.private', ['web']);
 
         $app['config']->set('database.default', 'sqlite');
         $app['config']->set('database.connections.sqlite', [