[DoctrineBridge] Fixed an issue with DoctrineParserCache

florianv · florianv · commit 16728f7b9bd1 · 2014-01-01T09:56:51.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/ExpressionLanguage/DoctrineParserCache.php b/src/Symfony/Bridge/Doctrine/ExpressionLanguage/DoctrineParserCache.php
@@ -35,7 +35,11 @@ public function __construct(Cache $cache)
      */
     public function fetch($key)
     {
-        return $this->cache->fetch($key);
+        if (false === $value = $this->cache->fetch($key)) {
+            return null;
+        }
+
+        return $value;
     }
 
     /**
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php b/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php
@@ -29,6 +29,19 @@ public function testFetch()
         $this->assertEquals('bar', $result);
     }
 
+    public function testFetchUnexisting()
+    {
+        $doctrineCacheMock = $this->getMock('Doctrine\Common\Cache\Cache');
+        $parserCache = new DoctrineParserCache($doctrineCacheMock);
+
+        $doctrineCacheMock
+            ->expects($this->once())
+            ->method('fetch')
+            ->will($this->returnValue(false));
+
+        $this->assertNull($parserCache->fetch(''));
+    }
+
     public function testSave()
     {
         $doctrineCacheMock = $this->getMock('Doctrine\Common\Cache\Cache');

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,11 @@ public function __construct(Cache $cache)`
`35`	`35`	`*/`
`36`	`36`	`public function fetch($key)`
`37`	`37`	`{`
`38`		`- return $this->cache->fetch($key);`
	`38`	`+ if (false === $value = $this->cache->fetch($key)) {`
	`39`	`+ return null;`
	`40`	`+ }`
	`41`	`+`
	`42`	`+ return $value;`
`39`	`43`	`}`
`40`	`44`
`41`	`45`	`/**`