Pull merge.

[yaffs-website] / vendor / symfony / process / ExecutableFinder.php

diff --git a/vendor/symfony/process/ExecutableFinder.php b/vendor/symfony/process/ExecutableFinder.php
index d8e689622a537ebf3a386f7b005745629b6392f2..ccfa4c09b09ae0849b21ab160ea0129ef4dba482 100644 (file)
--- a/vendor/symfony/process/ExecutableFinder.php
+++ b/vendor/symfony/process/ExecutableFinder.php
@@ -23,8 +23,6 @@ class ExecutableFinder
 
     /**
      * Replaces default suffixes of executable.
-     *
-     * @param array $suffixes
      */
     public function setSuffixes(array $suffixes)
     {
@@ -73,13 +71,13 @@ class ExecutableFinder
         }
 
         $suffixes = array('');
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $pathExt = getenv('PATHEXT');
-            $suffixes = array_merge($suffixes, $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes);
+            $suffixes = array_merge($pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes, $suffixes);
         }
         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;
                 }
             }