Merge branch 'master' into feature-factory

src/Utils/AccessTrait.php

@@ -7,18 +7,48 @@
  */
 trait AccessTrait
 {
+	/**
+	 * Transforms objects to arrays
+	 *
+	 * @param $val
+	 * @return mixed
+	 */
+	protected function objectTransform($val)
+	{
+		if (!is_object($val))
+		{
+			return $val;
+		}
+		elseif (is_callable([$val, 'asArray']))
+		{
+			return $val->asArray(true);
+		}
+		else
+		{
+			// Fallback for stdClass objects
+			return json_decode(json_encode($val), true);
+		}
+	}
+
 	/**
 	 * Convert this object in an array
 	 *
+	 * @param bool $fullArray If true, objects are transformed into arrays recursively
 	 * @return array
 	 */
-	public function asArray()
+	public function asArray($fullArray = false)
 	{
 		$return = array();
 
 		foreach($this->getKeys() as $key)
 		{
-			$return[$key] = $this->get($key);
+			$val = $this->get($key);
+
+			if ($fullArray) {
+				$return[$key] = $this->objectTransform($val);
+			} else {
+				$return[$key] = $val;
+			}
 		}
 
 		return $return;

tests/integration/IntegrationTest.php

@@ -43,6 +43,9 @@ public function testParseSimpleResource()
 		$this->assertInstanceOf('Art4\JsonApiClient\Attributes', $resource->get('attributes'));
 		$this->assertTrue($resource->has('relationships'));
 		$this->assertInstanceOf('Art4\JsonApiClient\RelationshipCollection', $resource->get('relationships'));
+
+		// Test full array
+		$this->assertEquals(json_decode($string, true), $document->asArray(true));
 	}
 
 	/**
@@ -67,6 +70,9 @@ public function testParseSimpleResourceIdentifier()
 		$this->assertFalse($resource->has('meta'));
 		$this->assertSame($resource->get('type'), 'articles');
 		$this->assertSame($resource->get('id'), '1');
+
+		// Test full array
+		$this->assertEquals(json_decode($string, true), $document->asArray(true));
 	}
 
 	/**
@@ -124,6 +130,9 @@ public function testParseResourceObject()
 		$this->assertInstanceOf('Art4\JsonApiClient\Resource\Identifier', $data);
 		$this->assertSame($data->get('type'), 'people');
 		$this->assertSame($data->get('id'), '9');
+
+		// Test full array
+		$this->assertEquals(json_decode($string, true), $document->asArray(true));
 	}
 
 	/**
@@ -300,5 +309,8 @@ public function testParseCompleteResourceObjectWithMultipleRelationships()
 		$this->assertInstanceOf('Art4\JsonApiClient\Link', $links);
 		$this->assertTrue($links->has('self'));
 		$this->assertSame($links->get('self'), 'http://example.com/comments/12');
+
+		// Test full array
+		$this->assertEquals(json_decode($string, true), $document->asArray(true));
 	}
 }

tests/unit/AttributesTest.php

@@ -56,6 +56,18 @@ public function testCreateWithObject()
 			'false' => $attributes->get('false'),
 			'null' => $attributes->get('null'),
 		));
+
+		// Test full array
+		$this->assertSame($attributes->asArray(true), array(
+			'object' => (array) $attributes->get('object'),
+			'array' => $attributes->get('array'),
+			'string' => $attributes->get('string'),
+			'number_int' => $attributes->get('number_int'),
+			'number_float' => $attributes->get('number_float'),
+			'true' => $attributes->get('true'),
+			'false' => $attributes->get('false'),
+			'null' => $attributes->get('null'),
+		));
 	}
 
 	/**

tests/unit/DocumentLinkTest.php

@@ -44,6 +44,13 @@ public function testOnlySelfRelatedPaginationPropertiesExists()
 			'related' => $link->get('related'),
 			'pagination' => $link->get('pagination'),
 		));
+
+		// Test full array
+		$this->assertSame($link->asArray(true), array(
+			'self' => $link->get('self'),
+			'related' => $link->get('related'),
+			'pagination' => $link->get('pagination')->asArray(true),
+		));
 	}
 
 	/**

tests/unit/DocumentTest.php

@@ -34,6 +34,11 @@ public function testCreateWithObjectReturnsSelf()
 		$this->assertSame($document->asArray(), array(
 			'meta' => $document->get('meta'),
 		));
+
+		// Test full array
+		$this->assertSame($document->asArray(true), array(
+			'meta' => $document->get('meta')->asArray(true),
+		));
 	}
 
 	/**

tests/unit/ErrorCollectionTest.php

@@ -41,6 +41,12 @@ public function testCreate()
 			$collection->get(0),
 			$collection->get(1),
 		));
+
+		// Test full array
+		$this->assertSame($collection->asArray(true), array(
+			$collection->get(0)->asArray(true),
+			$collection->get(1)->asArray(true),
+		));
 	}
 
 	/**

tests/unit/ErrorLinkTest.php

@@ -37,6 +37,11 @@ public function testOnlyAboutPropertyExists()
 		$this->assertSame($link->asArray(), array(
 			'about' => $link->get('about'),
 		));
+
+		// Test full array
+		$this->assertSame($link->asArray(true), array(
+			'about' => $link->get('about'),
+		));
 	}
 
 	/**

tests/unit/ErrorSourceTest.php

@@ -39,6 +39,12 @@ public function testOnlyPointerParameterPropertiesExists()
 			'pointer' => $source->get('pointer'),
 			'parameter' => $source->get('parameter'),
 		));
+
+		// Test full array
+		$this->assertSame($source->asArray(true), array(
+			'pointer' => $source->get('pointer'),
+			'parameter' => $source->get('parameter'),
+		));
 	}
 
 	/**

tests/unit/ErrorTest.php

@@ -58,6 +58,18 @@ public function testCreateWithObjectReturnsSelf()
 			'source' => $error->get('source'),
 			'meta'   => $error->get('meta'),
 		));
+
+		// Test full array
+		$this->assertSame($error->asArray(true), array(
+			'id'     => 'id',
+			'links'  => $error->get('links')->asArray(true),
+			'status' => 'status',
+			'code'   => 'code',
+			'title'  => 'title',
+			'detail' => 'detail',
+			'source' => $error->get('source')->asArray(true),
+			'meta'   => $error->get('meta')->asArray(true),
+		));
 	}
 
 	/**

tests/unit/JsonapiTest.php

@@ -41,6 +41,12 @@ public function testCreateWithObject()
 			'version' => $jsonapi->get('version'),
 			'meta' => $jsonapi->get('meta'),
 		));
+
+		// Test full array
+		$this->assertSame($jsonapi->asArray(true), array(
+			'version' => $jsonapi->get('version'),
+			'meta' => $jsonapi->get('meta')->asArray(true),
+		));
 	}
 
 	/**

tests/unit/LinkTest.php

@@ -41,6 +41,14 @@ public function testCreateWithObject()
 			'link' => $link->get('link'),
 			'meta' => $link->get('meta'),
 		));
+
+		// Test full array
+		$this->assertSame($link->asArray(true), array(
+			'href' => $link->get('href'),
+			'linkobj' => $link->get('linkobj')->asArray(true),
+			'link' => $link->get('link'),
+			'meta' => $link->get('meta')->asArray(true),
+		));
 	}
 
 	/**

tests/unit/MetaTest.php

@@ -57,6 +57,18 @@ public function testCreateWithObject()
 			'false' => false,
 			'null' => null,
 		));
+
+		// Test full array
+		$this->assertSame($meta->asArray(true), array(
+			'object' => (array) $meta->get('object'),
+			'array' => array(),
+			'string' => 'string',
+			'number_int' => 654,
+			'number_float' => 654.321,
+			'true' => true,
+			'false' => false,
+			'null' => null,
+		));
 	}
 
 	/**

tests/unit/PaginationLinkTest.php

@@ -46,6 +46,12 @@ public function testOnlyPaginationPropertiesExists()
 			'last' => $link->get('last'),
 			'next' => $link->get('next'),
 		));
+
+		// Test full array
+		$this->assertSame($link->asArray(true), array(
+			'last' => $link->get('last'),
+			'next' => $link->get('next'),
+		));
 	}
 
 	/**

tests/unit/RelationshipCollectionTest.php

@@ -38,6 +38,11 @@ public function testCreateWithObject()
 		$this->assertSame($collection->asArray(), array(
 			'author' => $collection->get('author'),
 		));
+
+		// Test full array
+		$this->assertSame($collection->asArray(true), array(
+			'author' => $collection->get('author')->asArray(true),
+		));
 	}
 
 	/**

tests/unit/RelationshipLinkTest.php

@@ -48,6 +48,13 @@ public function testOnlySelfRelatedPaginationPropertiesExists()
 			'related' => $link->get('related'),
 			'pagination' => $link->get('pagination'),
 		));
+
+		// Test full array
+		$this->assertSame($link->asArray(true), array(
+			'self' => $link->get('self'),
+			'related' => $link->get('related'),
+			'pagination' => $link->get('pagination')->asArray(true),
+		));
 	}
 
 	/**

tests/unit/RelationshipTest.php

@@ -27,6 +27,9 @@ public function testCreateWithObjectReturnsSelf()
 		$meta = $relationship->get('meta');
 
 		$this->assertSame($relationship->asArray(), array('meta' => $meta));
+
+		// Test full array
+		$this->assertSame($relationship->asArray(true), array('meta' => $meta->asArray(true)));
 	}
 
 	/**
@@ -79,6 +82,9 @@ public function testCreateWithLinksObject()
 		$this->assertInstanceOf('Art4\JsonApiClient\RelationshipLink', $links);
 
 		$this->assertSame($relationship->asArray(), array('links' => $links));
+
+		// Test full array
+		$this->assertSame($relationship->asArray(true), array('links' => $links->asArray(true)));
 	}
 
 	/**

tests/unit/Resource/CollectionTest.php

@@ -69,6 +69,12 @@ public function testCreateWithIdentifier()
 			$collection->get(1),
 			$collection->get(2),
 		));
+
+		$this->assertSame($collection->asArray(true), array(
+			$collection->get(0)->asArray(true),
+			$collection->get(1)->asArray(true),
+			$collection->get(2)->asArray(true),
+		));
 	}
 
 	/**

tests/unit/Resource/IdentifierTest.php

@@ -37,6 +37,11 @@ public function testCreateWithObject()
 			'type' => $identifier->get('type'),
 			'id' => $identifier->get('id'),
 		));
+
+		$this->assertSame($identifier->asArray(true), array(
+			'type' => $identifier->get('type'),
+			'id' => $identifier->get('id'),
+		));
 	}
 
 	/**

tests/unit/Resource/ItemTest.php

@@ -73,5 +73,14 @@ public function testCreateWithFullObject()
 			'relationships' => $resource->get('relationships'),
 			'links' => $resource->get('links'),
 		));
+
+		// Test full array
+		$this->assertSame($resource->asArray(true), array(
+			'type' => $resource->get('type'),
+			'id' => $resource->get('id'),
+			'attributes' => $resource->get('attributes')->asArray(true),
+			'relationships' => $resource->get('relationships')->asArray(true),
+			'links' => $resource->get('links')->asArray(true),
+		));
 	}
 }

tests/unit/Resource/NullResourceTest.php

@@ -26,5 +26,8 @@ public function testCreateWithDataProvider($input)
 		$this->assertFalse($resource->isCollection());
 
 		$this->assertSame($resource->asArray(), null);
+
+		// Test full array
+		$this->assertSame($resource->asArray(true), null);
 	}
 }