deployphp / deployer

deps/vendor/symfony/polyfill-intl-grapheme/bootstrap80.php

Spacing +9 added lines, -9 removed lines

@@ -22,29 +22,29 @@
 }
 
 if (!function_exists('grapheme_extract')) {
-    function grapheme_extract(?string $haystack, ?int $size, ?int $type = GRAPHEME_EXTR_COUNT, ?int $offset = 0, &$next = null): string|false { return p\Grapheme::grapheme_extract((string) $haystack, (int) $size, (int) $type, (int) $offset, $next); }
+    function grapheme_extract(?string $haystack, ?int $size, ?int $type = GRAPHEME_EXTR_COUNT, ?int $offset = 0, &$next = null): string | false { return p\Grapheme::grapheme_extract((string) $haystack, (int) $size, (int) $type, (int) $offset, $next); }
 }
 if (!function_exists('grapheme_stripos')) {
-    function grapheme_stripos(?string $haystack, ?string $needle, ?int $offset = 0): int|false { return p\Grapheme::grapheme_stripos((string) $haystack, (string) $needle, (int) $offset); }
+    function grapheme_stripos(?string $haystack, ?string $needle, ?int $offset = 0): int | false { return p\Grapheme::grapheme_stripos((string) $haystack, (string) $needle, (int) $offset); }
 }
 if (!function_exists('grapheme_stristr')) {
-    function grapheme_stristr(?string $haystack, ?string $needle, ?bool $beforeNeedle = false): string|false { return p\Grapheme::grapheme_stristr((string) $haystack, (string) $needle, (bool) $beforeNeedle); }
+    function grapheme_stristr(?string $haystack, ?string $needle, ?bool $beforeNeedle = false): string | false { return p\Grapheme::grapheme_stristr((string) $haystack, (string) $needle, (bool) $beforeNeedle); }
 }
 if (!function_exists('grapheme_strlen')) {
-    function grapheme_strlen(?string $string): int|false|null { return p\Grapheme::grapheme_strlen((string) $string); }
+    function grapheme_strlen(?string $string): int | false | null { return p\Grapheme::grapheme_strlen((string) $string); }
 }
 if (!function_exists('grapheme_strpos')) {
-    function grapheme_strpos(?string $haystack, ?string $needle, ?int $offset = 0): int|false { return p\Grapheme::grapheme_strpos((string) $haystack, (string) $needle, (int) $offset); }
+    function grapheme_strpos(?string $haystack, ?string $needle, ?int $offset = 0): int | false { return p\Grapheme::grapheme_strpos((string) $haystack, (string) $needle, (int) $offset); }
 }
 if (!function_exists('grapheme_strripos')) {
-    function grapheme_strripos(?string $haystack, ?string $needle, ?int $offset = 0): int|false { return p\Grapheme::grapheme_strripos((string) $haystack, (string) $needle, (int) $offset); }
+    function grapheme_strripos(?string $haystack, ?string $needle, ?int $offset = 0): int | false { return p\Grapheme::grapheme_strripos((string) $haystack, (string) $needle, (int) $offset); }
 }
 if (!function_exists('grapheme_strrpos')) {
-    function grapheme_strrpos(?string $haystack, ?string $needle, ?int $offset = 0): int|false { return p\Grapheme::grapheme_strrpos((string) $haystack, (string) $needle, (int) $offset); }
+    function grapheme_strrpos(?string $haystack, ?string $needle, ?int $offset = 0): int | false { return p\Grapheme::grapheme_strrpos((string) $haystack, (string) $needle, (int) $offset); }
 }
 if (!function_exists('grapheme_strstr')) {
-    function grapheme_strstr(?string $haystack, ?string $needle, ?bool $beforeNeedle = false): string|false { return p\Grapheme::grapheme_strstr((string) $haystack, (string) $needle, (bool) $beforeNeedle); }
+    function grapheme_strstr(?string $haystack, ?string $needle, ?bool $beforeNeedle = false): string | false { return p\Grapheme::grapheme_strstr((string) $haystack, (string) $needle, (bool) $beforeNeedle); }
 }
 if (!function_exists('grapheme_substr')) {
-    function grapheme_substr(?string $string, ?int $offset, ?int $length = null): string|false { return p\Grapheme::grapheme_substr((string) $string, (int) $offset, $length); }
+    function grapheme_substr(?string $string, ?int $offset, ?int $length = null): string | false { return p\Grapheme::grapheme_substr((string) $string, (int) $offset, $length); }
 }

deps/vendor/symfony/polyfill-intl-grapheme/Grapheme.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
 
     private const CASE_FOLD = [
         ['µ', 'ſ', "\xCD\x85", 'ς', "\xCF\x90", "\xCF\x91", "\xCF\x95", "\xCF\x96", "\xCF\xB0", "\xCF\xB1", "\xCF\xB5", "\xE1\xBA\x9B", "\xE1\xBE\xBE"],
-        ['μ', 's', 'ι',        'σ', 'β',        'θ',        'φ',        'π',        'κ',        'ρ',        'ε',        "\xE1\xB9\xA1", 'ι'],
+        ['μ', 's', 'ι', 'σ', 'β', 'θ', 'φ', 'π', 'κ', 'ρ', 'ε', "\xE1\xB9\xA1", 'ι'],
     ];
 
     public static function grapheme_extract($s, $size, $type = \GRAPHEME_EXTR_COUNT, $start = 0, &$next = 0)
@@ -50,7 +50,7 @@ 
 
         if (!\is_scalar($s)) {
             $hasError = false;
-            set_error_handler(function () use (&$hasError) { $hasError = true; });
+            set_error_handler(function() use (&$hasError) { $hasError = true; });
             $next = substr($s, $start);
             restore_error_handler();
             if ($hasError) {
@@ -83,7 +83,7 @@ 
 
         $next = $start;
 
-        $s = preg_split('/('.SYMFONY_GRAPHEME_CLUSTER_RX.')/u', "\r\n".$s, $size + 1, \PREG_SPLIT_NO_EMPTY | \PREG_SPLIT_DELIM_CAPTURE);
+        $s = preg_split('/(' . SYMFONY_GRAPHEME_CLUSTER_RX . ')/u', "\r\n" . $s, $size + 1, \PREG_SPLIT_NO_EMPTY | \PREG_SPLIT_DELIM_CAPTURE);
 
         if (!isset($s[1])) {
             return false;
@@ -113,7 +113,7 @@ 
 
     public static function grapheme_strlen($s)
     {
-        preg_replace('/'.SYMFONY_GRAPHEME_CLUSTER_RX.'/u', '', $s, -1, $len);
+        preg_replace('/' . SYMFONY_GRAPHEME_CLUSTER_RX . '/u', '', $s, -1, $len);
 
         return 0 === $len && '' !== $s ? null : $len;
     }
@@ -124,7 +124,7 @@ 
             $len = 2147483647;
         }
 
-        preg_match_all('/'.SYMFONY_GRAPHEME_CLUSTER_RX.'/u', $s, $s);
+        preg_match_all('/' . SYMFONY_GRAPHEME_CLUSTER_RX . '/u', $s, $s);
 
         $slen = \count($s[0]);
         $start = (int) $start;

deps/vendor/symfony/string/CodePointString.php

Spacing +11 added lines, -11 removed lines

@@ -60,7 +60,7 @@ 
             $rx .= '.{65535}';
             $length -= 65535;
         }
-        $rx .= '.{'.$length.'})/us';
+        $rx .= '.{' . $length . '})/us';
 
         $str = clone $this;
         $chunks = [];
@@ -80,7 +80,7 @@ 
         return '' === $str->string ? [] : [mb_ord($str->string, 'UTF-8')];
     }
 
-    public function endsWith(string|iterable|AbstractString $suffix): bool
+    public function endsWith(string | iterable | AbstractString $suffix): bool
     {
         if ($suffix instanceof AbstractString) {
             $suffix = $suffix->string;
@@ -93,13 +93,13 @@ 
         }
 
         if ($this->ignoreCase) {
-            return preg_match('{'.preg_quote($suffix).'$}iuD', $this->string);
+            return preg_match('{' . preg_quote($suffix) . '$}iuD', $this->string);
         }
 
         return \strlen($this->string) >= \strlen($suffix) && 0 === substr_compare($this->string, $suffix, -\strlen($suffix));
     }
 
-    public function equalsTo(string|iterable|AbstractString $string): bool
+    public function equalsTo(string | iterable | AbstractString $string): bool
     {
         if ($string instanceof AbstractString) {
             $string = $string->string;
@@ -114,7 +114,7 @@ 
         return $string === $this->string;
     }
 
-    public function indexOf(string|iterable|AbstractString $needle, int $offset = 0): ?int
+    public function indexOf(string | iterable | AbstractString $needle, int $offset = 0): ?int
     {
         if ($needle instanceof AbstractString) {
             $needle = $needle->string;
@@ -131,7 +131,7 @@ 
         return false === $i ? null : $i;
     }
 
-    public function indexOfLast(string|iterable|AbstractString $needle, int $offset = 0): ?int
+    public function indexOfLast(string | iterable | AbstractString $needle, int $offset = 0): ?int
     {
         if ($needle instanceof AbstractString) {
             $needle = $needle->string;
@@ -156,7 +156,7 @@ 
     public function prepend(string ...$prefix): static
     {
         $str = clone $this;
-        $str->string = (1 >= \count($prefix) ? ($prefix[0] ?? '') : implode('', $prefix)).$this->string;
+        $str->string = (1 >= \count($prefix) ? ($prefix[0] ?? '') : implode('', $prefix)) . $this->string;
 
         if (!preg_match('//u', $str->string)) {
             throw new InvalidArgumentException('Invalid UTF-8 string.');
@@ -178,7 +178,7 @@ 
         }
 
         if ($this->ignoreCase) {
-            $str->string = implode($to, preg_split('{'.preg_quote($from).'}iuD', $this->string));
+            $str->string = implode($to, preg_split('{' . preg_quote($from) . '}iuD', $this->string));
         } else {
             $str->string = str_replace($from, $to, $this->string);
         }
@@ -219,7 +219,7 @@ 
         }
 
         if (null !== $flags) {
-            return parent::split($delimiter.'u', $limit, $flags);
+            return parent::split($delimiter . 'u', $limit, $flags);
         }
 
         if (!preg_match('//u', $delimiter)) {
@@ -228,7 +228,7 @@ 
 
         $str = clone $this;
         $chunks = $this->ignoreCase
-            ? preg_split('{'.preg_quote($delimiter).'}iuD', $this->string, $limit)
+            ? preg_split('{' . preg_quote($delimiter) . '}iuD', $this->string, $limit)
             : explode($delimiter, $this->string, $limit);
 
         foreach ($chunks as &$chunk) {
@@ -239,7 +239,7 @@ 
         return $chunks;
     }
 
-    public function startsWith(string|iterable|AbstractString $prefix): bool
+    public function startsWith(string | iterable | AbstractString $prefix): bool
     {
         if ($prefix instanceof AbstractString) {
             $prefix = $prefix->string;

deps/vendor/symfony/string/LazyString.php

Spacing +7 added lines, -7 removed lines

@@ -18,19 +18,19 @@ 
  */
 class LazyString implements \Stringable, \JsonSerializable
 {
-    private \Closure|string $value;
+    private \Closure | string $value;
 
     /**
      * @param callable|array $callback A callable or a [Closure, method] lazy-callable
      */
-    public static function fromCallable(callable|array $callback, mixed ...$arguments): static
+    public static function fromCallable(callable | array $callback, mixed ...$arguments): static
     {
         if (\is_array($callback) && !\is_callable($callback) && !(($callback[0] ?? null) instanceof \Closure || 2 < \count($callback))) {
-            throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be a callable or a [Closure, method] lazy-callable, "%s" given.', __METHOD__, '['.implode(', ', array_map('get_debug_type', $callback)).']'));
+            throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be a callable or a [Closure, method] lazy-callable, "%s" given.', __METHOD__, '[' . implode(', ', array_map('get_debug_type', $callback)) . ']'));
         }
 
         $lazyString = new static();
-        $lazyString->value = static function () use (&$callback, &$arguments): string {
+        $lazyString->value = static function() use (&$callback, &$arguments): string {
             static $value;
 
             if (null !== $arguments) {
@@ -49,7 +49,7 @@ 
         return $lazyString;
     }
 
-    public static function fromStringable(string|int|float|bool|\Stringable $value): static
+    public static function fromStringable(string | int | float | bool | \Stringable $value): static
     {
         if (\is_object($value)) {
             return static::fromCallable($value->__toString(...));
@@ -74,7 +74,7 @@ 
      *
      * @throws \TypeError When the provided value is not stringable
      */
-    final public static function resolve(\Stringable|string|int|float|bool $value): string
+    final public static function resolve(\Stringable | string | int | float | bool $value): string
     {
         return $value;
     }
@@ -140,6 +140,6 @@ 
             $method = '__invoke';
         }
 
-        return $class.'::'.$method;
+        return $class . '::' . $method;
     }
 }

deps/vendor/symfony/string/AbstractString.php

Spacing +15 added lines, -15 removed lines

@@ -93,7 +93,7 @@ 
     /**
      * @param string|string[] $needle
      */
-    public function after(string|iterable $needle, bool $includeNeedle = false, int $offset = 0): static
+    public function after(string | iterable $needle, bool $includeNeedle = false, int $offset = 0): static
     {
         $str = clone $this;
         $i = \PHP_INT_MAX;
@@ -126,7 +126,7 @@ 
     /**
      * @param string|string[] $needle
      */
-    public function afterLast(string|iterable $needle, bool $includeNeedle = false, int $offset = 0): static
+    public function afterLast(string | iterable $needle, bool $includeNeedle = false, int $offset = 0): static
     {
         $str = clone $this;
         $i = null;
@@ -161,7 +161,7 @@ 
     /**
      * @param string|string[] $needle
      */
-    public function before(string|iterable $needle, bool $includeNeedle = false, int $offset = 0): static
+    public function before(string | iterable $needle, bool $includeNeedle = false, int $offset = 0): static
     {
         $str = clone $this;
         $i = \PHP_INT_MAX;
@@ -194,7 +194,7 @@ 
     /**
      * @param string|string[] $needle
      */
-    public function beforeLast(string|iterable $needle, bool $includeNeedle = false, int $offset = 0): static
+    public function beforeLast(string | iterable $needle, bool $includeNeedle = false, int $offset = 0): static
     {
         $str = clone $this;
         $i = null;
@@ -252,7 +252,7 @@ 
     /**
      * @param string|string[] $needle
      */
-    public function containsAny(string|iterable $needle): bool
+    public function containsAny(string | iterable $needle): bool
     {
         return null !== $this->indexOf($needle);
     }
@@ -260,7 +260,7 @@ 
     /**
      * @param string|string[] $suffix
      */
-    public function endsWith(string|iterable $suffix): bool
+    public function endsWith(string | iterable $suffix): bool
     {
         if (\is_string($suffix)) {
             throw new \TypeError(sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
@@ -282,9 +282,9 @@ 
         }
 
         $suffix = preg_quote($suffix);
-        $regex = '{('.$suffix.')(?:'.$suffix.')++$}D';
+        $regex = '{(' . $suffix . ')(?:' . $suffix . ')++$}D';
 
-        return $this->replaceMatches($regex.($this->ignoreCase ? 'i' : ''), '$1');
+        return $this->replaceMatches($regex . ($this->ignoreCase ? 'i' : ''), '$1');
     }
 
     public function ensureStart(string $prefix): static
@@ -309,7 +309,7 @@ 
     /**
      * @param string|string[] $string
      */
-    public function equalsTo(string|iterable $string): bool
+    public function equalsTo(string | iterable $string): bool
     {
         if (\is_string($string)) {
             throw new \TypeError(sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
@@ -337,7 +337,7 @@ 
     /**
      * @param string|string[] $needle
      */
-    public function indexOf(string|iterable $needle, int $offset = 0): ?int
+    public function indexOf(string | iterable $needle, int $offset = 0): ?int
     {
         if (\is_string($needle)) {
             throw new \TypeError(sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
@@ -359,7 +359,7 @@ 
     /**
      * @param string|string[] $needle
      */
-    public function indexOfLast(string|iterable $needle, int $offset = 0): ?int
+    public function indexOfLast(string | iterable $needle, int $offset = 0): ?int
     {
         if (\is_string($needle)) {
             throw new \TypeError(sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
@@ -425,7 +425,7 @@ 
 
     abstract public function replace(string $from, string $to): static;
 
-    abstract public function replaceMatches(string $fromRegexp, string|callable $to): static;
+    abstract public function replaceMatches(string $fromRegexp, string | callable $to): static;
 
     abstract public function reverse(): static;
 
@@ -452,7 +452,7 @@ 
 
         try {
             if (false === $chunks = preg_split($delimiter, $this->string, $limit, $flags)) {
-                throw new RuntimeException('Splitting failed with error: '.preg_last_error_msg());
+                throw new RuntimeException('Splitting failed with error: ' . preg_last_error_msg());
             }
         } finally {
             restore_error_handler();
@@ -478,7 +478,7 @@ 
     /**
      * @param string|string[] $prefix
      */
-    public function startsWith(string|iterable $prefix): bool
+    public function startsWith(string | iterable $prefix): bool
     {
         if (\is_string($prefix)) {
             throw new \TypeError(sprintf('Method "%s()" must be overridden by class "%s" to deal with non-iterable values.', __FUNCTION__, static::class));
@@ -680,7 +680,7 @@ 
         }
 
         $str = clone $this;
-        $str->string = $string.implode('', $chars);
+        $str->string = $string . implode('', $chars);
 
         return $str;
     }

deps/vendor/symfony/string/Inflector/FrenchInflector.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
             }
         }
 
-        return [$singular.'s'];
+        return [$singular . 's'];
     }
 
     private function isInflectedWord(string $word): bool

deps/vendor/symfony/string/Inflector/EnglishInflector.php

Spacing +5 added lines, -5 removed lines

@@ -487,13 +487,13 @@ 
                         $singulars = [];
 
                         foreach ($newSuffix as $newSuffixEntry) {
-                            $singulars[] = $newBase.($firstUpper ? ucfirst($newSuffixEntry) : $newSuffixEntry);
+                            $singulars[] = $newBase . ($firstUpper ? ucfirst($newSuffixEntry) : $newSuffixEntry);
                         }
 
                         return $singulars;
                     }
 
-                    return [$newBase.($firstUpper ? ucfirst($newSuffix) : $newSuffix)];
+                    return [$newBase . ($firstUpper ? ucfirst($newSuffix) : $newSuffix)];
                 }
 
                 // Suffix is longer than word
@@ -564,13 +564,13 @@ 
                         $plurals = [];
 
                         foreach ($newSuffix as $newSuffixEntry) {
-                            $plurals[] = $newBase.($firstUpper ? ucfirst($newSuffixEntry) : $newSuffixEntry);
+                            $plurals[] = $newBase . ($firstUpper ? ucfirst($newSuffixEntry) : $newSuffixEntry);
                         }
 
                         return $plurals;
                     }
 
-                    return [$newBase.($firstUpper ? ucfirst($newSuffix) : $newSuffix)];
+                    return [$newBase . ($firstUpper ? ucfirst($newSuffix) : $newSuffix)];
                 }
 
                 // Suffix is longer than word
@@ -581,6 +581,6 @@ 
         }
 
         // Assume that plural is singular with a trailing `s`
-        return [$singular.'s'];
+        return [$singular . 's'];
     }
 }

deps/vendor/symfony/string/ByteString.php

Spacing +12 added lines, -12 removed lines

@@ -132,7 +132,7 @@ 
         return $chunks;
     }
 
-    public function endsWith(string|iterable|AbstractString $suffix): bool
+    public function endsWith(string | iterable | AbstractString $suffix): bool
     {
         if ($suffix instanceof AbstractString) {
             $suffix = $suffix->string;
@@ -143,7 +143,7 @@ 
         return '' !== $suffix && \strlen($this->string) >= \strlen($suffix) && 0 === substr_compare($this->string, $suffix, -\strlen($suffix), null, $this->ignoreCase);
     }
 
-    public function equalsTo(string|iterable|AbstractString $string): bool
+    public function equalsTo(string | iterable | AbstractString $string): bool
     {
         if ($string instanceof AbstractString) {
             $string = $string->string;
@@ -166,7 +166,7 @@ 
         return $str;
     }
 
-    public function indexOf(string|iterable|AbstractString $needle, int $offset = 0): ?int
+    public function indexOf(string | iterable | AbstractString $needle, int $offset = 0): ?int
     {
         if ($needle instanceof AbstractString) {
             $needle = $needle->string;
@@ -183,7 +183,7 @@ 
         return false === $i ? null : $i;
     }
 
-    public function indexOfLast(string|iterable|AbstractString $needle, int $offset = 0): ?int
+    public function indexOfLast(string | iterable | AbstractString $needle, int $offset = 0): ?int
     {
         if ($needle instanceof AbstractString) {
             $needle = $needle->string;
@@ -209,8 +209,8 @@ 
     {
         $str = clone $this;
 
-        $tail = null !== $lastGlue && 1 < \count($strings) ? $lastGlue.array_pop($strings) : '';
-        $str->string = implode($this->string, $strings).$tail;
+        $tail = null !== $lastGlue && 1 < \count($strings) ? $lastGlue . array_pop($strings) : '';
+        $str->string = implode($this->string, $strings) . $tail;
 
         return $str;
     }
@@ -240,7 +240,7 @@ 
 
         try {
             if (false === $match($regexp, $this->string, $matches, $flags | \PREG_UNMATCHED_AS_NULL, $offset)) {
-                throw new RuntimeException('Matching failed with error: '.preg_last_error_msg());
+                throw new RuntimeException('Matching failed with error: ' . preg_last_error_msg());
             }
         } finally {
             restore_error_handler();
@@ -276,7 +276,7 @@ 
     public function prepend(string ...$prefix): static
     {
         $str = clone $this;
-        $str->string = (1 >= \count($prefix) ? ($prefix[0] ?? '') : implode('', $prefix)).$str->string;
+        $str->string = (1 >= \count($prefix) ? ($prefix[0] ?? '') : implode('', $prefix)) . $str->string;
 
         return $str;
     }
@@ -292,7 +292,7 @@ 
         return $str;
     }
 
-    public function replaceMatches(string $fromRegexp, string|callable $to): static
+    public function replaceMatches(string $fromRegexp, string | callable $to): static
     {
         if ($this->ignoreCase) {
             $fromRegexp .= 'i';
@@ -308,7 +308,7 @@ 
 
                 foreach (get_defined_constants(true)['pcre'] as $k => $v) {
                     if ($lastError === $v && str_ends_with($k, '_ERROR')) {
-                        throw new RuntimeException('Matching failed with '.$k.'.');
+                        throw new RuntimeException('Matching failed with ' . $k . '.');
                     }
                 }
 
@@ -372,7 +372,7 @@ 
 
         $str = clone $this;
         $chunks = $this->ignoreCase
-            ? preg_split('{'.preg_quote($delimiter).'}iD', $this->string, $limit)
+            ? preg_split('{' . preg_quote($delimiter) . '}iD', $this->string, $limit)
             : explode($delimiter, $this->string, $limit);
 
         foreach ($chunks as &$chunk) {
@@ -383,7 +383,7 @@ 
         return $chunks;
     }
 
-    public function startsWith(string|iterable|AbstractString $prefix): bool
+    public function startsWith(string | iterable | AbstractString $prefix): bool
     {
         if ($prefix instanceof AbstractString) {
             $prefix = $prefix->string;

deps/vendor/symfony/process/ExecutableFinder.php

Spacing +3 added lines, -3 removed lines

@@ -60,18 +60,18 @@
         }
         foreach ($suffixes as $suffix) {
             foreach ($dirs as $dir) {
-                if (@is_file($file = $dir.\DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === \DIRECTORY_SEPARATOR || @is_executable($file))) {
+                if (@is_file($file = $dir . \DIRECTORY_SEPARATOR . $name . $suffix) && ('\\' === \DIRECTORY_SEPARATOR || @is_executable($file))) {
                     return $file;
                 }
 
-                if (!@is_dir($dir) && basename($dir) === $name.$suffix && @is_executable($dir)) {
+                if (!@is_dir($dir) && basename($dir) === $name . $suffix && @is_executable($dir)) {
                     return $dir;
                 }
             }
         }
 
         $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v --';
-        if (\function_exists('exec') && ($executablePath = strtok(@exec($command.' '.escapeshellarg($name)), \PHP_EOL)) && @is_executable($executablePath)) {
+        if (\function_exists('exec') && ($executablePath = strtok(@exec($command . ' ' . escapeshellarg($name)), \PHP_EOL)) && @is_executable($executablePath)) {
             return $executablePath;
         }