Merge branch 'main' into pr/5351

Author: pxpm

.github/ISSUE_TEMPLATE/config.yml

@@ -2,10 +2,10 @@ blank_issues_enabled: false
 contact_links:
   - name: Documentation issue
     url: https://github.com/laravel-backpack/docs
-    about: For documentation issues, open an issue or pull request in our docs repository.
-  - name: How Do I X?
-    url: https://stackoverflow.com/questions/tagged/backpack-for-laravel
-    about: Backpack doesn't offer official support - only community support. Please post your question on StackOverflow, using the backpack-for-laravel tag. We've been blessed with a great community, that is happy to help.
-  - name: Community Forum
+    about: Please open an issue or pull request in our docs repository.
+  - name: How Do I _____?
+    url: https://github.com/Laravel-Backpack/community-forum/discussions
+    about: Please use Discussions in our community forum. We've been blessed with a great community, that is happy to help.
+  - name: Feature Request or Idea
     url: https://github.com/Laravel-Backpack/community-forum/discussions/new
-    about: If you have an idea, question or problem and you don't know where it fits, use our Community Forum. This is where we hang out and talk about all kinds of stuff.
+    about: If you have an idea, request or want to show something you did, use our Community Forum. This is where we all hang out.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -13,7 +13,7 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/support-requests@v3
+      - uses: dessant/support-requests@v4
         with:
           github-token: ${{ github.token }}
           support-label: 'Ask-It-On-Stack-Overflow'

.github/workflows/support.yml

@@ -19,12 +19,16 @@ 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]
+                php: ['8.1', '8.2', '8.3']
+                laravel: [^10.0, ^11.0]
                 dbal: [^3.0]
-                laravel: [10.*]
                 phpunit: [10.*]
-                dependency-version: [stable] # to add: lowest
-        
+                dependency-version: [stable] # to add: lowest 
+                exclude:
+                    -   laravel: "^11.0"
+                        php: "8.1"
+                        dbal: "^3.0"
+
 
         name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, PHPUnit ${{ matrix.phpunit }}, DBAL ${{ matrix.dbal }} --prefer-${{ matrix.dependency-version }}
 
@@ -49,7 +53,12 @@ jobs:
                     key: dependencies-${{ matrix.dependency-version }}-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-phpunit-${{ matrix.phpunit }}-composer-${{ hashFiles('composer.json') }}
             -   name: Install dependencies
                 run: |
-                    composer require "laravel/framework:${{ matrix.laravel }}" "phpunit/phpunit:${{ matrix.phpunit }}" "doctrine/dbal:${{ matrix.dbal }}" --no-interaction --no-update
+                    composer require "laravel/framework:${{ matrix.laravel }}" "phpunit/phpunit:${{ matrix.phpunit }}" --no-interaction --no-update
                     composer update --prefer-${{ matrix.dependency-version }} --prefer-dist --no-interaction
+            -   name: "Install dbal"
+                if: ${{ matrix.laravel }} == 10
+                run: composer require "doctrine/dbal:${{ matrix.dbal }}" --no-interaction --no-update
+            -   name: "Update dependencies"
+                run: composer update --prefer-${{ matrix.dependency-version }} --prefer-dist --no-interaction
             -   name: Execute tests
                 run: composer test

.github/workflows/testing.yml

@@ -1,7 +1,7 @@
 <p align="center">
     <br>
     <br>
-    <a href="https://backpackforlaravel.com" title="Backpack Logo"><img src="https://camo.githubusercontent.com/50eeab913baf60d3e0dbc8bd4a7b35e1d18456fad04e353a75a4a444948b1a95/68747470733a2f2f6261636b7061636b666f726c61726176656c2e636f6d2f70726573656e746174696f6e2f696d672f6261636b7061636b2f6c6f676f732f6261636b7061636b5f6c6f676f5f636f6c6f722e706e673f763d32"></a>
+    <a href="https://backpackforlaravel.com" title="Backpack Logo"><img src="https://backpackforlaravel.com/presentation/img/backpack/logos/backpack_logo.svg" width="450px"></a>    
     <br>
     <br>
 </p>

README.md

@@ -35,17 +35,16 @@
         }
     ],
     "require": {
-        "laravel/framework": "^10.0",
+        "laravel/framework": "^10.0|^11.0",
         "prologue/alerts": "^1.0",
-        "backpack/basset": "^1.1.1",
+        "backpack/basset": "^1.1.1|^1.3",
         "creativeorange/gravatar": "~1.0",
-        "doctrine/dbal": "^3.0",
+        "doctrine/dbal": "^3.0|^4.0",
         "guzzlehttp/guzzle": "^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~10.0|~9.0",
-        "scrutinizer/ocular": "~1.7",
-        "orchestra/testbench": "^8.0",
+        "phpunit/phpunit": "^10.0|^9.0",
+        "orchestra/testbench": "^8.0|^9.0|^10.0",
         "spatie/laravel-translatable": "^6.0"
     },
     "autoload": {

composer.json

@@ -35,7 +35,7 @@
   </source>
   <php>
         <env name="APP_ENV" value="testing"/>
-        <env name="BCRYPT_ROUNDS" value="4"/>
+        <env name="BCRYPT_ROUNDS" value="12"/>
         <env name="CACHE_DRIVER" value="array"/>
         <env name="DB_CONNECTION" value="sqlite"/>
         <env name="DB_DATABASE" value=":memory:"/>

phpunit.xml

@@ -256,7 +256,7 @@ public function loadConfigs()
         // add the root disk to filesystem configuration
         app()->config['filesystems.disks.'.config('backpack.base.root_disk_name')] = [
             'driver' => 'local',
-            'root'   => base_path(),
+            'root' => base_path(),
         ];
 
         /*
@@ -275,7 +275,7 @@ public function loadConfigs()
             [
                 'backpack' => [
                     'driver' => 'eloquent',
-                    'model'  => config('backpack.base.user_model_fqn'),
+                    'model' => config('backpack.base.user_model_fqn'),
                 ],
             ];
 
@@ -292,18 +292,18 @@ public function loadConfigs()
         app()->config['auth.passwords'] = $laravelAuthPasswordBrokers +
         [
             'backpack' => [
-                'provider'  => 'backpack',
-                'table'     => $backpackPasswordBrokerTable,
-                'expire'    => config('backpack.base.password_recovery_token_expiration', 60),
-                'throttle'  => config('backpack.base.password_recovery_throttle_notifications'),
+                'provider' => 'backpack',
+                'table' => $backpackPasswordBrokerTable,
+                'expire' => config('backpack.base.password_recovery_token_expiration', 60),
+                'throttle' => config('backpack.base.password_recovery_throttle_notifications'),
             ],
         ];
 
         // add the backpack_users guard to the configuration
         app()->config['auth.guards'] = app()->config['auth.guards'] +
             [
                 'backpack' => [
-                    'driver'   => 'session',
+                    'driver' => 'session',
                     'provider' => 'backpack',
                 ],
             ];

src/BackpackServiceProvider.php

@@ -50,24 +50,24 @@ private function sendUsageStats()
         $url = 'https://backpackforlaravel.com/api/stats';
         $method = 'PUT';
         $stats = [
-            'URL'                       => url('') ?? false,
-            'HTTP_HOST'                 => $_SERVER['HTTP_HOST'] ?? false,
-            'APP_URL'                   => $_SERVER['APP_URL'] ?? false,
-            'APP_ENV'                   => $this->app->environment() ?? false,
-            'APP_DEBUG'                 => $_SERVER['APP_DEBUG'] ?? false,
-            'SERVER_ADDR'               => $_SERVER['SERVER_ADDR'] ?? false,
-            'SERVER_ADMIN'              => $_SERVER['SERVER_ADMIN'] ?? false,
-            'SERVER_NAME'               => $_SERVER['SERVER_NAME'] ?? false,
-            'SERVER_PORT'               => $_SERVER['SERVER_PORT'] ?? false,
-            'SERVER_PROTOCOL'           => $_SERVER['SERVER_PROTOCOL'] ?? false,
-            'SERVER_SOFTWARE'           => $_SERVER['SERVER_SOFTWARE'] ?? false,
-            'DB_CONNECTION'             => $_SERVER['DB_CONNECTION'] ?? false,
-            'LARAVEL_VERSION'           => $this->app->version() ?? false,
-            'BACKPACK_CRUD_VERSION'     => \Composer\InstalledVersions::getVersion('backpack/crud') ?? false,
-            'BACKPACK_PRO_VERSION'      => backpack_pro(),
-            'BACKPACK_LICENSE'          => config('backpack.base.license_code') ?? false,
-            'BACKPACK_TOKEN_USERNAME'   => config('backpack.base.token_username') ?? false,
-            'BACKPACK_URL'              => backpack_url('') ?? false,
+            'URL' => url('') ?? false,
+            'HTTP_HOST' => $_SERVER['HTTP_HOST'] ?? false,
+            'APP_URL' => $_SERVER['APP_URL'] ?? false,
+            'APP_ENV' => $this->app->environment() ?? false,
+            'APP_DEBUG' => $_SERVER['APP_DEBUG'] ?? false,
+            'SERVER_ADDR' => $_SERVER['SERVER_ADDR'] ?? false,
+            'SERVER_ADMIN' => $_SERVER['SERVER_ADMIN'] ?? false,
+            'SERVER_NAME' => $_SERVER['SERVER_NAME'] ?? false,
+            'SERVER_PORT' => $_SERVER['SERVER_PORT'] ?? false,
+            'SERVER_PROTOCOL' => $_SERVER['SERVER_PROTOCOL'] ?? false,
+            'SERVER_SOFTWARE' => $_SERVER['SERVER_SOFTWARE'] ?? false,
+            'DB_CONNECTION' => $_SERVER['DB_CONNECTION'] ?? false,
+            'LARAVEL_VERSION' => $this->app->version() ?? false,
+            'BACKPACK_CRUD_VERSION' => \Composer\InstalledVersions::getVersion('backpack/crud') ?? false,
+            'BACKPACK_PRO_VERSION' => backpack_pro(),
+            'BACKPACK_LICENSE' => config('backpack.base.license_code') ?? false,
+            'BACKPACK_TOKEN_USERNAME' => config('backpack.base.token_username') ?? false,
+            'BACKPACK_URL' => backpack_url('') ?? false,
         ];
 
         // send this info to the main website to store it in the db
@@ -118,10 +118,10 @@ private function makeGuzzleRequest($method, $url, $payload)
         try {
             $client = new \GuzzleHttp\Client();
             $res = $client->request($method, $url, [
-                'form_params'         => $payload,
-                'http_errors'         => false,
-                'connect_timeout'     => 0.5,
-                'timeout'             => 0.5,
+                'form_params' => $payload,
+                'http_errors' => false,
+                'connect_timeout' => 0.5,
+                'timeout' => 0.5,
             ]);
         } catch (\GuzzleHttp\Exception\GuzzleException $e) {
             // do nothing

src/Stats.php

@@ -3,7 +3,9 @@
 namespace Backpack\CRUD;
 
 use Backpack\Basset\Facades\Basset;
+use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\View\Compilers\BladeCompiler;
 
 class ThemeServiceProvider extends ServiceProvider
 {
@@ -12,6 +14,7 @@ class ThemeServiceProvider extends ServiceProvider
     protected string $packageName = 'theme-name';
     protected array $commands = [];
     protected bool $theme = true;
+    protected null|string $componentsNamespace = null;
 
     /**
      * -------------------------
@@ -57,6 +60,8 @@ public function autoboot(): void
             $this->loadRoutesFrom($this->packageRoutesFile());
         }
 
+        $this->registerPackageBladeComponents();
+
         // Publishing is only necessary when using the CLI.
         if (app()->runningInConsole()) {
             $this->bootForConsole();
@@ -256,4 +261,13 @@ public function packageIsActiveTheme()
         return config('backpack.ui.view_namespace') === $viewNamespace ||
             config('backpack.ui.view_namespace_fallback') === $viewNamespace;
     }
+
+    public function registerPackageBladeComponents()
+    {
+        if ($this->componentsNamespace) {
+            $this->app->afterResolving(BladeCompiler::class, function () {
+                Blade::componentNamespace($this->componentsNamespace, $this->packageName);
+            });
+        }
+    }
 }