cleanup

Author: lode

examples/bootstrap_examples.php

@@ -124,16 +124,16 @@ public function getNamespace() {
 	 */
 
 	public function setVersion(ResourceInterface $resource, $version) {
-		if ($resource instanceof ResourceDocument) {
-			$resource->getResource()->addExtensionMember($this, 'id', $version);
-			return;
-		}
-		
 		if ($resource instanceof HasExtensionMembersInterface === false) {
 			throw new \Exception('resource doesn\'t have extension members');
 		}
 
-		$resource->addExtensionMember($this, 'id', $version);
+		if ($resource instanceof ResourceDocument) {
+			$resource->getResource()->addExtensionMember($this, 'id', $version);
+		}
+		else {
+			$resource->addExtensionMember($this, 'id', $version);
+		}
 	}
 }
 

src/Document.php

@@ -13,6 +13,7 @@
 use alsvanzelf\jsonapi\helpers\Validator;
 use alsvanzelf\jsonapi\interfaces\DocumentInterface;
 use alsvanzelf\jsonapi\interfaces\ExtensionInterface;
+use alsvanzelf\jsonapi\interfaces\HasExtensionMembersInterface;
 use alsvanzelf\jsonapi\interfaces\HasLinksInterface;
 use alsvanzelf\jsonapi\interfaces\HasMetaInterface;
 use alsvanzelf\jsonapi\interfaces\ProfileInterface;
@@ -24,7 +25,7 @@
 /**
  * @see ResourceDocument, CollectionDocument, ErrorsDocument or MetaDocument
  */
-abstract class Document implements DocumentInterface, \JsonSerializable, HasLinksInterface, HasMetaInterface {
+abstract class Document implements DocumentInterface, \JsonSerializable, HasLinksInterface, HasMetaInterface, HasExtensionMembersInterface {
 	use AtMemberManager, ExtensionMemberManager, HttpStatusCodeManager, LinksManager {
 		LinksManager::addLink as linkManagerAddLink;
 	}

src/profiles/CursorPaginationProfile.php

@@ -4,7 +4,6 @@
 
 use alsvanzelf\jsonapi\Document;
 use alsvanzelf\jsonapi\ResourceDocument;
-use alsvanzelf\jsonapi\exceptions\Exception;
 use alsvanzelf\jsonapi\exceptions\InputException;
 use alsvanzelf\jsonapi\interfaces\HasLinksInterface;
 use alsvanzelf\jsonapi\interfaces\HasMetaInterface;

tests/example_output/ExampleVersionExtension.php

@@ -18,15 +18,15 @@ public function getNamespace() {
 	}
 
 	public function setVersion(ResourceInterface $resource, $version) {
-		if ($resource instanceof ResourceDocument) {
-			$resource->getResource()->addExtensionMember($this, 'id', $version);
-			return;
-		}
-		
 		if ($resource instanceof HasExtensionMembersInterface === false) {
 			throw new InputException('resource doesn\'t have extension members');
 		}
 
-		$resource->addExtensionMember($this, 'id', $version);
+		if ($resource instanceof ResourceDocument) {
+			$resource->getResource()->addExtensionMember($this, 'id', $version);
+		}
+		else {
+			$resource->addExtensionMember($this, 'id', $version);
+		}
 	}
 }