minor #122 Support Symfony 4.0 (UrGuardian4ngel)

This PR was squashed before being merged into the 1.0-dev branch (closes #122).

Discussion
----------

Support Symfony 4.0

Allow usage of the latest version (currently in beta) of the [symfony/process](https://github.com/symfony/process) component.

#SymfonyConHackday2017

Commits
-------

50cae49 Support Symfony 4.0

Author: lyrixx

.travis.yml

@@ -3,14 +3,18 @@ language: php
 sudo: false
 
 php:
-    - 5.3
     - 5.4
     - 5.5
     - 5.6
     - 7.0
     - hhvm
 
+matrix:
+    include:
+        - php: 5.3
+          dist: precise
+
 install:
     - composer install --prefer-source
 
-script: phpunit
+script: vendor/bin/phpunit

composer.json

@@ -26,9 +26,10 @@
         }
     },
     "require": {
-        "symfony/process": "^2.3|^3.0"
+        "symfony/process": "^2.3|^3.0|^4.0"
     },
     "require-dev": {
+        "phpunit/phpunit": "^4.8.35|^5.7",
         "psr/log": "^1.0"
     },
     "suggest": {

src/Gitonomy/Git/Admin.php

@@ -12,7 +12,7 @@
 namespace Gitonomy\Git;
 
 use Gitonomy\Git\Exception\RuntimeException;
-use Symfony\Component\Process\ProcessBuilder;
+use Symfony\Component\Process\Process;
 
 /**
  * Administration class for Git repositories.
@@ -153,10 +153,17 @@ private static function getProcess($command, array $args = array(), array $optio
             'process_timeout' => 3600,
         ), $options);
 
-        $builder = ProcessBuilder::create(array_merge(array($options['command'], $command), $args));
-        $builder->inheritEnvironmentVariables(false);
+        $commandline = array_merge(array($options['command'], $command), $args);
 
-        $process = $builder->getProcess();
+        // Backward compatible layer for Symfony Process < 4.0.
+        if (class_exists('Symfony\Component\Process\ProcessBuilder')) {
+            $commandline = implode(' ', array_map(
+                'Symfony\Component\Process\ProcessUtils::escapeArgument',
+                $commandline
+            ));
+        }
+
+        $process = new Process($commandline);
         $process->setEnv($options['environment_variables']);
         $process->setTimeout($options['process_timeout']);
         $process->setIdleTimeout($options['process_timeout']);

src/Gitonomy/Git/Repository.php

@@ -17,7 +17,7 @@
 use Gitonomy\Git\Exception\RuntimeException;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Process\Process;
-use Symfony\Component\Process\ProcessBuilder;
+use Symfony\Component\Process\ProcessUtils;
 
 /**
  * Git repository object.
@@ -417,8 +417,9 @@ public function getDiff($revisions)
      */
     public function getSize()
     {
-        $process = ProcessBuilder::create(array('du', '-skc', $this->gitDir))->getProcess();
-
+        $commandlineArguments = array('du', '-skc', $this->gitDir);
+        $commandline = $this->normalizeCommandlineArguments($commandlineArguments);
+        $process = new Process($commandline);
         $process->run();
 
         if (!preg_match('/(\d+)\s+total$/', trim($process->getOutput()), $vars)) {
@@ -620,13 +621,47 @@ private function getProcess($command, $args = array())
 
         $base[] = $command;
 
-        $builder = new ProcessBuilder(array_merge($base, $args));
-        $builder->inheritEnvironmentVariables(false);
-        $process = $builder->getProcess();
+        $commandlineArguments = array_merge($base, $args);
+        $commandline = $this->normalizeCommandlineArguments($commandlineArguments);
+
+        $process = new Process($commandline);
         $process->setEnv($this->environmentVariables);
         $process->setTimeout($this->processTimeout);
         $process->setIdleTimeout($this->processTimeout);
 
         return $process;
     }
+
+    /**
+     * This internal helper method is used to convert an array of commandline
+     * arguments to an escaped commandline string for older versions of the
+     * Symfony Process component.
+     *
+     * It acts as a backward compatible layer for Symfony Process < 3.3.
+     *
+     * @param array $arguments a list of command line arguments
+     *
+     * @return string|array a single escaped string (< 4.0) or a raw array of
+     *                      the arguments passed in (4.0+)
+     *
+     * @see Process::escapeArgument()
+     * @see ProcessUtils::escapeArgument()
+     */
+    private function normalizeCommandlineArguments(array $arguments)
+    {
+        // From version 4.0 and onwards, the Process accepts an array of
+        // arguments, and escaping is taken care of automatically.
+        if (!class_exists('Symfony\Component\Process\ProcessBuilder')) {
+            return $arguments;
+        }
+
+        // For version < 3.3, the Process only accepts a simple string
+        // as commandline, and escaping has to happen manually.
+        $commandline = implode(' ', array_map(
+            'Symfony\Component\Process\ProcessUtils::escapeArgument',
+            $arguments
+        ));
+
+        return $commandline;
+    }
 }

tests/Gitonomy/Git/Tests/AbstractTest.php

@@ -13,8 +13,9 @@
 
 use Gitonomy\Git\Admin;
 use Gitonomy\Git\Repository;
+use PHPUnit\Framework\TestCase;
 
-abstract class AbstractTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractTest extends TestCase
 {
     const REPOSITORY_URL = 'http://github.com/gitonomy/foobar.git';