added symfony/process dependency and removed embedded Process class

KnpLabs · Jun 30, 2015 · c166aa5 · c166aa5
1 parent f29edc4
commit c166aa5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 146 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 phpunit.xml
-build
+composer.lock
+vendor
diff --git a/composer.json b/composer.json
@@ -16,9 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
-    },
-    "require-dev": {
+        "php": ">=5.3.0",
         "symfony/process": "~2.1"
     },
     "suggest": {

diff --git a/src/Knp/Snappy/AbstractGenerator.php b/src/Knp/Snappy/AbstractGenerator.php
@@ -3,6 +3,7 @@
 namespace Knp\Snappy;
 
 use Knp\Snappy\Exception as Exceptions;
+use Symfony\Component\Process\Process;
 
 /**
  * Base generator class for medias
@@ -463,13 +464,10 @@ protected function isAssociativeArray(array $array)
      */
     protected function executeCommand($command)
     {
-        if (class_exists('Symfony\Component\Process\Process')) {
-            $process = new \Symfony\Component\Process\Process($command, NULL, $this->env);
-            if ($this->timeout !== false) {
-                $process->setTimeout($this->timeout);
-            }
-        } else {
-            $process = new Process($command, $this->env);
+        $process = new Process($command, NULL, $this->env);
+
+        if ($this->timeout !== false) {
+            $process->setTimeout($this->timeout);
         }
 
         $process->run();

diff --git a/src/Knp/Snappy/Process.php b/src/Knp/Snappy/Process.php
diff --git a/test/Knp/Snappy/ProcessTest.php b/test/Knp/Snappy/ProcessTest.php