Fix deprecation errors for symfony/process v3.x (#138)

Author: clemlatz

.travis.yml

@@ -3,19 +3,12 @@ language: php
 sudo: false
 
 php:
-    - 5.4
-    - 5.5
     - 5.6
     - 7.0
     - 7.1
     - 7.2
     - 7.3
 
-matrix:
-    include:
-        - php: 5.3
-          dist: precise
-
 before_install:
     # turn off XDebug, if present
     - phpenv config-rm xdebug.ini || return 0

composer.json

@@ -26,8 +26,8 @@
         }
     },
     "require": {
-        "php": "^5.3 || ^7.0",
-        "symfony/process": "^2.3|^3.0|^4.0"
+        "php": "^5.6 || ^7.0",
+        "symfony/process": "^3.4|^4.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.35|^5.7",

src/Gitonomy/Git/Repository.php

@@ -417,9 +417,7 @@ public function getDiff($revisions)
      */
     public function getSize()
     {
-        $commandlineArguments = array('du', '-skc', $this->gitDir);
-        $commandline = $this->normalizeCommandlineArguments($commandlineArguments);
-        $process = new Process($commandline);
+        $process = new Process(array('du', '-skc', $this->gitDir));
         $process->run();
 
         if (!preg_match('/(\d+)\s+total$/', trim($process->getOutput()), $vars)) {
@@ -621,47 +619,11 @@ private function getProcess($command, $args = array())
 
         $base[] = $command;
 
-        $commandlineArguments = array_merge($base, $args);
-        $commandline = $this->normalizeCommandlineArguments($commandlineArguments);
-
-        $process = new Process($commandline);
+        $process = new Process(array_merge($base, $args));
         $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;
-    }
 }