Merge pull request #44 from symfony-cmf/drop_2_2

drop Symfony 2.2 support

Author: lsmith77

.travis.yml

@@ -6,7 +6,6 @@ php:
     - 5.5
 
 env:
-  - SYMFONY_VERSION=2.2.*
   - SYMFONY_VERSION=2.3.*
   - SYMFONY_VERSION=2.4.*
   - SYMFONY_VERSION=dev-master

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.1.0-RC2
+---------
+
+* **2014-04-11**: drop Symfony 2.2 compatibility
+
 1.1.0-RC1
 ---------
 

composer.json

@@ -10,7 +10,7 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "symfony/symfony": "~2.1",
+        "symfony/symfony": "~2.3",
         "symfony/monolog-bundle": "~2.1",
         "doctrine/common": "~2.4",
         "doctrine/doctrine-bundle": "1.*",

resources/.travis.yml

@@ -5,9 +5,9 @@ php:
     - 5.4
 
 env:
-  - SYMFONY_VERSION=2.1.*
-  - SYMFONY_VERSION=2.2.*
   - SYMFONY_VERSION=2.3.*
+  - SYMFONY_VERSION=2.4.*
+  - SYMFONY_VERSION=dev-master
 
 before_script:
   - ./vendor/symfony-cmf/testing/bin/init-travis/phpcr_odm_doctrine_dbal.sh
@@ -17,3 +17,7 @@ script: phpunit --coverage-text
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
   email: "[email protected]"
+
+matrix:
+  allow_failures:
+    - env: SYMFONY_VERSION=dev-master

src/Symfony/Cmf/Component/Testing/Phpunit/DatabaseTestListener.php

@@ -26,7 +26,7 @@ class DatabaseTestListener implements \PHPUnit_Framework_TestListener
     public function __construct($processBuilder = null)
     {
         if (null === $processBuilder) {
-            $this->processBuilder = new PrefixedProcessBuilder();
+            $this->processBuilder = new ProcessBuilder();
             $phpExecutableFinder = new PhpExecutableFinder();
             $phpExecutable = $phpExecutableFinder->find();
             if (false !== $phpExecutable) {
@@ -219,52 +219,3 @@ public function endTestSuite(\PHPUnit_Framework_TestSuite $suite)
         }
     }
 }
-
-class PrefixedProcessBuilder extends ProcessBuilder
-{
-    private $prefixes = array();
-    private $activated = true;
-
-    public function __construct(array $arguments = array())
-    {
-        parent::__construct($arguments);
-
-        if (class_exists('Symfony\Component\HttpKernel\Kernel')) {
-            $this->activated = Kernel::VERSION_ID <= 20400;
-        } else {
-            $ref = new \ReflectionMethod(get_parent_class($this), 'setPrefix'); 
-            $doc = $ref->getDocComment();
-
-            $this->activated = false === strpos('array', $doc);
-        }
-    }
-
-    public function setPrefix($prefix)
-    {
-        $prefixes = is_array($prefix) ? $prefix : array($prefix);
-
-        if (!$this->activated) {
-            return parent::setPrefix($prefix);
-        }
-
-        foreach ($prefixes as $prefix) {
-            $this->prefixes[] = $prefix;
-        }
-        
-        return $this;
-    }
-
-    public function getProcess()
-    {
-        if (!$this->activated || 0 === count($this->prefixes)) {
-            return parent::getProcess();
-        }
-
-        $process = parent::getProcess();
-        $command = implode(' ', array_map('escapeshellarg', $this->prefixes)).' '.$process->getCommandLine();
-
-        $process->setCommandLine($command);
-
-        return $process;
-    }
-}