Merge pull request doctrine#255 from FabioBatSilva/hotfix-slc

HOTFIX - DoctrineDataCollector backward compatibility
gencer · Jan 28, 2014 · 1b76e21 · 1b76e21
2 parents d46f840 + 60250a4
commit 1b76e21
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/DataCollector/DoctrineDataCollector.php b/DataCollector/DoctrineDataCollector.php
@@ -77,6 +77,10 @@ public function collect(Request $request, Response $response, \Exception $except
                 }
             }
 
+            if (version_compare(\Doctrine\ORM\Version::VERSION, '2.5.0-DEV') < 0) {
+                continue;
+            }
+
             /** @var $emConfig \Doctrine\ORM\Configuration */
             $emConfig   = $em->getConfiguration();
             $slcEnabled = $emConfig->isSecondLevelCacheEnabled();

diff --git a/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
@@ -492,6 +492,10 @@ public function testSetNamingStrategy()
 
     public function testSecondLevelCache()
     {
+        if (version_compare(\Doctrine\ORM\Version::VERSION, '2.5.0-DEV') < 0) {
+            $this->markTestSkipped('Second-level cache requires doctrine-orm 2.5.0 or newer');
+        }
+
         $container  = $this->getContainer();
         $loader     = new DoctrineExtension();