[PropertyAccess] Handle interfaces in the invalid argument exception

fancyweb · fabpot · commit be52b390315e · 2017-01-25T07:13:54.000-08:00
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -246,7 +246,7 @@ public static function handleError($type, $message, $file, $line, $context)
     private static function throwInvalidArgumentException($message, $trace, $i)
     {
         if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file']) {
-            $pos = strpos($message, $delim = 'must be of the type ') ?: strpos($message, $delim = 'must be an instance of ');
+            $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);
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TypeHinted.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TypeHinted.php
@@ -18,6 +18,11 @@ class TypeHinted
 {
     private $date;
 
+    /**
+     * @var \Countable
+     */
+    private $countable;
+
     public function setDate(\DateTime $date)
     {
         $this->date = $date;
@@ -27,4 +32,20 @@ public function getDate()
     {
         return $this->date;
     }
+
+    /**
+     * @return \Countable
+     */
+    public function getCountable()
+    {
+        return $this->countable;
+    }
+
+    /**
+     * @param \Countable $countable
+     */
+    public function setCountable(\Countable $countable)
+    {
+        $this->countable = $countable;
+    }
 }
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -554,4 +554,15 @@ public function testArrayNotBeeingOverwritten()
         $this->assertSame('baz', $this->propertyAccessor->getValue($object, 'publicAccessor[value2]'));
         $this->assertSame(array('value1' => 'foo', 'value2' => 'baz'), $object->getPublicAccessor());
     }
+
+    /**
+     * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Expected argument of type "Countable", "string" given
+     */
+    public function testThrowTypeErrorWithInterface()
+    {
+        $object = new TypeHinted();
+
+        $this->propertyAccessor->setValue($object, 'countable', 'This is a string, \Countable expected.');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public static function handleError($type, $message, $file, $line, $context)`
`246`	`246`	`private static function throwInvalidArgumentException($message, $trace, $i)`
`247`	`247`	`{`
`248`	`248`	`if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file']) {`
`249`		`- $pos = strpos($message, $delim = 'must be of the type ') ?: strpos($message, $delim = 'must be an instance of ');`
	`249`	`+ $pos = strpos($message, $delim = 'must be of the type ') ?: (strpos($message, $delim = 'must be an instance of ') ?: strpos($message, $delim = 'must implement interface '));`
`250`	`250`	`$pos += strlen($delim);`
`251`	`251`	`$type = $trace[$i]['args'][0];`
`252`	`252`	`$type = is_object($type) ? get_class($type) : gettype($type);`