Refactor Orchestra\Canvas\Canvas (#42)

* wip

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

* wip

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

* wip

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

* wip

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

---------

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

.github/workflows/audits.yaml

@@ -2,6 +2,7 @@ name: audits
 
 on:
   push:
+  pull_request:
   workflow_dispatch:
 
 jobs:

src/Canvas.php

@@ -3,6 +3,7 @@
 namespace Orchestra\Canvas;
 
 use Illuminate\Support\Arr;
+use InvalidArgumentException;
 
 class Canvas
 {
@@ -16,25 +17,15 @@ public static function preset(array $config, string $basePath): Presets\Preset
         /** @var array<string, mixed> $configuration */
         $configuration = Arr::except($config, 'preset');
 
-        $preset = $config['preset'];
+        /** @var string|class-string<\Orchestra\Canvas\Presets\Preset> $preset */
+        $preset = $config['preset'] ?? 'laravel';
 
-        $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 match ($preset) {
-            'package' => new Presets\Package($configuration, $basePath),
-            'laravel' => new Presets\Laravel($configuration, $basePath),
-            default => $resolveDefaultPreset($configuration, $basePath),
+        /** @phpstan-ignore return.type */
+        return match (true) {
+            $preset === 'package' => new Presets\Package($configuration, $basePath),
+            $preset === 'laravel' => new Presets\Laravel($configuration, $basePath),
+            class_exists($preset) => new $preset($configuration, $basePath),
+            default => throw new InvalidArgumentException(\sprintf('Unable to resolve %s preset', $preset)),
         };
     }
 }

tests/Unit/CanvasTest.php

@@ -56,4 +56,27 @@ public function it_can_setup_package_preset()
             ],
         ], $preset->config());
     }
+
+    #[Test]
+    public function it_can_setup_class_preset()
+    {
+        $files = new Filesystem;
+        $preset = Canvas::preset([
+            'preset' => Fixtures\CustomPackage::class,
+            'namespace' => 'Orchestra\Foundation',
+            'paths' => [
+                'src' => 'src',
+                'resources' => 'resources',
+            ],
+        ], __DIR__, $files);
+
+        $this->assertInstanceOf(Package::class, $preset);
+        $this->assertSame([
+            'namespace' => 'Orchestra\Foundation',
+            'paths' => [
+                'src' => 'src',
+                'resources' => 'resources',
+            ],
+        ], $preset->config());
+    }
 }

tests/Unit/Fixtures/CustomPackage.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Orchestra\Canvas\Tests\Unit\Fixtures;
+
+use Orchestra\Canvas\Presets\Package;
+
+class CustomPackage extends Package
+{
+    //
+}