Merge branch '9.x' into 10.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Jul 30, 2024 · f5795b4 · f5795b4
2 parents 900576a + c905450
commit f5795b4
Show file tree

Hide file tree

Showing 68 changed files with 1,055 additions and 459 deletions.
diff --git a/.github/workflows/analyse.yaml b/.github/workflows/analyse.yaml
@@ -34,7 +34,7 @@ jobs:
           coverage: none
 
       - name: Install dependencies
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "${{ matrix.dependencies }}"
           composer-options: "--prefer-dist --no-cache"
@@ -70,7 +70,7 @@ jobs:
           coverage: none
 
       - name: Install dependencies
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "${{ matrix.dependencies }}"
           composer-options: "--prefer-dist --no-cache"

diff --git a/.github/workflows/audits.yaml b/.github/workflows/audits.yaml
@@ -32,7 +32,7 @@ jobs:
           coverage: none
 
       - name: Install dependencies
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "highest"
           composer-options: "--prefer-dist --prefer-stable --no-cache"

diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
@@ -33,7 +33,7 @@ jobs:
           coverage: xdebug
 
       - name: Install dependencies
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "${{ matrix.dependencies }}"
           composer-options: "--prefer-dist --no-cache"

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -39,7 +39,7 @@ jobs:
           coverage: none
 
       - name: Install dependencies
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "${{ matrix.dependencies }}"
           composer-options: "--prefer-dist --no-cache"

diff --git a/.github/workflows/update-stubs.yaml b/.github/workflows/update-stubs.yaml
@@ -14,6 +14,13 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, mysql, mysqli, pdo_mysql, bcmath, intl, fileinfo, :php-psr
+          coverage: none
+
       - name: Install Dependencies
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress
 

diff --git a/bin/sync b/bin/sync
@@ -79,12 +79,14 @@ $files->copy("{$workingPath}/skeleton/database/factories/UserFactory.php", "{$wo
 transform([
     'namespace Database\Factories;' => 'namespace {{ factoryNamespace }};',
     'use Illuminate\Support\Str;'.PHP_EOL => 'use Illuminate\Support\Str;'.PHP_EOL.'use {{ namespacedModel }};'.PHP_EOL,
-    '\Illuminate\Database\Eloquent\Factories\Factory<\App\Models\User>' => '\Illuminate\Database\Eloquent\Factories\Factory<\{{ namespacedModel }}>',
+    ' * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\User>' => ' * @template TModel of \{{ namespacedModel }}
+ *
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<TModel>',
     '    /**
      * Define the model\'s default state.' => '    /**
      * The name of the factory\'s corresponding model.
      *
-     * @var string
+     * @var class-string<TModel>
      */
     protected $model = {{ model }}::class;
 

diff --git a/composer.json b/composer.json
@@ -42,10 +42,10 @@
     },
     "require-dev": {
         "laravel/framework": "^12.0",
-        "laravel/pint": "^1.6",
+        "laravel/pint": "^1.17",
         "mockery/mockery": "^1.6",
-        "phpstan/phpstan": "^1.10.6",
-        "phpunit/phpunit": "^10.5"
+        "phpstan/phpstan": "^1.11",
+        "phpunit/phpunit": "^11.0"
     },
     "config": {
         "preferred-install": {
@@ -73,7 +73,7 @@
         "prepare": "@php vendor/bin/testbench package:discover --ansi",
         "lint": [
             "@php vendor/bin/pint",
-            "@php vendor/bin/phpstan analyse"
+            "@php vendor/bin/phpstan analyse --verbose"
         ],
         "test": "@php vendor/bin/phpunit -c ./ --color",
         "ci": [

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,16 +1,2 @@
 parameters:
-	ignoreErrors:
-		-
-			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
+	ignoreErrors: []
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -6,17 +6,10 @@ parameters:
   paths:
     - src
 
-  excludePaths:
-    - ./src/Commands/*.php
-    - ./src/Commands/Database/*.php
-    - ./src/Commands/Routing/*.php
-
   # The level 8 is the highest level
-  level: 7
+  level: 8
 
   ignoreErrors:
-    - '#Method [a-zA-Z\\\<\>]+::handle\(\) should return bool\|null but returns int.#'
+    - identifier: missingType.iterableValue
 
-  checkGenericClassInNonGenericObjectType: false
-  checkMissingIterableValueType: false
   treatPhpDocTypesAsCertain: false
diff --git a/pint.json b/pint.json
@@ -6,7 +6,6 @@
             "scope": "namespaced",
             "strict": true
         },
-        "no_superfluous_phpdoc_tags": false,
         "php_unit_method_casing": false
     }
 }
diff --git a/src/Canvas.php b/src/Canvas.php
@@ -10,7 +10,6 @@ class Canvas
      * Make Preset from configuration.
      *
      * @param  array<string, mixed>  $config
-     * @return \Orchestra\Canvas\Presets\Preset
      */
     public static function preset(array $config, string $basePath): Presets\Preset
     {
@@ -19,22 +18,23 @@ public static function preset(array $config, string $basePath): Presets\Preset
 
         $preset = $config['preset'];
 
-        switch ($preset) {
-            case 'package':
-                return new Presets\Package($configuration, $basePath);
-            case 'laravel':
-                return new Presets\Laravel($configuration, $basePath);
-            default:
-                if (class_exists($preset)) {
-                    /**
-                     * @var class-string<\Orchestra\Canvas\Presets\Preset> $preset
-                     *
-                     * @return \Orchestra\Canvas\Presets\Preset
-                     */
-                    return new $preset($configuration, $basePath);
-                }
+        $resolveDefaultPreset = function ($configuration, $basePath) use ($preset) {
+            if (class_exists($preset)) {
+                /**
+                 * @var class-string<\Orchestra\Canvas\Presets\Preset> $preset
+                 *
+                 * @return \Orchestra\Canvas\Presets\Preset
+                 */
+                return new $preset($configuration, $basePath);
+            }
 
-                return new Presets\Laravel($configuration, $basePath);
-        }
+            return new Presets\Laravel($configuration, $basePath);
+        };
+
+        return match ($preset) {
+            'package' => new Presets\Package($configuration, $basePath),
+            'laravel' => new Presets\Laravel($configuration, $basePath),
+            default => $resolveDefaultPreset($configuration, $basePath),
+        };
     }
 }
diff --git a/src/CanvasServiceProvider.php b/src/CanvasServiceProvider.php
@@ -15,8 +15,6 @@ class CanvasServiceProvider extends ServiceProvider implements DeferrableProvide
 {
     /**
      * Register services.
-     *
-     * @return void
      */
     public function register(): void
     {
@@ -55,7 +53,6 @@ public function boot(): void
     {
         if ($this->app->runningInConsole()) {
             $this->commands([
-                Console\CodeMakeCommand::class,
                 Console\GeneratorMakeCommand::class,
                 Console\PresetMakeCommand::class,
             ]);

diff --git a/src/Console/BatchesTableCommand.php b/src/Console/BatchesTableCommand.php
@@ -2,14 +2,13 @@
 
 namespace Orchestra\Canvas\Console;
 
-use Illuminate\Filesystem\Filesystem;
 use Orchestra\Canvas\Core\Concerns\MigrationGenerator;
 use Symfony\Component\Console\Attribute\AsCommand;
 
 /**
- * @see https://github.com/laravel/framework/blob/master/src/Illuminate/Queue/Console/BatchesTableCommand.php
+ * @see https://github.com/laravel/framework/blob/11.x/src/Illuminate/Queue/Console/BatchesTableCommand.php
  */
-#[AsCommand(name: 'make:queue-batches-table', description: 'Create a migration for the batches database table')]
+#[AsCommand(name: 'make:queue-batches-table', description: 'Create a migration for the batches database table', aliases: ['queue:batches-table'])]
 class BatchesTableCommand extends \Illuminate\Queue\Console\BatchesTableCommand
 {
     use MigrationGenerator;
@@ -22,14 +21,14 @@ class BatchesTableCommand extends \Illuminate\Queue\Console\BatchesTableCommand
     protected $name = 'make:queue-batches-table';
 
     /**
-     * Create a new notifications table command instance.
+     * Configures the current command.
      *
-     * @param  \Illuminate\Filesystem\Filesystem  $files
      * @return void
      */
-    public function __construct(Filesystem $files)
+    #[\Override]
+    protected function configure()
     {
-        parent::__construct($files);
+        parent::configure();
 
         $this->addGeneratorPresetOptions();
     }

diff --git a/src/Console/CacheTableCommand.php b/src/Console/CacheTableCommand.php
@@ -2,27 +2,26 @@
 
 namespace Orchestra\Canvas\Console;
 
-use Illuminate\Filesystem\Filesystem;
 use Orchestra\Canvas\Core\Concerns\MigrationGenerator;
 use Symfony\Component\Console\Attribute\AsCommand;
 
 /**
- * @see https://github.com/laravel/framework/blob/master/src/Illuminate/Cache/Console/CacheTableCommand.php
+ * @see https://github.com/laravel/framework/blob/11.x/src/Illuminate/Cache/Console/CacheTableCommand.php
  */
-#[AsCommand(name: 'make:cache-table', description: 'Create a migration for the cache database table')]
+#[AsCommand(name: 'make:cache-table', description: 'Create a migration for the cache database table', aliases: ['cache:table'])]
 class CacheTableCommand extends \Illuminate\Cache\Console\CacheTableCommand
 {
     use MigrationGenerator;
 
     /**
-     * Create a new session table command instance.
+     * Configures the current command.
      *
-     * @param  \Illuminate\Filesystem\Filesystem  $files
      * @return void
      */
-    public function __construct(Filesystem $files)
+    #[\Override]
+    protected function configure()
     {
-        parent::__construct($files);
+        parent::configure();
 
         $this->addGeneratorPresetOptions();
     }

diff --git a/src/Console/CastMakeCommand.php b/src/Console/CastMakeCommand.php
@@ -2,13 +2,12 @@
 
 namespace Orchestra\Canvas\Console;
 
-use Illuminate\Filesystem\Filesystem;
 use Orchestra\Canvas\Core\Concerns\CodeGenerator;
 use Orchestra\Canvas\Core\Concerns\UsesGeneratorOverrides;
 use Symfony\Component\Console\Attribute\AsCommand;
 
 /**
- * @see https://github.com/laravel/framework/blob/master/src/Illuminate/Foundation/Console/CastMakeCommand.php
+ * @see https://github.com/laravel/framework/blob/11.x/src/Illuminate/Foundation/Console/CastMakeCommand.php
  */
 #[AsCommand(name: 'make:cast', description: 'Create a new custom Eloquent cast class')]
 class CastMakeCommand extends \Illuminate\Foundation\Console\CastMakeCommand
@@ -17,13 +16,14 @@ class CastMakeCommand extends \Illuminate\Foundation\Console\CastMakeCommand
     use UsesGeneratorOverrides;
 
     /**
-     * Create a new creator command instance.
+     * Configures the current command.
      *
      * @return void
      */
-    public function __construct(Filesystem $files)
+    #[\Override]
+    protected function configure()
     {
-        parent::__construct($files);
+        parent::configure();
 
         $this->addGeneratorPresetOptions();
     }
@@ -38,6 +38,7 @@ public function __construct(Filesystem $files)
     #[\Override]
     public function handle()
     {
+        /** @phpstan-ignore return.type */
         return $this->generateCode() ? self::SUCCESS : self::FAILURE;
     }
 

diff --git a/src/Console/ChannelMakeCommand.php b/src/Console/ChannelMakeCommand.php
@@ -2,14 +2,13 @@
 
 namespace Orchestra\Canvas\Console;
 
-use Illuminate\Filesystem\Filesystem;
 use Orchestra\Canvas\Core\Concerns\CodeGenerator;
 use Orchestra\Canvas\Core\Concerns\TestGenerator;
 use Orchestra\Canvas\Core\Concerns\UsesGeneratorOverrides;
 use Symfony\Component\Console\Attribute\AsCommand;
 
 /**
- * @see https://github.com/laravel/framework/blob/master/src/Illuminate/Foundation/Console/ChannelMakeCommand.php
+ * @see https://github.com/laravel/framework/blob/11.x/src/Illuminate/Foundation/Console/ChannelMakeCommand.php
  */
 #[AsCommand(name: 'make:channel', description: 'Create a new channel class')]
 class ChannelMakeCommand extends \Illuminate\Foundation\Console\ChannelMakeCommand
@@ -19,13 +18,14 @@ class ChannelMakeCommand extends \Illuminate\Foundation\Console\ChannelMakeComma
     use UsesGeneratorOverrides;
 
     /**
-     * Create a new creator command instance.
+     * Configures the current command.
      *
      * @return void
      */
-    public function __construct(Filesystem $files)
+    #[\Override]
+    protected function configure()
     {
-        parent::__construct($files);
+        parent::configure();
 
         $this->addGeneratorPresetOptions();
     }
@@ -40,6 +40,7 @@ public function __construct(Filesystem $files)
     #[\Override]
     public function handle()
     {
+        /** @phpstan-ignore return.type */
         return $this->generateCode() ? self::SUCCESS : self::FAILURE;
     }