[WIP] Next CRUD Version

.github/workflows/testing.yml

@@ -2,6 +2,7 @@ name: PHP Tests
 
 on:
     push:
+    pull_request:
     schedule:
         - cron: '0 0 * * *'
 
@@ -19,25 +20,11 @@ jobs:
             # run all combinations of the following, to make sure they're working together
             matrix:
                 # os: [ubuntu-latest, macos-latest, windows-latest]
-                php: ['8.1', '8.2', '8.3', '8.4']
-                laravel: [^10.0, ^11.0, ^12.0]
-                dbal: [^3.0]
-                phpunit: [10.*, 11.*]
+                php: ['8.2', '8.3', '8.4']
+                laravel: [^12.0]
+                dbal: [^4.0]
+                phpunit: [11.*]
                 dependency-version: [stable] # to add: lowest
-                exclude:
-                    -   laravel: "^11.0"
-                        php: "8.1"
-                        dbal: "^3.0"
-                    -   laravel: "^12.0"
-                        php: "8.1"
-                        dbal: "^3.0"
-                    -   laravel: "^12.0"
-                        php: "8.2"
-                        dbal: "^3.0"
-                    -   phpunit: "11.*"
-                        laravel: "^10.0"
-                    -   phpunit: "10.*"
-                        laravel: "^12.0"
 
         name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, PHPUnit ${{ matrix.phpunit }}, DBAL ${{ matrix.dbal }} --prefer-${{ matrix.dependency-version }}
 

.gitignore

@@ -7,4 +7,5 @@ composer.lock
 .phpunit.result.cache
 src/public/packages/
 /.phpunit.cache
+coverage/
 

composer.json

@@ -35,16 +35,16 @@
         }
     ],
     "require": {
-        "laravel/framework": "^10.0|^11.0|^12",
-        "backpack/basset": "^1.1.1|^1.3.2",
+        "laravel/framework": "^12",
+        "backpack/basset": "^2.0.0-beta",
         "creativeorange/gravatar": "^1.0",
         "prologue/alerts": "^1.0",
-        "doctrine/dbal": "^3.0|^4.0",
+        "doctrine/dbal": "^4.0",
         "guzzlehttp/guzzle": "^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.0|^9.0|^11.0",
-        "orchestra/testbench": "^8.0|^9.0|^10.0",
+        "phpunit/phpunit": "^11.0",
+        "orchestra/testbench": "^10.0",
         "spatie/laravel-translatable": "^6.0"
     },
     "autoload": {
@@ -62,9 +62,12 @@
         ]
     },
     "scripts": {
-        "test": "vendor/bin/phpunit --testdox",
+        "test": [
+            "@putenv XDEBUG_MODE=off",
+            "vendor/bin/phpunit"
+        ],
         "test-failing": "vendor/bin/phpunit --order-by=defects --stop-on-failure",
-        "test-coverage": "XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-text"
+        "test-coverage": "XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-html=coverage"
     },
     "extra": {
         "branch-alias": {

phpunit.xml

@@ -23,6 +23,7 @@
     <include>
       <directory suffix=".php">./src/app/Library/CrudPanel/Traits/</directory>
       <directory>./src/app/Library/Validation/</directory>
+      <directory>./src/app/Library/Uploaders/</directory>
       <directory suffix=".php">./src/app/Library/CrudPanel/</directory>
       <directory suffix=".php">./src/app/Models/Traits/</directory>
       <file>./src/app/Library/Widget.php</file>
@@ -35,9 +36,11 @@
   </source>
   <php>
         <env name="APP_ENV" value="testing"/>
+        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
         <env name="BCRYPT_ROUNDS" value="12"/>
         <env name="CACHE_DRIVER" value="array"/>
         <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="DB_FOREIGN_KEYS" value="true"/>
         <env name="DB_DATABASE" value=":memory:"/>
         <env name="MAIL_MAILER" value="array"/>
         <env name="QUEUE_CONNECTION" value="sync"/>

src/BackpackServiceProvider.php

@@ -5,13 +5,13 @@
 use Backpack\Basset\Facades\Basset;
 use Backpack\CRUD\app\Http\Middleware\EnsureEmailVerification;
 use Backpack\CRUD\app\Http\Middleware\ThrottlePasswordRecovery;
-use Backpack\CRUD\app\Library\CrudPanel\CrudPanel;
 use Backpack\CRUD\app\Library\Database\DatabaseSchema;
 use Backpack\CRUD\app\Library\Uploaders\Support\UploadersRepository;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
 use Illuminate\View\Compilers\BladeCompiler;
@@ -63,6 +63,26 @@ public function boot(Router $router)
         $this->sendUsageStats();
 
         Basset::addViewPath(realpath(__DIR__.'/resources/views'));
+
+        foreach (config('backpack.ui.styles', []) as $style) {
+            if (is_array($style)) {
+                foreach ($style as $file) {
+                    Basset::map($file);
+                }
+            } else {
+                Basset::map($style);
+            }
+        }
+
+        foreach (config('backpack.ui.scripts', []) as $script) {
+            if (is_array($script)) {
+                foreach ($script as $file) {
+                    Basset::map($file);
+                }
+            } else {
+                Basset::map($script);
+            }
+        }
     }
 
     /**
@@ -78,19 +98,29 @@ public function register()
         $this->loadViewsWithFallbacks('crud');
         $this->loadViewsWithFallbacks('ui', 'backpack.ui');
         $this->loadViewNamespace('widgets', 'backpack.ui::widgets');
+        ViewNamespaces::addFor('widgets', 'crud::widgets');
+
         $this->loadViewComponents();
+        $this->registerDynamicBladeComponents();
 
         $this->registerBackpackErrorViews();
 
-        // Bind the CrudPanel object to Laravel's service container
-        $this->app->scoped('crud', function ($app) {
-            return new CrudPanel();
+        $this->app->bind('crud', function ($app) {
+            return CrudManager::identifyCrudPanel();
+        });
+
+        $this->app->scoped('CrudManager', function ($app) {
+            return new CrudPanelManager();
         });
 
         $this->app->scoped('DatabaseSchema', function ($app) {
             return new DatabaseSchema();
         });
 
+        $this->app->scoped('BackpackLifecycleHooks', function ($app) {
+            return new app\Library\CrudPanel\Hooks\LifecycleHooks();
+        });
+
         $this->app->singleton('BackpackViewNamespaces', function ($app) {
             return new ViewNamespaces();
         });
@@ -177,7 +207,7 @@ public function publishFiles()
     /**
      * Define the routes for the application.
      *
-     * @param  \Illuminate\Routing\Router  $router
+     * @param  Router  $router
      * @return void
      */
     public function setupRoutes(Router $router)
@@ -196,7 +226,7 @@ public function setupRoutes(Router $router)
     /**
      * Load custom routes file.
      *
-     * @param  \Illuminate\Routing\Router  $router
+     * @param  Router  $router
      * @return void
      */
     public function setupCustomRoutes(Router $router)
@@ -314,6 +344,38 @@ public function loadViewComponents()
         });
     }
 
+    /**
+     * Register dynamic Blade components from the Components directory.
+     *
+     * Any Blade component classes that are in that directory will be registered
+     * as dynamic components with the 'bp-{component-name}' prefix.
+     */
+    private function registerDynamicBladeComponents()
+    {
+        $path = __DIR__.'/app/View/Components';
+        $namespace = 'Backpack\\CRUD\\app\\View\\Components';
+
+        if (! is_dir($path)) {
+            return;
+        }
+
+        foreach (File::allFiles($path) as $file) {
+            $relativePath = str_replace(
+                ['/', '.php'],
+                ['\\', ''],
+                Str::after($file->getRealPath(), realpath($path).DIRECTORY_SEPARATOR)
+            );
+
+            $class = $namespace.'\\'.$relativePath;
+
+            // Check if the class exists and is a subclass of Illuminate\View\Component
+            // This ensures that only valid Blade components are registered.
+            if (class_exists($class) && is_subclass_of($class, \Illuminate\View\Component::class)) {
+                Blade::component('bp-'.Str::kebab(class_basename($class)), $class);
+            }
+        }
+    }
+
     /**
      * Load the Backpack helper methods, for convenience.
      */
@@ -329,7 +391,7 @@ public function loadHelpers()
      */
     public function provides()
     {
-        return ['crud', 'widgets', 'BackpackViewNamespaces', 'DatabaseSchema', 'UploadersRepository'];
+        return ['widgets', 'BackpackViewNamespaces', 'DatabaseSchema', 'UploadersRepository', 'CrudManager'];
     }
 
     private function registerBackpackErrorViews()

src/CrudManager.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Backpack\CRUD;
+
+use Illuminate\Support\Facades\Facade;
+
+/**
+ * @see CrudPanelManager
+ */
+class CrudManager extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return 'CrudManager';
+    }
+}