diff vendor/symfony/process/PhpExecutableFinder.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10
author Chris Cannam
date Thu, 28 Feb 2019 13:21:36 +0000
parents c2387f117808
children
line wrap: on
line diff
--- a/vendor/symfony/process/PhpExecutableFinder.php	Tue Jul 10 15:07:59 2018 +0100
+++ b/vendor/symfony/process/PhpExecutableFinder.php	Thu Feb 28 13:21:36 2019 +0000
@@ -39,12 +39,12 @@
         $args = $includeArgs && $args ? ' '.implode(' ', $args) : '';
 
         // HHVM support
-        if (defined('HHVM_VERSION')) {
+        if (\defined('HHVM_VERSION')) {
             return (getenv('PHP_BINARY') ?: PHP_BINARY).$args;
         }
 
         // PHP_BINARY return the current sapi executable
-        if (PHP_BINARY && \in_array(PHP_SAPI, array('cli', 'cli-server', 'phpdbg'), true)) {
+        if (PHP_BINARY && \in_array(\PHP_SAPI, ['cli', 'cli-server', 'phpdbg'], true)) {
             return PHP_BINARY.$args;
         }
 
@@ -62,12 +62,12 @@
             }
         }
 
-        if (@is_executable($php = PHP_BINDIR.('\\' === DIRECTORY_SEPARATOR ? '\\php.exe' : '/php'))) {
+        if (@is_executable($php = PHP_BINDIR.('\\' === \DIRECTORY_SEPARATOR ? '\\php.exe' : '/php'))) {
             return $php;
         }
 
-        $dirs = array(PHP_BINDIR);
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        $dirs = [PHP_BINDIR];
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $dirs[] = 'C:\xampp\php\\';
         }
 
@@ -81,11 +81,11 @@
      */
     public function findArguments()
     {
-        $arguments = array();
+        $arguments = [];
 
-        if (defined('HHVM_VERSION')) {
+        if (\defined('HHVM_VERSION')) {
             $arguments[] = '--php';
-        } elseif ('phpdbg' === PHP_SAPI) {
+        } elseif ('phpdbg' === \PHP_SAPI) {
             $arguments[] = '-qrr';
         }