[PropertyAccess] add more information to NoSuchPropertyException Message

Amrouche Hamza · Amrouche Hamza · commit dee00f839381 · 2017-12-11T23:43:31.000+01:00
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -167,7 +167,7 @@ private static function throwInvalidArgumentException($message, $trace, $i)
             $type = $trace[$i]['args'][0];
             $type = is_object($type) ? get_class($type) : gettype($type);
 
-            throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given', substr($message, $pos, strpos($message, ',', $pos) - $pos), $type));
+            throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given.', substr($message, $pos, strpos($message, ',', $pos) - $pos), $type));
         }
     }
 
@@ -500,7 +500,7 @@ private function getReadAccessInfo($class, $property)
     private function writeIndex($zval, $index, $value)
     {
         if (!$zval[self::VALUE] instanceof \ArrayAccess && !is_array($zval[self::VALUE])) {
-            throw new NoSuchIndexException(sprintf('Cannot modify index "%s" in object of type "%s" because it doesn\'t implement \ArrayAccess', $index, get_class($zval[self::VALUE])));
+            throw new NoSuchIndexException(sprintf('Cannot modify index "%s" in object of type "%s" because it doesn\'t implement \ArrayAccess.', $index, get_class($zval[self::VALUE])));
         }
 
         $zval[self::REF][$index] = $value;
@@ -541,7 +541,7 @@ private function writeProperty($zval, $property, $value)
         } elseif (self::ACCESS_TYPE_MAGIC === $access[self::ACCESS_TYPE]) {
             $object->{$access[self::ACCESS_NAME]}($value);
         } elseif (self::ACCESS_TYPE_NOT_FOUND === $access[self::ACCESS_TYPE]) {
-            throw new NoSuchPropertyException(sprintf('Could not determine access type for property "%s" in class "%s".', $property, get_class($object)));
+            throw new NoSuchPropertyException(sprintf('Could not determine access type for property "%s" in class "%s"%s.', $property, get_class($object), isset($access[self::ACCESS_NAME]) ? ': '.$access[self::ACCESS_NAME] : ''));
         } else {
             throw new NoSuchPropertyException($access[self::ACCESS_NAME]);
         }
@@ -589,7 +589,7 @@ private function writeCollection($zval, $property, $collection, $addMethod, $rem
     /**
      * Guesses how to write the property value.
      *
-     * @param mixed  $value
+     * @param mixed $value
      */
     private function getWriteAccessInfo(string $class, string $property, $value): array
     {

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ private static function throwInvalidArgumentException($message, $trace, $i)`
`167`	`167`	`$type = $trace[$i]['args'][0];`
`168`	`168`	`$type = is_object($type) ? get_class($type) : gettype($type);`
`169`	`169`
`170`		`- throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given', substr($message, $pos, strpos($message, ',', $pos) - $pos), $type));`
	`170`	`+ throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given.', substr($message, $pos, strpos($message, ',', $pos) - $pos), $type));`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
`@@ -500,7 +500,7 @@ private function getReadAccessInfo($class, $property)`
`500`	`500`	`private function writeIndex($zval, $index, $value)`
`501`	`501`	`{`
`502`	`502`	`if (!$zval[self::VALUE] instanceof \ArrayAccess && !is_array($zval[self::VALUE])) {`
`503`		`- throw new NoSuchIndexException(sprintf('Cannot modify index "%s" in object of type "%s" because it doesn\'t implement \ArrayAccess', $index, get_class($zval[self::VALUE])));`
	`503`	`+ throw new NoSuchIndexException(sprintf('Cannot modify index "%s" in object of type "%s" because it doesn\'t implement \ArrayAccess.', $index, get_class($zval[self::VALUE])));`
`504`	`504`	`}`
`505`	`505`
`506`	`506`	`$zval[self::REF][$index] = $value;`
`@@ -541,7 +541,7 @@ private function writeProperty($zval, $property, $value)`
`541`	`541`	`} elseif (self::ACCESS_TYPE_MAGIC === $access[self::ACCESS_TYPE]) {`
`542`	`542`	`$object->{$access[self::ACCESS_NAME]}($value);`
`543`	`543`	`} elseif (self::ACCESS_TYPE_NOT_FOUND === $access[self::ACCESS_TYPE]) {`
`544`		`- throw new NoSuchPropertyException(sprintf('Could not determine access type for property "%s" in class "%s".', $property, get_class($object)));`
	`544`	`+ throw new NoSuchPropertyException(sprintf('Could not determine access type for property "%s" in class "%s"%s.', $property, get_class($object), isset($access[self::ACCESS_NAME]) ? ': '.$access[self::ACCESS_NAME] : ''));`
`545`	`545`	`} else {`
`546`	`546`	`throw new NoSuchPropertyException($access[self::ACCESS_NAME]);`
`547`	`547`	`}`
`@@ -589,7 +589,7 @@ private function writeCollection($zval, $property, $collection, $addMethod, $rem`
`589`	`589`	`/**`
`590`	`590`	`* Guesses how to write the property value.`
`591`	`591`	`*`
`592`		`- * @param mixed $value`
	`592`	`+ * @param mixed $value`
`593`	`593`	`*/`
`594`	`594`	`private function getWriteAccessInfo(string $class, string $property, $value): array`
`595`	`595`	`{`