wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Aug 19, 2023 · dcb7e6a · dcb7e6a
1 parent 0e4d1bd
commit dcb7e6a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/phpunit.xml b/phpunit.xml
@@ -21,5 +21,6 @@
     </testsuites>
     <php>
         <ini name="memory_limit" value="256M"/>
+        <env name="CANVAS_FOR_LARAVEL" value="(true)"/>
     </php>
 </phpunit>
diff --git a/src/LaravelServiceProvider.php b/src/LaravelServiceProvider.php
@@ -7,6 +7,7 @@
 use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Env;
 use Illuminate\Support\ServiceProvider;
 use Orchestra\Canvas\Core\Presets\Preset;
 use Orchestra\Workbench\Workbench;
@@ -66,7 +67,7 @@ public function boot()
 
                 if (
                     \defined('TESTBENCH_WORKING_PATH')
-                    || $app->runningUnitTests()
+                    || Env::get('CANVAS_FOR_LARAVEL') === true
                     || file_exists($app->basePath('canvas.yaml'))
                 ) {
                     $artisan->add(new Commands\Channel($preset));
@@ -105,17 +106,16 @@ public function boot()
      */
     protected function registerCanvasForWorkbench(Filesystem $filesystem): Preset
     {
+        $config = ['preset' => Presets\PackageWorkbench::class, 'generators' => null];
+
+        if ($filesystem->exists(Workbench::packagePath('canvas.yaml'))) {
+            $yaml = Yaml::parseFile(Workbench::packagePath('canvas.yaml'));
+
+            $config['generators'] = $yaml['generators'] ?? [];
+        }
+
         return Canvas::preset(
-            [
-                'preset' => Presets\PackageWorkbench::class,
-                'testing' => [
-                    'extends' => ['unit' => 'PHPUnit\Framework\TestCase',
-                        'feature' => 'Orchestra\Testbench\TestCase',
-                    ],
-                ],
-            ],
-            rtrim(Workbench::packagePath(), DIRECTORY_SEPARATOR),
-            $filesystem
+            $config, rtrim(Workbench::packagePath(), DIRECTORY_SEPARATOR), $filesystem
         );
     }