Merge branch 'main' into fix-fluent-column-key

# Conflicts:
#	tests/Unit/CrudPanel/CrudPanelColumnsTest.php

Author: pxpm

.github/pull_request_template.md

@@ -25,3 +25,11 @@
 ### How can we test the before & after?
 
 ??
+
+If the PR has changes in multiple repos please provide the command to checkout all branches, eg.:
+```bash
+git checkout "dev-branch-name" &&
+cd vendor/backpack/crud && git checkout crud-branch-name &&
+cd ../pro && git checkout pro-branch-name &&
+cd ../../..
+```

.github/workflows/coverage.yml

@@ -50,9 +50,9 @@ jobs:
           status: ${{ steps.test-coverage.outputs.coverage-rounded-display }}
           path: ./test-coverage.svg
           color: ${{ steps.test-coverage.outputs.coverage > 90 && 'green'              ||
-            steps.test-coverage.outputs.coverage > 80 && 'yellow,green'       ||
-            steps.test-coverage.outputs.coverage > 70 && 'yellow'             ||
-            steps.test-coverage.outputs.coverage > 60 && 'orange,yellow'      ||
+            steps.test-coverage.outputs.coverage > 80 && 'yellow,green, green'       ||
+            steps.test-coverage.outputs.coverage > 70 && 'yellow, green'             ||
+            steps.test-coverage.outputs.coverage > 60 && 'yellow,yellow, green'      ||
             steps.test-coverage.outputs.coverage > 50 && 'orange'             ||
             steps.test-coverage.outputs.coverage > 40 && 'red,orange'         ||
             steps.test-coverage.outputs.coverage > 30 && 'red,red,orange'     ||

package-lock.json

@@ -16,9 +16,9 @@
         "lodash": "^4.17.21",
         "pace": "0.0.4",
         "resolve-url-loader": "^4.0.0",
-        "sass": "^1.55.0",
+        "sass": "^1.56.1",
         "sass-loader": "^9.0.3",
-        "vue-template-compiler": "^2.7.8"
+        "vue-template-compiler": "^2.7.14"
     },
     "dependencies": {
         "@coreui/coreui": "^2.1.16",
@@ -29,10 +29,10 @@
         "bootstrap-datepicker": "^1.9.0",
         "bootstrap-daterangepicker": "^3.1.0",
         "bootstrap-iconpicker": "^1.8.2",
-        "ckeditor4": "^4.20.0",
+        "ckeditor4": "^4.20.1",
         "cropperjs": "^1.5.12",
-        "datatables.net": "^1.12.1",
-        "datatables.net-bs4": "^1.12.1",
+        "datatables.net": "^1.13.1",
+        "datatables.net-bs4": "^1.13.1",
         "datatables.net-fixedheader": "^3.2.4",
         "datatables.net-fixedheader-bs4": "^3.2.4",
         "datatables.net-responsive": "^2.3.0",
@@ -60,7 +60,7 @@
         "source-sans-pro": "^3.6",
         "summernote": "^0.8.20",
         "sweetalert": "^2.1.2",
-        "tinymce": "^5.10.2",
+        "tinymce": "^5.10.7",
         "urijs": "^1.19.11"
     }
 }

package.json

@@ -23,6 +23,7 @@
             <directory suffix=".php">./src/app/Models/Traits/</directory>
             <file>./src/app/Library/Widget.php</file>
             <file>./src/app/Http/Controllers/CrudController.php</file>
+            <file>./src/ViewNamespaces.php</file>
             <exclude>
                 <directory suffix=".php">./src/app/Models/Traits/SpatieTranslatable/</directory>
             </exclude>

phpunit.xml

@@ -30,8 +30,10 @@ class BackpackServiceProvider extends ServiceProvider
 
     // Indicates if loading of the provider is deferred.
     protected $defer = false;
+
     // Where the route file lives, both inside the package and in the app (if overwritten).
     public $routeFilePath = '/routes/backpack/base.php';
+
     // Where custom routes can be written, and will be registered by Backpack.
     public $customRoutesFilePath = '/routes/backpack/custom.php';
 
@@ -40,7 +42,7 @@ class BackpackServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    public function boot(\Illuminate\Routing\Router $router)
+    public function boot(Router $router)
     {
         $this->loadViewsWithFallbacks();
         $this->loadTranslationsFrom(realpath(__DIR__.'/resources/lang'), 'backpack');
@@ -161,6 +163,11 @@ public function publishFiles()
      */
     public function setupRoutes(Router $router)
     {
+        if (app()->runningUnitTests()) {
+            $this->loadRoutesFrom(__DIR__.'/routes/backpack/testing.php');
+
+            return;
+        }
         // by default, use the routes file provided in vendor
         $routeFilePathInUse = __DIR__.$this->routeFilePath;
 
@@ -259,8 +266,8 @@ public function loadConfigs()
             'backpack' => [
                 'provider'  => 'backpack',
                 'table'     => 'password_resets',
-                'expire'   => 60,
-                'throttle' => config('backpack.base.password_recovery_throttle_notifications'),
+                'expire'    => config('backpack.base.password_recovery_token_expiration', 60),
+                'throttle'  => config('backpack.base.password_recovery_throttle_notifications'),
             ],
         ];
 

src/BackpackServiceProvider.php

@@ -33,7 +33,7 @@ public function __construct()
         // It's done inside a middleware closure in order to have
         // the complete request inside the CrudPanel object.
         $this->middleware(function ($request, $next) {
-            $this->crud = app()->make('crud');
+            $this->crud = app('crud');
 
             $this->crud->setRequest($request);
 
@@ -96,6 +96,7 @@ protected function setupDefaults()
     protected function setupConfigurationForCurrentOperation()
     {
         $operationName = $this->crud->getCurrentOperation();
+
         $setupClassName = 'setup'.Str::studly($operationName).'Operation';
 
         /*