Split console methods

TavoNiievez · TavoNiievez · commit 430608ac20cf · 2021-09-07T17:25:11.000-05:00
diff --git a/src/Codeception/Module/Laravel.php b/src/Codeception/Module/Laravel.php
@@ -13,11 +13,11 @@
 use Codeception\Lib\Interfaces\PartedModule;
 use Codeception\Lib\ModuleContainer;
 use Codeception\Module\Laravel\InteractsWithAuthentication;
+use Codeception\Module\Laravel\InteractsWithConsole;
 use Codeception\Subscriber\ErrorHandler;
 use Codeception\TestInterface;
 use Codeception\Util\ReflectionHelper;
 use Exception;
-use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Contracts\Routing\UrlGenerator;
 use Illuminate\Contracts\Session\Session;
 use Illuminate\Contracts\View\Factory as ViewContract;
@@ -35,7 +35,6 @@
 use ReflectionClass;
 use ReflectionException;
 use RuntimeException;
-use Symfony\Component\Console\Output\OutputInterface;
 use function is_array;
 
 /**
@@ -131,6 +130,7 @@
 class Laravel extends Framework implements ActiveRecord, PartedModule
 {
     use InteractsWithAuthentication;
+    use InteractsWithConsole;
 
     /**
      * @var Application
@@ -426,34 +426,6 @@ public function dontSeeEventTriggered($expected): void
         }
     }
 
-    /**
-     * Call an Artisan command.
-     *
-     * ``` php
-     * <?php
-     * $I->callArtisan('command:name');
-     * $I->callArtisan('command:name', ['parameter' => 'value']);
-     * ```
-     * Use 3rd parameter to pass in custom `OutputInterface`
-     *
-     * @param string $command
-     * @param array $parameters
-     * @param OutputInterface|null $output
-     * @return string|void
-     */
-    public function callArtisan(string $command, $parameters = [], OutputInterface $output = null)
-    {
-        $console = $this->app->make(Kernel::class);
-        if (!$output) {
-            $console->call($command, $parameters);
-            $output = trim($console->output());
-            $this->debug($output);
-            return $output;
-        }
-
-        $console->call($command, $parameters, $output);
-    }
-
     /**
      * Opens web page using route name and parameters.
      *
diff --git a/src/Codeception/Module/Laravel/InteractsWithConsole.php b/src/Codeception/Module/Laravel/InteractsWithConsole.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Codeception\Module\Laravel;
+
+use Illuminate\Contracts\Console\Kernel;
+use Symfony\Component\Console\Output\OutputInterface;
+
+trait InteractsWithConsole
+{
+    /**
+     * Call an Artisan command.
+     *
+     * ``` php
+     * <?php
+     * $I->callArtisan('command:name');
+     * $I->callArtisan('command:name', ['parameter' => 'value']);
+     * ```
+     * Use 3rd parameter to pass in custom `OutputInterface`
+     *
+     * @param string $command
+     * @param array $parameters
+     * @param OutputInterface|null $output
+     * @return string|void
+     */
+    public function callArtisan(string $command, $parameters = [], OutputInterface $output = null)
+    {
+        $console = $this->app->make(Kernel::class);
+        if (!$output) {
+            $console->call($command, $parameters);
+            $output = trim($console->output());
+            $this->debug($output);
+            return $output;
+        }
+
+        $console->call($command, $parameters, $output);
+    }
+}
