add property path to exception message when error writing property

rodnaph · rodnaph · commit 473a025643cc · 2018-06-12T16:19:40.000+01:00
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -151,22 +151,22 @@ public function setValue(&$objectOrArray, $propertyPath, $value)
                 $value = $zval[self::VALUE];
             }
         } catch (\TypeError $e) {
-            self::throwInvalidArgumentException($e->getMessage(), $e->getTrace(), 0);
+            self::throwInvalidArgumentException($e->getMessage(), $e->getTrace(), 0, $propertyPath);
 
             // It wasn't thrown in this class so rethrow it
             throw $e;
         }
     }
 
-    private static function throwInvalidArgumentException($message, $trace, $i)
+    private static function throwInvalidArgumentException($message, $trace, $i, $propertyPath)
     {
         if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file'] && isset($trace[$i]['args'][0])) {
             $pos = strpos($message, $delim = 'must be of the type ') ?: (strpos($message, $delim = 'must be an instance of ') ?: strpos($message, $delim = 'must implement interface '));
             $pos += strlen($delim);
             $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 at property path "%s".', substr($message, $pos, strpos($message, ',', $pos) - $pos), $type, $propertyPath));
         }
     }
 
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -529,7 +529,7 @@ public function testIsWritableForReferenceChainIssue($object, $path, $value)
 
     /**
      * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Expected argument of type "DateTime", "string" given
+     * @expectedExceptionMessage Expected argument of type "DateTime", "string" given at property path "date"
      */
     public function testThrowTypeError()
     {

Original file line number	Diff line number	Diff line change
`@@ -151,22 +151,22 @@ public function setValue(&$objectOrArray, $propertyPath, $value)`
`151`	`151`	`$value = $zval[self::VALUE];`
`152`	`152`	`}`
`153`	`153`	`} catch (\TypeError $e) {`
`154`		`- self::throwInvalidArgumentException($e->getMessage(), $e->getTrace(), 0);`
	`154`	`+ self::throwInvalidArgumentException($e->getMessage(), $e->getTrace(), 0, $propertyPath);`
`155`	`155`
`156`	`156`	`// It wasn't thrown in this class so rethrow it`
`157`	`157`	`throw $e;`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`
`161`		`- private static function throwInvalidArgumentException($message, $trace, $i)`
	`161`	`+ private static function throwInvalidArgumentException($message, $trace, $i, $propertyPath)`
`162`	`162`	`{`
`163`	`163`	`if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file'] && isset($trace[$i]['args'][0])) {`
`164`	`164`	`$pos = strpos($message, $delim = 'must be of the type ') ?: (strpos($message, $delim = 'must be an instance of ') ?: strpos($message, $delim = 'must implement interface '));`
`165`	`165`	`$pos += strlen($delim);`
`166`	`166`	`$type = $trace[$i]['args'][0];`
`167`	`167`	`$type = is_object($type) ? get_class($type) : gettype($type);`
`168`	`168`
`169`		`- throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given.', substr($message, $pos, strpos($message, ',', $pos) - $pos), $type));`
	`169`	`+ throw new InvalidArgumentException(sprintf('Expected argument of type "%s", "%s" given at property path "%s".', substr($message, $pos, strpos($message, ',', $pos) - $pos), $type, $propertyPath));`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`
Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ public function testIsWritableForReferenceChainIssue($object, $path, $value)`
`529`	`529`
`530`	`530`	`/**`
`531`	`531`	`* @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidArgumentException`
`532`		`- * @expectedExceptionMessage Expected argument of type "DateTime", "string" given`
	`532`	`+ * @expectedExceptionMessage Expected argument of type "DateTime", "string" given at property path "date"`
`533`	`533`	`*/`
`534`	`534`	`public function testThrowTypeError()`
`535`	`535`	`{`