symfony
diff --git a/‎src/Symfony/Component/PropertyAccess/PropertyAccessor.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+5-6Lines changed: 5 additions & 6 deletions b/‎src/Symfony/Component/PropertyAccess/PropertyAccessor.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+5-6Lines changed: 5 additions & 6 deletions
diff --git a/‎src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
+4Lines changed: 4 additions & 0 deletions
@@ -508,14 +508,14 @@ private function readProperty($zval, $property)
      */
     private function getReadAccessInfo($class, $property)
     {
-        $key = false !== strpbrk($key = $class.'..'.$property, '{}()/@:') ? rawurlencode($key) : $key;
+        $key = str_replace('\\', '.', $class).'..'.$property;
 
         if (isset($this->readPropertyCache[$key])) {
             return $this->readPropertyCache[$key];
         }
 
         if ($this->cacheItemPool) {
-            $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_READ.str_replace('\\', '.', $key));
+            $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_READ.rawurlencode($key));
             if ($item->isHit()) {
                 return $this->readPropertyCache[$key] = $item->get();
             }
@@ -687,14 +687,14 @@ private function writeCollection($zval, $property, $collection, $addMethod, $rem
      */
     private function getWriteAccessInfo($class, $property, $value)
     {
-        $key = false !== strpbrk($key = $class.'..'.$property, '{}()/@:') ? rawurlencode($key) : $key;
+        $key = str_replace('\\', '.', $class).'..'.$property;
 
         if (isset($this->writePropertyCache[$key])) {
             return $this->writePropertyCache[$key];
         }
 
         if ($this->cacheItemPool) {
-            $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_WRITE.str_replace('\\', '.', $key));
+            $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_WRITE.rawurlencode($key));
             if ($item->isHit()) {
                 return $this->writePropertyCache[$key] = $item->get();
             }
@@ -868,8 +868,7 @@ private function getPropertyPath($propertyPath)
         }
 
         if ($this->cacheItemPool) {
-            $key = false !== strpbrk($propertyPath, '{}()/@:') ? rawurlencode($propertyPath) : $propertyPath;
-            $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_PROPERTY_PATH.str_replace('\\', '.', $key));
+            $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_PROPERTY_PATH.rawurlencode($propertyPath));
             if ($item->isHit()) {
                 return $this->propertyPathCache[$propertyPath] = $item->get();
             }
 
@@ -586,9 +586,13 @@ public function testAttributeWithSpecialChars()
     {
         $obj = new \stdClass();
         $obj->{'@foo'} = 'bar';
+        $obj->{'a/b'} = '1';
+        $obj->{'a%2Fb'} = '2';
 
         $propertyAccessor = new PropertyAccessor(false, false, new ArrayAdapter());
         $this->assertSame('bar', $propertyAccessor->getValue($obj, '@foo'));
+        $this->assertSame('1', $propertyAccessor->getValue($obj, 'a/b'));
+        $this->assertSame('2', $propertyAccessor->getValue($obj, 'a%2Fb'));
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -508,14 +508,14 @@ private function readProperty($zval, $property)`
`508`	`508`	`*/`
`509`	`509`	`private function getReadAccessInfo($class, $property)`
`510`	`510`	`{`
`511`		`- $key = false !== strpbrk($key = $class.'..'.$property, '{}()/@:') ? rawurlencode($key) : $key;`
	`511`	`+ $key = str_replace('\\', '.', $class).'..'.$property;`
`512`	`512`
`513`	`513`	`if (isset($this->readPropertyCache[$key])) {`
`514`	`514`	`return $this->readPropertyCache[$key];`
`515`	`515`	`}`
`516`	`516`
`517`	`517`	`if ($this->cacheItemPool) {`
`518`		`- $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_READ.str_replace('\\', '.', $key));`
	`518`	`+ $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_READ.rawurlencode($key));`
`519`	`519`	`if ($item->isHit()) {`
`520`	`520`	`return $this->readPropertyCache[$key] = $item->get();`
`521`	`521`	`}`
`@@ -687,14 +687,14 @@ private function writeCollection($zval, $property, $collection, $addMethod, $rem`
`687`	`687`	`*/`
`688`	`688`	`private function getWriteAccessInfo($class, $property, $value)`
`689`	`689`	`{`
`690`		`- $key = false !== strpbrk($key = $class.'..'.$property, '{}()/@:') ? rawurlencode($key) : $key;`
	`690`	`+ $key = str_replace('\\', '.', $class).'..'.$property;`
`691`	`691`
`692`	`692`	`if (isset($this->writePropertyCache[$key])) {`
`693`	`693`	`return $this->writePropertyCache[$key];`
`694`	`694`	`}`
`695`	`695`
`696`	`696`	`if ($this->cacheItemPool) {`
`697`		`- $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_WRITE.str_replace('\\', '.', $key));`
	`697`	`+ $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_WRITE.rawurlencode($key));`
`698`	`698`	`if ($item->isHit()) {`
`699`	`699`	`return $this->writePropertyCache[$key] = $item->get();`
`700`	`700`	`}`
`@@ -868,8 +868,7 @@ private function getPropertyPath($propertyPath)`
`868`	`868`	`}`
`869`	`869`
`870`	`870`	`if ($this->cacheItemPool) {`
`871`		`- $key = false !== strpbrk($propertyPath, '{}()/@:') ? rawurlencode($propertyPath) : $propertyPath;`
`872`		`- $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_PROPERTY_PATH.str_replace('\\', '.', $key));`
	`871`	`+ $item = $this->cacheItemPool->getItem(self::CACHE_PREFIX_PROPERTY_PATH.rawurlencode($propertyPath));`
`873`	`872`	`if ($item->isHit()) {`
`874`	`873`	`return $this->propertyPathCache[$propertyPath] = $item->get();`
`875`	`874`	`}`
Original file line number	Diff line number	Diff line change
`@@ -586,9 +586,13 @@ public function testAttributeWithSpecialChars()`
`586`	`586`	`{`
`587`	`587`	`$obj = new \stdClass();`
`588`	`588`	`$obj->{'@foo'} = 'bar';`
	`589`	`+ $obj->{'a/b'} = '1';`
	`590`	`+ $obj->{'a%2Fb'} = '2';`
`589`	`591`
`590`	`592`	`$propertyAccessor = new PropertyAccessor(false, false, new ArrayAdapter());`
`591`	`593`	`$this->assertSame('bar', $propertyAccessor->getValue($obj, '@foo'));`
	`594`	`+ $this->assertSame('1', $propertyAccessor->getValue($obj, 'a/b'));`
	`595`	`+ $this->assertSame('2', $propertyAccessor->getValue($obj, 'a%2Fb'));`
`592`	`596`	`}`
`593`	`597`
`594`	`598`	`/**`