bug #19437 [PropertyInfo] Fix an error in PropertyInfoCacheExtractor (Ener-Getick)

fabpot · fabpot · commit ac528c7cffff · 2016-08-15T16:12:25.000-07:00
This PR was squashed before being merged into the 3.1 branch (closes #19437). Discussion ---------- [PropertyInfo] Fix an error in PropertyInfoCacheExtractor | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | An argument was forgotten in the ``PropertyInfoCacheExtractor`` class leading to exceptions such as ``` PHP Warning: ucfirst() expects parameter 1 to be string, array given in /home/guilhem/github/ast-test/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php on line 318 ``` and making it unusable. ping @dunglas Commits ------- d19b151 [PropertyInfo] Fix an error in PropertyInfoCacheExtractor
diff --git a/src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php b/src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php
@@ -86,7 +86,7 @@ public function getProperties($class, array $context = array())
      */
     public function getTypes($class, $property, array $context = array())
     {
-        return $this->extract('getTypes', array($class, $context));
+        return $this->extract('getTypes', array($class, $property, $context));
     }
 
     /**
@@ -108,7 +108,7 @@ private function extract($method, array $arguments)
 
         $key = $this->escape($method.'.'.$serializedArguments);
 
-        if (isset($this->arrayCache[$key])) {
+        if (array_key_exists($key, $this->arrayCache)) {
             return $this->arrayCache[$key];
         }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/NullExtractor.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/NullExtractor.php
@@ -28,40 +28,58 @@ class NullExtractor implements PropertyListExtractorInterface, PropertyDescripti
      */
     public function getShortDescription($class, $property, array $context = array())
     {
+        $this->assertIsString($class);
+        $this->assertIsString($property);
     }
 
     /**
      * {@inheritdoc}
      */
     public function getLongDescription($class, $property, array $context = array())
     {
+        $this->assertIsString($class);
+        $this->assertIsString($property);
     }
 
     /**
      * {@inheritdoc}
      */
     public function getTypes($class, $property, array $context = array())
     {
+        $this->assertIsString($class);
+        $this->assertIsString($property);
     }
 
     /**
      * {@inheritdoc}
      */
     public function isReadable($class, $property, array $context = array())
     {
+        $this->assertIsString($class);
+        $this->assertIsString($property);
     }
 
     /**
      * {@inheritdoc}
      */
     public function isWritable($class, $property, array $context = array())
     {
+        $this->assertIsString($class);
+        $this->assertIsString($property);
     }
 
     /**
      * {@inheritdoc}
      */
     public function getProperties($class, array $context = array())
     {
+        $this->assertIsString($class);
+    }
+
+    private function assertIsString($string)
+    {
+        if (!is_string($string)) {
+            throw new \InvalidArgumentException(sprintf('"%s" expects strings, given "%s".', __CLASS__, gettype($string)));
+        }
     }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/PropertyInfoCacheExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/PropertyInfoCacheExtractorTest.php
@@ -26,15 +26,40 @@ protected function setUp()
         $this->propertyInfo = new PropertyInfoCacheExtractor($this->propertyInfo, new ArrayAdapter());
     }
 
-    public function testCache()
+    public function testGetShortDescription()
     {
-        $this->assertSame('short', $this->propertyInfo->getShortDescription('Foo', 'bar', array()));
-        $this->assertSame('short', $this->propertyInfo->getShortDescription('Foo', 'bar', array()));
+        parent::testGetShortDescription();
+        parent::testGetShortDescription();
     }
 
-    public function testNotSerializableContext()
+    public function testGetLongDescription()
     {
-        $this->assertSame('short', $this->propertyInfo->getShortDescription('Foo', 'bar', array('foo' => function () {})));
+        parent::testGetLongDescription();
+        parent::testGetLongDescription();
+    }
+
+    public function testGetTypes()
+    {
+        parent::testGetTypes();
+        parent::testGetTypes();
+    }
+
+    public function testIsReadable()
+    {
+        parent::testIsReadable();
+        parent::testIsReadable();
+    }
+
+    public function testIsWritable()
+    {
+        parent::testIsWritable();
+        parent::testIsWritable();
+    }
+
+    public function testGetProperties()
+    {
+        parent::testGetProperties();
+        parent::testGetProperties();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function getProperties($class, array $context = array())`
`86`	`86`	`*/`
`87`	`87`	`public function getTypes($class, $property, array $context = array())`
`88`	`88`	`{`
`89`		`- return $this->extract('getTypes', array($class, $context));`
	`89`	`+ return $this->extract('getTypes', array($class, $property, $context));`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`/**`
`@@ -108,7 +108,7 @@ private function extract($method, array $arguments)`
`108`	`108`
`109`	`109`	`$key = $this->escape($method.'.'.$serializedArguments);`
`110`	`110`
`111`		`- if (isset($this->arrayCache[$key])) {`
	`111`	`+ if (array_key_exists($key, $this->arrayCache)) {`
`112`	`112`	`return $this->arrayCache[$key];`
`113`	`113`	`}`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -28,40 +28,58 @@ class NullExtractor implements PropertyListExtractorInterface, PropertyDescripti`
`28`	`28`	`*/`
`29`	`29`	`public function getShortDescription($class, $property, array $context = array())`
`30`	`30`	`{`
	`31`	`+ $this->assertIsString($class);`
	`32`	`+ $this->assertIsString($property);`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`/**`
`34`	`36`	`* {@inheritdoc}`
`35`	`37`	`*/`
`36`	`38`	`public function getLongDescription($class, $property, array $context = array())`
`37`	`39`	`{`
	`40`	`+ $this->assertIsString($class);`
	`41`	`+ $this->assertIsString($property);`
`38`	`42`	`}`
`39`	`43`
`40`	`44`	`/**`
`41`	`45`	`* {@inheritdoc}`
`42`	`46`	`*/`
`43`	`47`	`public function getTypes($class, $property, array $context = array())`
`44`	`48`	`{`
	`49`	`+ $this->assertIsString($class);`
	`50`	`+ $this->assertIsString($property);`
`45`	`51`	`}`
`46`	`52`
`47`	`53`	`/**`
`48`	`54`	`* {@inheritdoc}`
`49`	`55`	`*/`
`50`	`56`	`public function isReadable($class, $property, array $context = array())`
`51`	`57`	`{`
	`58`	`+ $this->assertIsString($class);`
	`59`	`+ $this->assertIsString($property);`
`52`	`60`	`}`
`53`	`61`
`54`	`62`	`/**`
`55`	`63`	`* {@inheritdoc}`
`56`	`64`	`*/`
`57`	`65`	`public function isWritable($class, $property, array $context = array())`
`58`	`66`	`{`
	`67`	`+ $this->assertIsString($class);`
	`68`	`+ $this->assertIsString($property);`
`59`	`69`	`}`
`60`	`70`
`61`	`71`	`/**`
`62`	`72`	`* {@inheritdoc}`
`63`	`73`	`*/`
`64`	`74`	`public function getProperties($class, array $context = array())`
`65`	`75`	`{`
	`76`	`+ $this->assertIsString($class);`
	`77`	`+ }`
	`78`	`+`
	`79`	`+ private function assertIsString($string)`
	`80`	`+ {`
	`81`	`+ if (!is_string($string)) {`
	`82`	`+ throw new \InvalidArgumentException(sprintf('"%s" expects strings, given "%s".', __CLASS__, gettype($string)));`
	`83`	`+ }`
`66`	`84`	`}`
`67`	`85`	`}`