fix: use full path to executable instead of working directory

carlalexander · carlalexander · commit 280f5d602af1 · 2020-12-12T16:57:42.000-05:00
diff --git a/src/Build/EnsurePluginIsInstalledStep.php b/src/Build/EnsurePluginIsInstalledStep.php
@@ -47,7 +47,7 @@ public function getDescription(): string
      */
     public function perform(string $environment, ProjectConfiguration $projectConfiguration)
     {
-        if (!WpCli::isYmirPluginInstalled($this->binDirectory, 'wp')) {
+        if (!WpCli::isYmirPluginInstalled($this->binDirectory.'/wp')) {
             throw new RuntimeException('Ymir plugin not found');
         }
     }
diff --git a/src/WpCli.php b/src/WpCli.php
@@ -30,19 +30,19 @@ public static function isInstalledGlobally(): bool
     /**
      * Checks if the Ymir plugin is installed.
      */
-    public static function isYmirPluginInstalled(string $cwd = null, string $executable = ''): bool
+    public static function isYmirPluginInstalled(string $executable = ''): bool
     {
-        return self::listPlugins($cwd, $executable)->contains(function (array $plugin) {
+        return self::listPlugins($executable)->contains(function (array $plugin) {
             return !empty($plugin['file']) && 1 === preg_match('/\/ymir\.php$/', $plugin['file']);
         });
     }
 
     /**
      * List all the installed plugins.
      */
-    public static function listPlugins(string $cwd = null, string $executable = ''): Enumerable
+    public static function listPlugins(string $executable = ''): Enumerable
     {
-        $process = Process::fromShellCommandline(sprintf('%s plugin list --fields=name,status,version,file --format=json', self::getExecutable($executable)), $cwd);
+        $process = Process::fromShellCommandline(sprintf('%s plugin list --fields=name,status,version,file --format=json', self::getExecutable($executable)));
         $process->run();
 
         if (!$process->isSuccessful()) {

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function getDescription(): string`
`47`	`47`	`*/`
`48`	`48`	`public function perform(string $environment, ProjectConfiguration $projectConfiguration)`
`49`	`49`	`{`
`50`		`- if (!WpCli::isYmirPluginInstalled($this->binDirectory, 'wp')) {`
	`50`	`+ if (!WpCli::isYmirPluginInstalled($this->binDirectory.'/wp')) {`
`51`	`51`	`throw new RuntimeException('Ymir plugin not found');`
`52`	`52`	`}`
`53`	`53`	`}`