fix isA*Of exception messages

Author: smoench

src/Assert.php

@@ -467,8 +467,8 @@ public static function isAOf($value, $class, $message = '')
 
         if (!\is_a($value, $class, \is_string($value))) {
             static::reportInvalidArgument(sprintf(
-                $message ?: 'Expected an instance of this class or to this class among his parents %2$s. Got: %s',
-                static::typeToString($value),
+                $message ?: 'Expected an instance of this class or to this class among its parents "%2$s". Got: %s',
+                static::valueToString($value),
                 $class
             ));
         }
@@ -493,8 +493,8 @@ public static function isNotA($value, $class, $message = '')
 
         if (\is_a($value, $class, \is_string($value))) {
             static::reportInvalidArgument(sprintf(
-                $message ?: 'Expected an instance of this class or to this class among his parents other than %2$s. Got: %s',
-                static::typeToString($value),
+                $message ?: 'Expected an instance of this class or to this class among its parents other than "%2$s". Got: %s',
+                static::valueToString($value),
                 $class
             ));
         }
@@ -521,9 +521,9 @@ public static function isAnyOf($value, array $classes, $message = '')
         }
 
         static::reportInvalidArgument(sprintf(
-            $message ?: 'Expected an any of instance of this class or to this class among his parents other than %2$s. Got: %s',
-            static::typeToString($value),
-            \implode(', ', \array_map(array('static', 'valueToString'), $classes))
+            $message ?: 'Expected an instance of any of this classes or any of those classes among their parents "%2$s". Got: %s',
+            static::valueToString($value),
+            \implode(', ', $classes)
         ));
     }
 

tests/AssertTest.php

@@ -717,7 +717,7 @@ public function getStringConversions()
      */
     public function testConvertValuesToStrings($method, $args, $exceptionMessage)
     {
-        $this->expectException('\InvalidArgumentException', $exceptionMessage);
+        $this->expectException('\InvalidArgumentException');
         $this->expectExceptionMessage($exceptionMessage);
 
         call_user_func_array(array('Webmozart\Assert\Assert', $method), $args);
@@ -729,6 +729,27 @@ public function testAnUnknownMethodThrowsABadMethodCall()
 
         Assert::nonExistentMethod();
     }
+
+    public function getInvalidIsAOfCases()
+    {
+        return array(
+            array(array('stdClass', 123), 'Expected class as a string. Got: integer'),
+            array(array('Iterator', 'ArrayIterator'), 'Expected an instance of this class or to this class among his parents "ArrayIterator". Got: "Iterator"'),
+            array(array(123, 'Iterator'), 'Expected an instance of this class or to this class among his parents "Iterator". Got: 123'),
+            array(array(array(), 'Iterator'), 'Expected an instance of this class or to this class among his parents "Iterator". Got: array'),
+        );
+    }
+
+    /**
+     * @dataProvider getInvalidIsAOfCases
+     */
+    public function testIsAOfExceptionMessages($args, $exceptionMessage)
+    {
+        $this->expectException('\InvalidArgumentException');
+        $this->expectExceptionMessage($exceptionMessage);
+
+        call_user_func_array(array('Webmozart\Assert\Assert', 'isAOf'), $args);
+    }
 }
 
 /**