[PropertyAccessor] fix encoding of cache keys

symfony · Nov 25, 2018 · e3174fc · e3174fc
1 parent 7f310b4
commit e3174fc
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -508,7 +508,7 @@ private function readProperty($zval, $property)
      */
     private function getReadAccessInfo($class, $property)
     {
-        $key = (false !== strpos($class, '@') ? rawurlencode($class) : $class).'..'.$property;
+        $key = false !== strpbrk($key = $class.'..'.$property, '{}()/\@:') ? rawurlencode($key) : $key;
 
         if (isset($this->readPropertyCache[$key])) {
             return $this->readPropertyCache[$key];
@@ -687,7 +687,7 @@ private function writeCollection($zval, $property, $collection, $addMethod, $rem
      */
     private function getWriteAccessInfo($class, $property, $value)
     {
-        $key = (false !== strpos($class, '@') ? rawurlencode($class) : $class).'..'.$property;
+        $key = false !== strpbrk($key = $class.'..'.$property, '{}()/\@:') ? rawurlencode($key) : $key;
 
         if (isset($this->writePropertyCache[$key])) {
             return $this->writePropertyCache[$key];
@@ -868,7 +868,8 @@ private function getPropertyPath($propertyPath)
         }
 
         if ($this->cacheItemPool) {
-            $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_PROPERTY_PATH.$propertyPath);
+            $key = false !== strpbrk($propertyPath, '{}()/\@:') ? rawurlencode($propertyPath) : $propertyPath;
+            $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_PROPERTY_PATH.$key);
             if ($item->isHit()) {
                 return $this->propertyPathCache[$propertyPath] = $item->get();
             }