update test to make them work with SF2.3

gnat42 · Jun 4, 2013 · 61d59c9 · 61d59c9
1 parent f8c02cc
commit 61d59c9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/Tests/Filter/Doctrine/DoctrineQueryBuilderUpdater.php b/Tests/Filter/Doctrine/DoctrineQueryBuilderUpdater.php
@@ -4,7 +4,6 @@
 
 use Lexik\Bundle\FormFilterBundle\Tests\Fixtures\Filter\FormType;
 
-use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RegisterKernelListenersPass;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -225,8 +224,14 @@ protected function getContainer()
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->addCompilerPass(new RegisterKernelListenersPass());
         $container->addCompilerPass(new FormDataExtractorPass());
+
+        if (class_exists('Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RegisterKernelListenersPass')) {
+            $container->addCompilerPass(new \Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RegisterKernelListenersPass()); // SF < 2.3
+        } else {
+            $container->addCompilerPass(new \Symfony\Component\HttpKernel\DependencyInjection\RegisterListenersPass()); // SF 2.3
+        }
+
         $container->compile();
 
         return $container;

diff --git a/Tests/vendors.php b/Tests/vendors.php
@@ -22,19 +22,26 @@
 
 $revs = array(
     'v2.1' => array(
-        'symfony'           => 'v2.1.8',
+        'symfony'           => 'v2.1.11',
         'doctrine-common'   => '2.3.0',
         'doctrine-dbal'     => '2.3.2',
         'doctrine'          => '2.3.2',
         'doctrine-fixtures' => 'origin/master',
     ),
     'v2.2' => array(
-        'symfony'           => 'v2.2.0',
+        'symfony'           => 'v2.2.2',
         'doctrine-common'   => '2.3.0',
         'doctrine-dbal'     => '2.3.2',
         'doctrine'          => '2.3.2',
         'doctrine-fixtures' => 'origin/master',
     ),
+    'v2.3' => array(
+        'symfony'           => 'v2.3.0',
+        'doctrine-common'   => '2.3.0',
+        'doctrine-dbal'     => '2.3.4',
+        'doctrine'          => '2.3.4',
+        'doctrine-fixtures' => 'origin/master',
+    ),
 );
 
 if (!isset($_SERVER['SYMFONY_VERSION'])) {