Added support for ArrayAccess based arrays in

Author: exts

src/Framework/Assert.php

@@ -62,14 +62,14 @@ public static function assertArrayHasKey($key, $array, $message = '')
      */
     public static function assertArraySubset($subset, $array, $strict = false, $message = '')
     {
-        if (!is_array($subset)) {
+        if (!(is_array($subset) || $subset instanceof ArrayAccess)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(
                 1,
                 'array or ArrayAccess'
             );
         }
 
-        if (!is_array($array)) {
+        if (!(is_array($array) || $array instanceof ArrayAccess)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(
                 2,
                 'array or ArrayAccess'

tests/Framework/AssertTest.php

@@ -182,6 +182,11 @@ public function testAssertArraySubset()
         $this->assertArraySubset(array('a' => 'item a', 'c' => array('a2' => 'item a2')), $array);
         $this->assertArraySubset(array('a' => 'item a', 'd' => array('a2' => array('b3' => 'item b3'))), $array);
 
+        $arrayAccessData = new ArrayObject($array);
+
+        $this->assertArraySubset(['a' => 'item a', 'c' => ['a2' => 'item a2']], $arrayAccessData);
+        $this->assertArraySubset(['a' => 'item a', 'd' => ['a2' => ['b3' => 'item b3']]], $arrayAccessData);
+
         try {
             $this->assertArraySubset(array('a' => 'bad value'), $array);
         } catch (PHPUnit_Framework_AssertionFailedError $e) {