wip

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
orchestral · Aug 18, 2023 · 516bcce · 516bcce
1 parent 76b7840
commit 516bcce
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -66,11 +66,14 @@
             "@composer run clear",
             "@composer run prepare"
         ],
-        "prepare": "@php testbench package:discover --ansi",
         "clear": "@php testbench package:purge-skeleton --ansi",
+        "prepare": "@php testbench package:discover --ansi",
         "ci": [
             "@composer audit",
             "@composer run prepare",
+            "@composer run lint"
+        ],
+        "lint": [
             "@php vendor/bin/pint",
             "@php vendor/bin/phpstan analyse"
         ],

diff --git a/src/Concerns/WithWorkbench.php b/src/Concerns/WithWorkbench.php
@@ -23,7 +23,7 @@ protected function setUpWithWorkbench(): void
         /** @var \Orchestra\Testbench\Contracts\Config $config */
         $config = static::$cachedConfigurationForWorkbench ?? new Config();
 
-        (new StartWorkbench($config))->bootstrap($app);
+        (new StartWorkbench(config: $config, loadWorkbenchProviders: false))->bootstrap($app);
 
         (new LoadMigrationsFromArray(
             $config['migrations'] ?? [], $config['seeders'] ?? false,

diff --git a/src/Foundation/Bootstrap/StartWorkbench.php b/src/Foundation/Bootstrap/StartWorkbench.php
@@ -11,21 +11,17 @@
  */
 final class StartWorkbench
 {
-    /**
-     * The project configuration.
-     *
-     * @var \Orchestra\Testbench\Contracts\Config
-     */
-    public $config;
-
     /**
      * Construct a new Create Vendor Symlink bootstrapper.
      *
      * @param  \Orchestra\Testbench\Contracts\Config  $config
+     * @param  bool  $loadWorkbenchProviders
      */
-    public function __construct(Config $config)
-    {
-        $this->config = $config;
+    public function __construct(
+        public Config $config,
+        public bool $loadWorkbenchProviders = true
+    ) {
+        //
     }
 
     /**
@@ -38,7 +34,7 @@ public function bootstrap(Application $app): void
     {
         $app->instance(Config::class, $this->config);
 
-        if (class_exists(WorkbenchServiceProvider::class)) {
+        if ($this->loadWorkbenchProviders === true && class_exists(WorkbenchServiceProvider::class)) {
             $app->register(WorkbenchServiceProvider::class);
         }
     }