Merge 178f45b into a534d69

.github/workflows/tests.yaml

@@ -11,6 +11,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     strategy:
+      fail-fast: false
       matrix:
         os:
           - "ubuntu-latest"

README.md

@@ -88,7 +88,7 @@ Which will output the following as `canvas.yaml`:
 preset: package
 
 namespace: PackageName
-user-auth-provider: App\User
+user-auth-model: App\User
 
 paths:
   src: src

composer.json

@@ -31,15 +31,12 @@
         "php": "^8.1",
         "composer-runtime-api": "^2.2",
         "composer/semver": "^3.0",
-        "illuminate/console": "^10.25.1",
-        "illuminate/database": "^10.25.1",
-        "illuminate/support": "^10.25.1",
-        "orchestra/canvas-core": "^8.8",
-        "orchestra/testbench-core": "^8.11",
+        "laravel/framework": "dev-generator-presets as 10.x-dev",
+        "orchestra/canvas-core": "dev-generator-presets as 8.x-dev",
+        "orchestra/testbench-core": "^8.10.2",
         "symfony/yaml": "^6.2"
     },
     "require-dev": {
-        "laravel/framework": "^10.25.1",
         "laravel/pint": "^1.6",
         "mockery/mockery": "^1.5.1",
         "phpstan/phpstan": "^1.10.5",
@@ -56,11 +53,6 @@
     "extra": {
         "branch-alias": {
             "dev-master": "9.0-dev"
-        },
-        "laravel": {
-            "providers": [
-                "Orchestra\\Canvas\\LaravelServiceProvider"
-            ]
         }
     },
     "scripts": {

phpstan-baseline.neon

@@ -9,18 +9,3 @@ parameters:
 			message: "#^Unable to resolve the template type TMakeValue in call to method static method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:make\\(\\)$#"
 			count: 1
 			path: src/Console/Commander.php
-
-		-
-			message: "#^Parameter \\#1 \\$model of method Illuminate\\\\Routing\\\\Console\\\\ControllerMakeCommand\\:\\:parseModel\\(\\) expects string, array\\|bool\\|string\\|null given\\.$#"
-			count: 2
-			path: src/Console/ControllerMakeCommand.php
-
-		-
-			message: "#^Parameter \\#2 \\$callback of function transform expects callable\\(array\\|bool\\|string\\|null\\)\\: string, Closure\\(string\\)\\: string given\\.$#"
-			count: 1
-			path: src/Console/PresetMakeCommand.php
-
-		-
-			message: "#^Parameter \\#2 \\$callback of function transform expects callable\\(array\\|bool\\|string\\|null\\)\\: string, Closure\\(string\\)\\: string given\\.$#"
-			count: 2
-			path: src/Console/ViewMakeCommand.php

src/CanvasServiceProvider.php

@@ -2,11 +2,11 @@
 
 namespace Orchestra\Canvas;
 
+use Illuminate\Console\Generators\PresetManager;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Support\Arr;
 use Illuminate\Support\ServiceProvider;
-use Orchestra\Canvas\Core\PresetManager;
 use Symfony\Component\Yaml\Yaml;
 
 class CanvasServiceProvider extends ServiceProvider implements DeferrableProvider
@@ -18,13 +18,15 @@ class CanvasServiceProvider extends ServiceProvider implements DeferrableProvide
      */
     public function register(): void
     {
-        $this->callAfterResolving(PresetManager::class, function ($manager, $app) {
-            $manager->extend('canvas', function ($app) {
-                return new GeneratorPreset($app);
-            });
+        if (class_exists(PresetManager::class)) {
+            $this->callAfterResolving(PresetManager::class, function ($manager, $app) {
+                $manager->extend('canvas', function ($app) {
+                    return new GeneratorPreset($app);
+                });
 
-            $manager->setDefaultDriver('canvas');
-        });
+                $manager->setDefaultDriver('canvas');
+            });
+        }
 
         $this->app->singleton('orchestra.canvas', function (Application $app) {
             $workingPath = \defined('CANVAS_WORKING_PATH') ? CANVAS_WORKING_PATH : $this->app->basePath();
@@ -56,8 +58,10 @@ public function boot(): void
         if ($this->app->runningInConsole()) {
             $this->commands([
                 Console\CodeMakeCommand::class,
+                Console\FactoryMakeCommand::class,
                 Console\GeneratorMakeCommand::class,
-                Console\PresetMakeCommand::class,
+                Console\TestMakeCommand::class,
+                Console\ViewMakeCommand::class,
             ]);
         }
     }
@@ -69,8 +73,6 @@ public function boot(): void
      */
     public function provides()
     {
-        return [
-            'orchestra.canvas',
-        ];
+        return ['orchestra.canvas'];
     }
 }

src/Console/BatchesTableCommand.php

@@ -15,6 +15,13 @@ class BatchesTableCommand extends \Illuminate\Queue\Console\BatchesTableCommand
 {
     use MigrationGenerator;
 
+    /**
+     * The type of class being generated.
+     *
+     * @var string
+     */
+    protected $type = 'Migration';
+
     /**
      * Create a new notifications table command instance.
      *

src/Console/CodeMakeCommand.php

@@ -2,8 +2,8 @@
 
 namespace Orchestra\Canvas\Console;
 
-use Orchestra\Canvas\Core\Commands\GeneratorCommand;
-use Orchestra\Canvas\Core\Concerns\ResolvesPresetStubs;
+use Illuminate\Console\GeneratorCommand;
+use Illuminate\Console\Generators\Concerns\ResolvesPresetStubs;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputOption;
 

src/Console/Commander.php

@@ -2,13 +2,13 @@
 
 namespace Orchestra\Canvas\Console;
 
-use Illuminate\Console\GeneratorCommand;
-use Illuminate\Contracts\Console\Kernel as ConsoleKernel;
-use Illuminate\Foundation\Application as LaravelApplication;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use Illuminate\Support\Collection;
+use Illuminate\Console\GeneratorCommand;
 use Orchestra\Canvas\CanvasServiceProvider;
 use Orchestra\Canvas\LaravelServiceProvider;
+use Illuminate\Contracts\Console\Kernel as ConsoleKernel;
+use Illuminate\Foundation\Application as LaravelApplication;
 use Symfony\Component\Console\Command\Command as SymfonyCommand;
 
 class Commander extends \Orchestra\Testbench\Console\Commander
@@ -42,10 +42,10 @@ public function laravel()
         if (! $this->app instanceof LaravelApplication) {
             $app = parent::laravel();
 
-            $kernel = $app->make(ConsoleKernel::class);
-
             $app->register(LaravelServiceProvider::class);
 
+            $kernel = $app->make(ConsoleKernel::class);
+
             Collection::make($kernel->all())
                 ->reject(function (SymfonyCommand $command, string $name) {
                     return Str::startsWith('make:', $name) || $command instanceof GeneratorCommand;