Merge branch '8.x' into 9.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Nov 30, 2024 · 32499b9 · 32499b9
2 parents 08d084d + 76385df
commit 32499b9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -56,9 +56,6 @@
         "sort-packages": true
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "9.0-dev"
-        },
         "laravel": {
             "providers": [
                 "Orchestra\\Canvas\\LaravelServiceProvider"
@@ -78,8 +75,10 @@
         ],
         "test": [
             "@composer dump-autoload",
-            "@php vendor/bin/phpunit --no-coverage --no-configuration --bootstrap vendor/autoload.php --color ./tests ./workbench/tests"
+            "@php vendor/bin/phpunit --no-coverage --no-configuration --bootstrap vendor/autoload.php --color tests",
+            "@php vendor/bin/phpunit --no-coverage --no-configuration --bootstrap vendor/autoload.php --color workbench/tests"
         ],
+        "sync": "@php bin/sync",
         "ci": [
             "@composer audit",
             "@prepare",

diff --git a/src/Console/Commander.php b/src/Console/Commander.php
@@ -5,32 +5,29 @@
 use Illuminate\Contracts\Console\Kernel as ConsoleKernel;
 use Illuminate\Foundation\Application as LaravelApplication;
 use Illuminate\Support\Collection;
+use Orchestra\Canvas\CanvasServiceProvider;
 use Orchestra\Canvas\Core\Concerns\CreatesUsingGeneratorPreset;
 use Orchestra\Canvas\LaravelServiceProvider;
 use Symfony\Component\Console\Command\Command as SymfonyCommand;
 
 class Commander extends \Orchestra\Testbench\Console\Commander
 {
-    /**
-     * The environment file name.
-     */
+    /** {@inheritDoc} */
     protected string $environmentFile = '.env';
 
-    /**
-     * List of providers.
-     *
-     * @var array<int, class-string<\Illuminate\Support\ServiceProvider>>
-     */
-    protected array $providers = [
-        \Orchestra\Canvas\Core\LaravelServiceProvider::class,
-        \Orchestra\Canvas\CanvasServiceProvider::class,
-    ];
-
-    /**
-     * Create Laravel application.
-     *
-     * @return \Illuminate\Foundation\Application
-     */
+    /** {@inheritDoc} */
+    protected array $providers = [];
+
+    /** {@inheritDoc} */
+    #[\Override]
+    protected function resolveApplicationCallback()
+    {
+        return static function ($app) {
+            $app->register(CanvasServiceProvider::class);
+        };
+    }
+
+    /** {@inheritDoc} */
     #[\Override]
     public function laravel()
     {