Reduce complexity, remove Mockery, update test

Author: Pete Bishop

composer.json

@@ -40,7 +40,6 @@
     },
     "require-dev": {
         "laravel/pint": "^1.0",
-        "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^7.9",
         "nunomaduro/larastan": "^2.0.1",
         "orchestra/testbench": "^8.18",

src/Traits/HasPreAndPostProcessing.php

@@ -2,7 +2,6 @@
 
 namespace Native\Electron\Traits;
 
-use Illuminate\Contracts\Process\ProcessResult;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Process;
 
@@ -15,72 +14,49 @@ trait HasPreAndPostProcessing
 {
     public function preProcess(): void
     {
-        $config = $this->getPrePostBuildConfig('prebuild');
+        $config = collect(config('nativephp.prebuild'));
 
-        if (! $config instanceof Collection) {
+        if ($config->isEmpty()) {
             return;
         }
 
         intro('Running pre-process commands...');
 
-        $config->each($this->getProcessCallback());
+        $this->runProcess($config);
 
         outro('Pre-process commands completed.');
     }
 
     public function postProcess(): void
     {
-        $config = $this->getPrePostBuildConfig('postbuild');
+        $config = collect(config('nativephp.postbuild'));
 
-        if (! $config instanceof Collection) {
+        if ($config->isEmpty()) {
             return;
         }
 
         intro('Running post-process commands...');
 
-        $config->each($this->getProcessCallback());
+        $this->runProcess($config);
 
         outro('Post-process commands completed.');
     }
 
-    private function formatConfigKey(string $configKey): string
+    private function runProcess(Collection $configCommands): void
     {
-        return sprintf('nativephp.%s', $configKey);
-    }
-
-    private function executeCommand(mixed $command): ProcessResult
-    {
-        return Process::path(base_path())
-            ->timeout(300)
-            ->tty(\Symfony\Component\Process\Process::isTtySupported())
-            ->run($command, function (string $type, string $output) {
-                echo $output;
-            });
-    }
-
-    protected function getPrePostBuildConfig(string $configKey): mixed
-    {
-        $config = config($this->formatConfigKey($configKey));
-
-        if (is_array($config)) {
-            // Filter out empty values
-            return collect($config)
-                ->filter(fn ($value) => ! empty($value));
-        }
-
-        return $config;
-    }
-
-    private function getProcessCallback(): callable
-    {
-        return function ($command) {
+        $configCommands->each(function ($command) {
             note("Running command: {$command}");
 
             if (is_array($command)) {
                 $command = implode(' && ', $command);
             }
 
-            $result = $this->executeCommand($command);
+            $result = Process::path(base_path())
+                ->timeout(300)
+                ->tty(\Symfony\Component\Process\Process::isTtySupported())
+                ->run($command, function (string $type, string $output) {
+                    echo $output;
+                });
 
             if (! $result->successful()) {
                 error("Command failed: {$command}");
@@ -89,6 +65,6 @@ private function getProcessCallback(): callable
             }
 
             note("Command successful: {$command}");
-        };
+        });
     }
 }

tests/Mocks/HasPreAndPostProcessingMock.php

@@ -3,9 +3,9 @@
 namespace Native\Electron\Tests\Unit\Traits;
 
 use Illuminate\Support\Facades\Config;
-use Native\Electron\Tests\Mocks\HasPreAndPostProcessingMock;
+use Native\Electron\Traits\HasPreAndPostProcessing;
 
-it('can run pre and post processing from config', function () {
+it('can run pre and post processing from config', function (object $mock) {
     $tmpDir = sys_get_temp_dir();
 
     Config::set('nativephp.prebuild', [
@@ -18,18 +18,6 @@
         'touch '.$tmpDir.'/postbuild2',
     ]);
 
-    $mock = \Mockery::mock(HasPreAndPostProcessingMock::class)
-        ->makePartial();
-
-    $mock->shouldAllowMockingProtectedMethods();
-    $mock->shouldReceive('getPrePostBuildConfig')
-        ->with('prebuild')
-        ->andReturn(collect(Config::get('nativephp.prebuild')));
-
-    $mock->shouldReceive('getPrePostBuildConfig')
-        ->with('postbuild')
-        ->andReturn(collect(Config::get('nativephp.postbuild')));
-
     // Verify those files were created in preProcess
     $mock->preProcess();
 
@@ -46,4 +34,10 @@
     unlink($tmpDir.'/prebuild2');
     unlink($tmpDir.'/postbuild1');
     unlink($tmpDir.'/postbuild2');
-});
+})
+    ->with([
+        // Empty class with the HasPreAndPostProcessing trait
+        new class {
+            use HasPreAndPostProcessing;
+        }
+    ]);