Merge branch '8.x'

Signed-off-by: Mior Muhammad Zaki <[email protected]>

.gitattributes

@@ -3,13 +3,14 @@
 # Ignore following folder/file.
 /.github export-ignore
 /tests export-ignore
+/workbench export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /phpstan-baseline.neon export-ignore
 /phpstan.neon.dist export-ignore
 /phpunit.xml export-ignore
 /pint.json export-ignore
-/sync.sh export-ignore
+/testbench.yaml export-ignore
 /CHANGELOG-*.md export-ignore
 /CODE_OF_CONDUCT.md export-ignore
 /CONTRIBUTING.md export-ignore

composer.json

@@ -34,6 +34,9 @@
         "illuminate/filesystem": "^11.0"
     },
     "require-dev": {
+        "fakerphp/faker": "^1.21",
+        "mockery/mockery": "^1.5.1",
+        "laravel/framework": "^10.17",
         "laravel/pint": "^1.6",
         "orchestra/testbench": "^9.0",
         "phpstan/phpstan": "^1.10.6"

phpstan-baseline.neon

@@ -1,11 +1,11 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Call to an undefined method Illuminate\\\\Contracts\\\\Container\\\\Container\\:\\:basePath\\(\\)\\.$#"
+			message: "#^Cannot access offset 'path' on Illuminate\\\\Contracts\\\\Foundation\\\\Application\\.$#"
 			count: 1
-			path: src/LaravelServiceProvider.php
+			path: src/Commands/GeneratorCommand.php
 
 		-
-			message: "#^Method Orchestra\\\\Canvas\\\\Core\\\\Presets\\\\Preset\\:\\:config\\(\\) has no return type specified\\.$#"
+			message: "#^Parameter \\#1 \\$app of class Orchestra\\\\Canvas\\\\Core\\\\Presets\\\\Laravel constructor expects Illuminate\\\\Contracts\\\\Foundation\\\\Application, Illuminate\\\\Contracts\\\\Container\\\\Container given\\.$#"
 			count: 1
-			path: src/Presets/Preset.php
+			path: src/PresetManager.php

phpstan.neon.dist

@@ -9,6 +9,9 @@ parameters:
   # The level 8 is the highest level
   level: 7
 
+  ignoreErrors:
+    - '#Method [a-zA-Z\\\<\>]+::handle\(\) should return bool\|null but returns int.#'
+
   checkGenericClassInNonGenericObjectType: false
   checkMissingIterableValueType: false
   treatPhpDocTypesAsCertain: false

src/Commands/GeneratorCommand.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace Orchestra\Canvas\Core\Commands;
+
+use Illuminate\Filesystem\Filesystem;
+use Orchestra\Canvas\Core\Concerns;
+use Orchestra\Canvas\Core\Contracts\GeneratesCode;
+
+/**
+ * @property string|null  $name
+ * @property string|null  $description
+ */
+abstract class GeneratorCommand extends \Illuminate\Console\GeneratorCommand implements GeneratesCode
+{
+    use Concerns\CodeGenerator;
+    use Concerns\TestGenerator;
+    use Concerns\UsesGeneratorOverrides;
+
+    /**
+     * Create a new controller creator command instance.
+     *
+     * @return void
+     */
+    public function __construct(Filesystem $files)
+    {
+        parent::__construct($files);
+
+        $this->addGeneratorPresetOptions();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return bool|null
+     *
+     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
+     */
+    public function handle()
+    {
+        return $this->generateCode() ? self::SUCCESS : self::FAILURE;
+    }
+
+    /**
+     * Get the destination class path.
+     *
+     * @param  string  $name
+     * @return string
+     */
+    protected function getPath($name)
+    {
+        return $this->getPathUsingCanvas($name);
+    }
+
+    /**
+     * Qualify the given model class base name.
+     *
+     * @return string
+     */
+    protected function qualifyModel(string $model)
+    {
+        return $this->qualifyModelUsingCanvas($model);
+    }
+
+    /**
+     * Get the root namespace for the class.
+     *
+     * @return string
+     */
+    protected function rootNamespace()
+    {
+        return $this->rootNamespaceUsingCanvas();
+    }
+
+    /**
+     * Get the model for the default guard's user provider.
+     */
+    protected function userProviderModel(): ?string
+    {
+        return $this->userProviderModelUsingCanvas();
+    }
+
+    /**
+     * Get the first view directory path from the application configuration.
+     *
+     * @return string
+     */
+    protected function viewPath($path = '')
+    {
+        return $this->viewPathUsingCanvas($path);
+    }
+}