[PropertyAccessor] Remove the internal array cache and always rely on Doctrine

dunglas · dunglas · commit 82e363f63835 · 2015-12-05T11:09:57.000+01:00
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -20,6 +20,8 @@
 /**
  * Default implementation of {@link PropertyAccessorInterface}.
  *
+ * Be sure to enable Doctrine Cache to improve performance of the accessor.
+ *
  * @author Bernhard Schussek <bschussek@gmail.com>
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
@@ -57,16 +59,6 @@ class PropertyAccessor implements PropertyAccessorInterface
      */
     private $cache;
 
-    /**
-     * @var array
-     */
-    private $readPropertyCache = array();
-
-    /**
-     * @var array
-     */
-    private $writePropertyCache = array();
-
     /**
      * Should not be used by application code. Use
      * {@link PropertyAccess::createPropertyAccessor()} instead.
@@ -408,9 +400,7 @@ private function getReadAccessInfo($object, $property)
     {
         $key = get_class($object).'::'.$property;
 
-        if (isset($this->readPropertyCache[$key])) {
-            $access = $this->readPropertyCache[$key];
-        } elseif (!$this->cache || false === $access = $this->cache->fetch(self::CACHE_PREFIX_READ.$key)) {
+        if (!$this->cache || false === $access = $this->cache->fetch(self::CACHE_PREFIX_READ.$key)) {
             $access = array();
 
             $reflClass = new \ReflectionClass($object);
@@ -468,8 +458,6 @@ private function getReadAccessInfo($object, $property)
             if ($this->cache) {
                 $this->cache->save(self::CACHE_PREFIX_READ.$key, $access);
             }
-
-            $this->readPropertyCache[$key] = $access;
         }
 
         return $access;
@@ -594,9 +582,7 @@ private function getWriteAccessInfo($object, $property, $value)
         $key = get_class($object).'::'.$property;
         $guessedAdders = '';
 
-        if (isset($this->writePropertyCache[$key])) {
-            $access = $this->writePropertyCache[$key];
-        } elseif (!$this->cache || false === $access = $this->cache->fetch(self::CACHE_PREFIX_WRITE.$key)) {
+        if (!$this->cache || false === $access = $this->cache->fetch(self::CACHE_PREFIX_WRITE.$key)) {
             $access = array();
 
             $reflClass = new \ReflectionClass($object);
@@ -661,8 +647,6 @@ private function getWriteAccessInfo($object, $property, $value)
             if ($this->cache) {
                 $this->cache->save(self::CACHE_PREFIX_WRITE.$key, $access);
             }
-
-            $this->writePropertyCache[$key] = $access;
         }
 
         return $access;
