Merge pull request #245 from owncloud/symfony-process-2.8.1

Bump symfony/process to 2.8.1
owncloud-archive · Jan 19, 2016 · 177daad · 177daad
2 parents 87515b6 + 50301d4
commit 177daad
Show file tree

Hide file tree

Showing 7 changed files with 131 additions and 163 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
 		"symfony/console": "2.8.1",
 		"symfony/event-dispatcher": "2.8.1",
 		"symfony/routing": "2.8.1",
-		"symfony/process": "2.8.0",
+		"symfony/process": "2.8.1",
 		"pimple/pimple": "3.0.2",
 		"ircmaxell/password-compat": "1.0.*",
 		"nikic/php-parser": "1.4.1",

diff --git a/composer.lock b/composer.lock
diff --git a/composer/ClassLoader.php b/composer/ClassLoader.php
@@ -147,7 +147,7 @@ public function add($prefix, $paths, $prepend = false)
      * appending or prepending to the ones previously set for this namespace.
      *
      * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-0 base directories
+     * @param array|string $paths   The PSR-4 base directories
      * @param bool         $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException

diff --git a/composer/autoload_real.php b/composer/autoload_real.php
@@ -27,16 +27,6 @@ public static function getLoader()
         array_push($includePaths, get_include_path());
         set_include_path(join(PATH_SEPARATOR, $includePaths));
 
-        $map = require __DIR__ . '/autoload_namespaces.php';
-        foreach ($map as $namespace => $path) {
-            $loader->set($namespace, $path);
-        }
-
-        $map = require __DIR__ . '/autoload_psr4.php';
-        foreach ($map as $namespace => $path) {
-            $loader->setPsr4($namespace, $path);
-        }
-
         $classMap = require __DIR__ . '/autoload_classmap.php';
         if ($classMap) {
             $loader->addClassMap($classMap);

diff --git a/composer/installed.json b/composer/installed.json
@@ -2367,57 +2367,6 @@
             "spl"
         ]
     },
-    {
-        "name": "symfony/process",
-        "version": "v2.8.0",
-        "version_normalized": "2.8.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/process.git",
-            "reference": "1b988a88e3551102f3c2d9e1d47a18c3a78d6312"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/process/zipball/1b988a88e3551102f3c2d9e1d47a18c3a78d6312",
-            "reference": "1b988a88e3551102f3c2d9e1d47a18c3a78d6312",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "time": "2015-11-30 12:35:10",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Process\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Process Component",
-        "homepage": "https://symfony.com"
-    },
     {
         "name": "symfony/polyfill-mbstring",
         "version": "v1.0.1",
@@ -3237,5 +3186,56 @@
             "uri",
             "url"
         ]
+    },
+    {
+        "name": "symfony/process",
+        "version": "v2.8.1",
+        "version_normalized": "2.8.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/process.git",
+            "reference": "62c254438b5040bc2217156e1570cf2206e8540c"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/process/zipball/62c254438b5040bc2217156e1570cf2206e8540c",
+            "reference": "62c254438b5040bc2217156e1570cf2206e8540c",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "time": "2015-12-23 11:03:46",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Process\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Process Component",
+        "homepage": "https://symfony.com"
     }
 ]
diff --git a/symfony/process/PhpProcess.php b/symfony/process/PhpProcess.php
@@ -46,6 +46,12 @@ public function __construct($script, $cwd = null, array $env = null, $timeout =
             $php .= ' '.ProcessUtils::escapeArgument($file);
             $script = null;
         }
+        if ('\\' !== DIRECTORY_SEPARATOR && null !== $php) {
+            // exec is mandatory to deal with sending a signal to the process
+            // see https://github.com/symfony/symfony/issues/5030 about prepending
+            // command with exec
+            $php = 'exec '.$php;
+        }
 
         parent::__construct($php, $cwd, $env, $script, $timeout, $options);
     }