fix: use bin-dir for correct path to the Composer executables

Author: ramsey

CHANGELOG.md

@@ -21,12 +21,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Security
 
 
+## [1.0.1] - 2020-08-25
+
+### Fixed
+
+* use `bin-dir` for correct path to the Composer executables
+
+
 ## [1.0.0] - 2020-08-25
 
 ### Added
 
 * create a REPL plugin for Composer
 
 
-[Unreleased]: https://github.com/ramsey/composer-repl/compare/1.0.0...HEAD
+[Unreleased]: https://github.com/ramsey/composer-repl/compare/1.0.1...HEAD
+[1.0.1]: https://github.com/ramsey/composer-repl/compare/1.0.0...1.0.1
 [1.0.0]: https://github.com/ramsey/composer-repl/commits/1.0.0

src/Composer/ReplCommand.php

@@ -98,10 +98,17 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $config->setInteractiveMode(Configuration::INTERACTIVE_MODE_DISABLED);
         }
 
+        /** @var Composer $composer */
+        $composer = $this->getComposer(true);
+
         $shell = new Shell($config);
         $shell->setScopeVariables($this->getScopeVariables());
         $shell->add(new PhpunitTestCommand());
-        $shell->add(new PhpunitRunCommand($this->repositoryRoot, $this->processFactory));
+        $shell->add(new PhpunitRunCommand(
+            $this->repositoryRoot,
+            $this->processFactory,
+            $composer,
+        ));
         $shell->add(new 🐘Command());
 
         return $shell->run();

src/Composer/ReplPlugin.php

@@ -25,11 +25,19 @@
 use Composer\Command\BaseCommand;
 use Composer\Composer;
 use Composer\Factory;
+use Composer\IO\ConsoleIO;
 use Composer\IO\IOInterface;
 use Composer\Plugin\Capability\CommandProvider;
 use Composer\Plugin\Capable;
 use Composer\Plugin\PluginInterface;
 use Ramsey\Dev\Repl\Process\ProcessFactory;
+use Symfony\Component\Console\Helper\DescriptorHelper;
+use Symfony\Component\Console\Helper\FormatterHelper;
+use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Helper\ProcessHelper;
+use Symfony\Component\Console\Helper\SymfonyQuestionHelper;
+use Symfony\Component\Console\Input\StringInput;
+use Symfony\Component\Console\Output\ConsoleOutput;
 
 use function realpath;
 
@@ -40,6 +48,7 @@ class ReplPlugin implements Capable, CommandProvider, PluginInterface
 {
     private ProcessFactory $processFactory;
     private string $repoRoot;
+    private Composer $composer;
 
     /**
      * @var mixed[]
@@ -55,13 +64,18 @@ class ReplPlugin implements Capable, CommandProvider, PluginInterface
      *
      * @param mixed[] $args
      */
-    public function __construct(array $args = [], ?ProcessFactory $processFactory = null)
-    {
+    public function __construct(
+        array $args = [],
+        ?Composer $composer = null,
+        ?IOInterface $io = null,
+        ?ProcessFactory $processFactory = null
+    ) {
         $composerFile = (string) Factory::getComposerFile();
 
         $this->capabilityArgs = $args;
         $this->repoRoot = (string) realpath(dirname($composerFile));
         $this->processFactory = $processFactory ?? new ProcessFactory();
+        $this->composer = $composer ?? Factory::create($io ?? $this->buildIO(), $composerFile);
     }
 
     /**
@@ -95,4 +109,19 @@ public function deactivate(Composer $composer, IOInterface $io): void
     public function uninstall(Composer $composer, IOInterface $io): void
     {
     }
+
+    private function buildIO(): ConsoleIO
+    {
+        $input = new StringInput('');
+        $output = new ConsoleOutput();
+
+        $helperSet = new HelperSet([
+            new DescriptorHelper(),
+            new FormatterHelper(),
+            new ProcessHelper(),
+            new SymfonyQuestionHelper(),
+        ]);
+
+        return new ConsoleIO($input, $output, $helperSet);
+    }
 }

src/Psy/PhpunitRunCommand.php

@@ -22,6 +22,7 @@
 
 namespace Ramsey\Dev\Repl\Psy;
 
+use Composer\Composer;
 use Ramsey\Dev\Repl\Process\ProcessFactory;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -40,13 +41,18 @@ class PhpunitRunCommand extends ContextAwareCommand
 {
     private string $repositoryRoot;
     private ProcessFactory $processFactory;
+    private Composer $composer;
 
-    public function __construct(string $repositoryRoot, ProcessFactory $processFactory)
-    {
+    public function __construct(
+        string $repositoryRoot,
+        ProcessFactory $processFactory,
+        Composer $composer
+    ) {
         parent::__construct(null);
 
         $this->repositoryRoot = $repositoryRoot;
         $this->processFactory = $processFactory;
+        $this->composer = $composer;
     }
 
     protected function configure(): void
@@ -132,13 +138,8 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $phpunit = $this->repositoryRoot
-            . DIRECTORY_SEPARATOR
-            . 'vendor'
-            . DIRECTORY_SEPARATOR
-            . 'bin'
-            . DIRECTORY_SEPARATOR
-            . 'phpunit';
+        $binDir = (string) $this->composer->getConfig()->get('bin-dir');
+        $phpunit = $binDir . DIRECTORY_SEPARATOR . 'phpunit';
 
         $process = $this->processFactory->factory(
             array_merge([$phpunit, '--colors=always'], $this->buildArguments($input)),

tests/Psy/PhpunitRunCommandTest.php

@@ -4,6 +4,8 @@
 
 namespace Ramsey\Test\Dev\Repl\Psy;
 
+use Composer\Composer;
+use Composer\Config;
 use Mockery\MockInterface;
 use Psy\Context;
 use Psy\Shell;
@@ -20,6 +22,22 @@
 
 class PhpunitRunCommandTest extends RamseyTestCase
 {
+    /**
+     * @var Composer & MockInterface $composer
+     */
+    private Composer $composer;
+
+    public function setUp(): void
+    {
+        /** @var Config & MockInterface $config */
+        $config = $this->mockery(Config::class);
+        $config->allows()->get('bin-dir')->andReturn('/path/to/vendor/bin');
+
+        $this->composer = $this->mockery(Composer::class, [
+            'getConfig' => $config,
+        ]);
+    }
+
     public function testGetApplication(): void
     {
         /** @var ProcessFactory & MockInterface $processFactory */
@@ -30,7 +48,7 @@ public function testGetApplication(): void
             'getHelperSet' => $this->mockery(HelperSet::class),
         ]);
 
-        $command = new PhpunitRunCommand('/path/to/repo', $processFactory);
+        $command = new PhpunitRunCommand('/path/to/repo', $processFactory, $this->composer);
         $command->setApplication($application);
 
         $this->assertSame($application, $command->getApplication());
@@ -41,7 +59,7 @@ public function testGetApplicationThrowsException(): void
         /** @var ProcessFactory & MockInterface $processFactory */
         $processFactory = $this->mockery(ProcessFactory::class);
 
-        $command = new PhpunitRunCommand('/path/to/repo', $processFactory);
+        $command = new PhpunitRunCommand('/path/to/repo', $processFactory, $this->composer);
 
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Application is not set');
@@ -57,7 +75,7 @@ public function testGetContext(): void
         /** @var Context & MockInterface $context */
         $context = $this->mockery(Context::class);
 
-        $command = new PhpunitRunCommand('/path/to/repo', $processFactory);
+        $command = new PhpunitRunCommand('/path/to/repo', $processFactory, $this->composer);
         $command->setContext($context);
 
         $this->assertSame($context, $command->getContext());
@@ -68,7 +86,7 @@ public function testGetContextThrowsException(): void
         /** @var ProcessFactory & MockInterface $processFactory */
         $processFactory = $this->mockery(ProcessFactory::class);
 
-        $command = new PhpunitRunCommand('/path/to/repo', $processFactory);
+        $command = new PhpunitRunCommand('/path/to/repo', $processFactory, $this->composer);
 
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Context is not set');
@@ -111,7 +129,7 @@ function (callable $callback) use ($expectedExitCode): int {
             ->factory($expectedParams, '/path/to/repo')
             ->andReturn($process);
 
-        $command = new PhpunitRunCommand('/path/to/repo', $processFactory);
+        $command = new PhpunitRunCommand('/path/to/repo', $processFactory, $this->composer);
 
         $this->assertSame($expectedExitCode, $command->run($input, $output));
     }
@@ -121,13 +139,7 @@ function (callable $callback) use ($expectedExitCode): int {
      */
     public function provideCommandInput(): array
     {
-        $phpunit = '/path/to/repo'
-            . DIRECTORY_SEPARATOR
-            . 'vendor'
-            . DIRECTORY_SEPARATOR
-            . 'bin'
-            . DIRECTORY_SEPARATOR
-            . 'phpunit';
+        $phpunit = '/path/to/vendor/bin' . DIRECTORY_SEPARATOR . 'phpunit';
 
         return [
             [