Bugfix: Better decision if ResourceIdentifier or ResourceItem

Art4 · Art4 · commit 1ead0e777ec7 · 2017-06-01T12:59:12.000+02:00
diff --git a/src/Document.php b/src/Document.php
@@ -205,11 +205,12 @@ protected function parseData($data)
 			throw new ValidationException('Data value has to be null or an object, "' . gettype($data) . '" given.');
 		}
 
-		$object_vars = get_object_vars($data);
+		$object_keys = array_keys(get_object_vars($data));
+		sort($object_keys);
 
 		// the properties must be type and id or
 		// the 3 properties must be type, id and meta
-		if ( count($object_vars) === 2 or (count($object_vars) === 3 and property_exists($data, 'meta')) )
+		if ( $object_keys === ['id', 'type'] or $object_keys === ['id', 'meta', 'type'] )
 		{
 			$resource = $this->manager->getFactory()->make(
 				'ResourceIdentifier',

Original file line number	Diff line number	Diff line change
`@@ -205,11 +205,12 @@ protected function parseData($data)`
`205`	`205`	`throw new ValidationException('Data value has to be null or an object, "' . gettype($data) . '" given.');`
`206`	`206`	`}`
`207`	`207`
`208`		`- $object_vars = get_object_vars($data);`
	`208`	`+ $object_keys = array_keys(get_object_vars($data));`
	`209`	`+ sort($object_keys);`
`209`	`210`
`210`	`211`	`// the properties must be type and id or`
`211`	`212`	`// the 3 properties must be type, id and meta`
`212`		`- if ( count($object_vars) === 2 or (count($object_vars) === 3 and property_exists($data, 'meta')) )`
	`213`	`+ if ( $object_keys === ['id', 'type'] or $object_keys === ['id', 'meta', 'type'] )`
`213`	`214`	`{`
`214`	`215`	`$resource = $this->manager->getFactory()->make(`
`215`	`216`	`'ResourceIdentifier',`