[Validator] fixed apc cache

src/Symfony/Component/Validator/Mapping/Cache/ApcCache.php

@@ -6,30 +6,28 @@ use Symfony\Component\Validator\Mapping\ClassMetadata;
 
 class ApcCache implements CacheInterface
 {
+    private $prefix;
+
+    public function __construct($prefix)
+    {
+        $this->prefix = $prefix;
+    }
+
     public function has($class)
     {
-        apc_delete($this->computeCacheKey($class));
-        apc_fetch($this->computeCacheKey($class), $exists);
+        $exists = false;
+        apc_fetch($this->prefix.$class, $exists);
 
         return $exists;
     }
 
     public function read($class)
     {
-        if (!$this->has($class)) {
-            // TODO exception
-        }
-
-        return apc_fetch($this->computeCacheKey($class));
+        return apc_fetch($this->prefix.$class);
     }
 
     public function write(ClassMetadata $metadata)
     {
-        apc_store($this->computeCacheKey($metadata->getClassName()), $metadata);
-    }
-
-    protected function computeCacheKey($class)
-    {
-        return 'Symfony\Components\Validator:'.$class;
+        apc_store($this->prefix.$metadata->getClassName(), $metadata);
     }
 }

tests/Symfony/Tests/Component/Validator/Mapping/Cache/ApcCacheTest.php

@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Validator\Mapping\Cache;
+
+use Symfony\Component\Validator\Mapping\Cache\ApcCache;
+
+class ApcCacheTest extends \PHPUnit_Framework_TestCase
+{
+    protected function setUp()
+    {
+        if (!extension_loaded('apc')) {
+            $this->markTestSkipped('APC is not loaded.');
+        }
+    }
+
+    public function testWrite()
+    {
+        $meta = $this->getMockBuilder('Symfony\\Component\\Validator\\Mapping\\ClassMetadata')
+            ->disableOriginalConstructor()
+            ->setMethods(array('getClassName'))
+            ->getMock();
+
+        $meta->expects($this->once())
+            ->method('getClassName')
+            ->will($this->returnValue('bar'));
+
+        $cache = new ApcCache('foo');
+        $cache->write($meta);
+
+        $this->assertInstanceOf('Symfony\\Component\\Validator\\Mapping\\ClassMetadata', apc_fetch('foobar'), '->write() stores metadata in APC');
+    }
+
+    public function testHas()
+    {
+        $meta = $this->getMockBuilder('Symfony\\Component\\Validator\\Mapping\\ClassMetadata')
+            ->disableOriginalConstructor()
+            ->setMethods(array('getClassName'))
+            ->getMock();
+
+        $meta->expects($this->once())
+            ->method('getClassName')
+            ->will($this->returnValue('bar'));
+
+        apc_delete('foobar');
+
+        $cache = new ApcCache('foo');
+        $this->assertFalse($cache->has('bar'), '->has() returns false when there is no entry');
+
+        $cache->write($meta);
+        $this->assertTrue($cache->has('bar'), '->has() returns true when the is an entry');
+    }
+
+    public function testRead()
+    {
+        $meta = $this->getMockBuilder('Symfony\\Component\\Validator\\Mapping\\ClassMetadata')
+            ->disableOriginalConstructor()
+            ->setMethods(array('getClassName'))
+            ->getMock();
+
+        $meta->expects($this->once())
+            ->method('getClassName')
+            ->will($this->returnValue('bar'));
+
+        $cache = new ApcCache('foo');
+        $cache->write($meta);
+
+        $this->assertInstanceOf('Symfony\\Component\\Validator\\Mapping\\ClassMetadata', $cache->read('bar'), '->read() returns metadata');
+    }
+}