Skip to content
Permalink
Browse files

Merge branch 'release-1.1'

  • Loading branch information...
corpsee committed Sep 4, 2019
2 parents a4f8c44 + b5dfe1b commit 6420830d29ff5bd7ab815946b25613c81fbaf889
Showing with 32 additions and 32 deletions.
  1. +32 −32 src/Helper/CommandExecutor.php
@@ -293,68 +293,68 @@ public function findBinary($binary, $priorityPath = 'local', $binaryPath = '', $
$this->logger->logDebug(sprintf('Looking for binary: %s, priority = %s', $bin, $priorityPath));
if ('binary_path' === $priorityPath) {
if ($binaryPath = $this->findBinaryByPath($binaryPath, $bin)) {
return $binaryPath;
if ($existedBinary = $this->findBinaryByPath($binaryPath, $bin)) {
return $existedBinary;
}
if ($binaryLocal = $this->findBinaryLocal($composerBin, $bin)) {
return $binaryLocal;
if ($existedBinary = $this->findBinaryLocal($composerBin, $bin)) {
return $existedBinary;
}
if ($binaryGlobal = $this->findBinaryGlobal($bin)) {
return $binaryGlobal;
if ($existedBinary = $this->findBinaryGlobal($bin)) {
return $existedBinary;
}
if ($binarySystem = $this->findBinarySystem($bin)) {
return $binarySystem;
if ($existedBinary = $this->findBinarySystem($bin)) {
return $existedBinary;
}
} elseif ('system' === $priorityPath) {
if ($binarySystem = $this->findBinarySystem($bin)) {
return $binarySystem;
if ($existedBinary = $this->findBinarySystem($bin)) {
return $existedBinary;
}
if ($binaryLocal = $this->findBinaryLocal($composerBin, $bin)) {
return $binaryLocal;
if ($existedBinary = $this->findBinaryLocal($composerBin, $bin)) {
return $existedBinary;
}
if ($binaryGlobal = $this->findBinaryGlobal($bin)) {
return $binaryGlobal;
if ($existedBinary = $this->findBinaryGlobal($bin)) {
return $existedBinary;
}
if ($binaryPath = $this->findBinaryByPath($binaryPath, $bin)) {
return $binaryPath;
if ($existedBinary = $this->findBinaryByPath($binaryPath, $bin)) {
return $existedBinary;
}
} elseif ('global' === $priorityPath) {
if ($binaryGlobal = $this->findBinaryGlobal($bin)) {
return $binaryGlobal;
if ($existedBinary = $this->findBinaryGlobal($bin)) {
return $existedBinary;
}
if ($binaryLocal = $this->findBinaryLocal($composerBin, $bin)) {
return $binaryLocal;
if ($existedBinary = $this->findBinaryLocal($composerBin, $bin)) {
return $existedBinary;
}
if ($binarySystem = $this->findBinarySystem($bin)) {
return $binarySystem;
if ($existedBinary = $this->findBinarySystem($bin)) {
return $existedBinary;
}
if ($binaryPath = $this->findBinaryByPath($binaryPath, $bin)) {
return $binaryPath;
if ($existedBinary = $this->findBinaryByPath($binaryPath, $bin)) {
return $existedBinary;
}
} else {
if ($binaryLocal = $this->findBinaryLocal($composerBin, $bin)) {
return $binaryLocal;
if ($existedBinary = $this->findBinaryLocal($composerBin, $bin)) {
return $existedBinary;
}
if ($binaryGlobal = $this->findBinaryGlobal($bin)) {
return $binaryGlobal;
if ($existedBinary = $this->findBinaryGlobal($bin)) {
return $existedBinary;
}
if ($binarySystem = $this->findBinarySystem($bin)) {
return $binarySystem;
if ($existedBinary = $this->findBinarySystem($bin)) {
return $existedBinary;
}
if ($binaryPath = $this->findBinaryByPath($binaryPath, $bin)) {
return $binaryPath;
if ($existedBinary = $this->findBinaryByPath($binaryPath, $bin)) {
return $existedBinary;
}
}
}

0 comments on commit 6420830

Please sign in to comment.
You can’t perform that action at this time.