Merge pull request #48 from botman/composer-install

Fix process parameters.

Author: crynobone

src/Composer.php

@@ -2,6 +2,7 @@
 
 namespace BotMan\Studio;
 
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Composer as BaseComposer;
 
 class Composer extends BaseComposer
@@ -14,12 +15,30 @@ class Composer extends BaseComposer
      */
     public function install($package, callable $callback)
     {
-        $process = $this->getProcess();
-
-        $process->setCommandLine(trim($this->findComposer().' require '.$package));
+        $process = $this->installationCommandProcess($package);
 
         $process->run($callback);
 
         return $process->isSuccessful();
     }
+
+    /**
+     * Get installation command for process.
+     *
+     * @param  string $package
+     * @return \Symfony\Component\Process\Process
+     */
+    protected function installationCommandProcess($package)
+    {
+        if (version_compare(Application::VERSION, '5.8.0', '<')) {
+            $process = $this->getProcess();
+
+            return $process->setCommandLine(trim($this->findComposer().' require '.$package));
+        }
+
+        $command = $this->findComposer();
+        array_push($command, 'require', $package);
+
+        return $this->getProcess($command);
+    }
 }

tests/ComposerTest.php

@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\Foundation\Application;
+use Mockery as m;
+use PHPUnit\Framework\TestCase;
+
+class ComposerTest extends TestCase
+{
+    protected function tearDown(): void
+    {
+        m::close();
+    }
+
+    /** @test */
+    public function it_install_package()
+    {
+        $composer = $this->getMockedComposer();
+
+        $composer->install('foo/bar', function () {
+            $this->assertTrue(true);
+        });
+    }
+
+    protected function getMockedComposer()
+    {
+        $composer = m::mock('BotMan\Studio\Composer[getProcess]', [new Filesystem(), __DIR__])
+            ->shouldAllowMockingProtectedMethods();
+        $process = m::mock('Symfony\Component\Process\Process');
+
+        if (version_compare(Application::VERSION, '5.8.0', '<')) {
+            $process->shouldReceive('setCommandLine')->with('composer require foo/bar')->andReturnSelf();
+            $composer->shouldReceive('getProcess')->once()->andReturn($process);
+        } else {
+            $composer->shouldReceive('getProcess')->once()->with(['composer', 'require', 'foo/bar'])->andReturn($process);
+        }
+
+        $process->shouldReceive('run')->once()->with(m::type('Closure'))->andReturnUsing(function ($callable) {
+            $callable();
+
+            return 0;
+        })->shouldReceive('isSuccessful')->once()->andReturnTrue();
+
+        return $composer;
+    }
+}