Code Coverage

refs #23

Author: Art4

src/Link.php

@@ -44,12 +44,12 @@ public function __construct($object, FactoryManagerInterface $manager, AccessInt
 	{
 		if ( ! is_object($object) )
 		{
-			throw new ValidationException('Link has to be an object, "' . gettype($object) . '" given.');
+			throw new ValidationException('Link has to be an object or string, "' . gettype($object) . '" given.');
 		}
 
 		if ( ! array_key_exists('href', $object) )
 		{
-			throw new ValidationException('Link must habe a "href" attribute.');
+			throw new ValidationException('Link must have a "href" attribute.');
 		}
 
 		$this->parent = $parent;
@@ -58,14 +58,7 @@ public function __construct($object, FactoryManagerInterface $manager, AccessInt
 
 		$this->container = new DataContainer();
 
-		$object_vars = get_object_vars($object);
-
-		if ( count($object_vars) === 0 )
-		{
-			return $this;
-		}
-
-		foreach ($object_vars as $name => $value)
+		foreach (get_object_vars($object) as $name => $value)
 		{
 			$this->set($name, $value);
 		}
@@ -101,7 +94,7 @@ public function get($key)
 	 */
 	protected function set($name, $link)
 	{
-		if ( $name === 'meta' and ! $this->parent instanceof ItemInterface )
+		if ( $name === 'meta' )
 		{
 			$this->container->set($name, $this->manager->getFactory()->make(
 				'Meta',
@@ -111,29 +104,13 @@ protected function set($name, $link)
 			return $this;
 		}
 
-		// from spec: an object ("link object") which can contain the following members:
-		// - href: a string containing the link's URL.
-		if ( $name === 'href' or ! is_object($link) )
+		// every link must be an URL
+		if ( ! is_string($link) )
 		{
-			if ( ! is_string($link) )
-			{
-				throw new ValidationException('Link has to be an object or string, "' . gettype($link) . '" given.');
-			}
-
-			$this->container->set($name, strval($link));
-
-			return $this;
+			throw new ValidationException('Every link attribute has to be a string, "' . gettype($link) . '" given.');
 		}
 
-		// Now $link can only be an object
-		// Create Link object if needed
-		if ( ! ($link instanceof LinkInterface) )
-		{
-			$this->container->set($name, $this->manager->getFactory()->make(
-				'Link',
-				[$link, $this->manager, $this]
-			));
-		}
+		$this->container->set($name, strval($link));
 
 		return $this;
 	}

tests/unit/LinkTest.php

@@ -87,24 +87,42 @@ public function testHrefHasToBeAString($input)
 			return;
 		}
 
-		$this->setExpectedException('Art4\JsonApiClient\Exception\ValidationException');
+		$this->setExpectedException(
+			'Art4\JsonApiClient\Exception\ValidationException',
+			'Every link attribute has to be a string, "' . gettype($input) . '" given.'
+		);
+
+		$link = new Link($object, $this->manager, $this->parent_link);
+	}
+
+	/**
+	 * @test href attribute must be set
+	 *
+	 * - an object ("link object") which can contain the following members:
+	 *   - href: a string containing the link's URL.
+	 */
+	public function testHrefAttributeMustBeSet()
+	{
+		$object = new \stdClass();
+		$object->related = 'http://example.org/related';
+
+		$this->setExpectedException(
+			'Art4\JsonApiClient\Exception\ValidationException',
+			'Link must have a "href" attribute.'
+		);
 
 		$link = new Link($object, $this->manager, $this->parent_link);
 	}
 
 	/**
 	 * @test meta attribute will be parsed as Meta object inside Link
 	 */
-	public function testMetaIsParsedAsMetaInsideItem()
+	public function testMetaIsParsedAsObject()
 	{
 		$object = new \stdClass();
 		$object->meta = new \stdClass();
 		$object->href = 'http://example.org/href';
 
-		// Mock parent link
-		$this->parent_link = $this->getMockBuilder('Art4\JsonApiClient\LinkInterface')
-			->getMock();
-
 		$link = new Link($object, $this->manager, $this->parent_link);
 
 		$this->assertTrue($link->has('meta'));
@@ -118,15 +136,15 @@ public function testMetaIsParsedAsMetaInsideItem()
 	 */
 	public function testCreateWithDataprovider($input)
 	{
-		// A link object could be empty
+		// A link object must be an object
 		if ( gettype($input) === 'object' )
 		{
 			return;
 		}
 
 		$this->setExpectedException(
 			'Art4\JsonApiClient\Exception\ValidationException',
-			'Link has to be an object, "' . gettype($input) . '" given.'
+			'Link has to be an object or string, "' . gettype($input) . '" given.'
 		);
 
 		$link = new Link($input, $this->manager, $this->parent_link);