Add links to sub endpoints and wd/pd to item and property get endpoints

src/ApiFactory.php

@@ -156,14 +156,17 @@ public function newGetItemUseCase(): GetItemUseCase {
 		return new GetItemUseCase(
 			$this->getItemStore(),
 			$this->getLabelLookup(),
-			$this->getEntityDeserializer()
+			$this->getEntityDeserializer(),
+			$this->getUrlBuilder()
 		);
 	}
 
 	public function newGetPropertyUseCase(): GetPropertyUseCase {
 		return new GetPropertyUseCase(
 			$this->getPropertyStore(),
-			$this->getEntityDeserializer()
+			$this->getLabelLookup(),
+			$this->getEntityDeserializer(),
+			$this->getUrlBuilder()
 		);
 	}
 

src/ResponseModel/SimpleEntityTrait.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Queryr\WebApi\ResponseModel;
+
+/**
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw < jeroendedauw@gmail.com >
+ */
+trait SimpleEntityTrait {
+
+	/**
+	 * @var string[]
+	 */
+	public $ids = [];
+
+	/**
+	 * @var string
+	 */
+	public $label = '';
+
+	/**
+	 * @var string
+	 */
+	public $description = '';
+
+	/**
+	 * @var string[]
+	 */
+	public $aliases = [];
+
+	/**
+	 * @var SimpleStatement[]
+	 */
+	public $statements = [];
+
+	/**
+	 * @var string
+	 */
+	public $dataUrl = '';
+
+	/**
+	 * @var string
+	 */
+	public $labelUrl = '';
+
+	/**
+	 * @var string
+	 */
+	public $descriptionUrl = '';
+
+	/**
+	 * @var string
+	 */
+	public $aliasesUrl = '';
+
+	/**
+	 * @var string
+	 */
+	public $wikidataUrl = '';
+
+}

src/ResponseModel/SimpleStatement.php

@@ -37,12 +37,12 @@ public static function newInstance() {
 		return new self();
 	}
 
-	public function withPropertyName( $propertyName ) {
+	public function withPropertyName( string $propertyName ) {
 		$this->propertyName = $propertyName;
 		return $this;
 	}
 
-	public function withType( $type ) {
+	public function withType( string $type ) {
 		$this->valueType = $type;
 		return $this;
 	}

src/ResponseModel/SimpleStatementsBuilder.php

@@ -21,7 +21,7 @@ class SimpleStatementsBuilder {
 	private $languageCode;
 	private $labelLookup;
 
-	public function __construct( $languageCode, LabelLookup $labelLookup ) {
+	public function __construct( string $languageCode, LabelLookup $labelLookup ) {
 		$this->languageCode = $languageCode;
 		$this->labelLookup = $labelLookup;
 	}
@@ -31,7 +31,7 @@ public function __construct( $languageCode, LabelLookup $labelLookup ) {
 	 *
 	 * @return array
 	 */
-	public function buildFromStatements( StatementList $statements ) {
+	public function buildFromStatements( StatementList $statements ): array {
 		$simpleStatements = [];
 
 		foreach ( $statements->getPropertyIds() as $propertyId ) {
@@ -52,7 +52,7 @@ public function buildFromStatements( StatementList $statements ) {
 		return $simpleStatements;
 	}
 
-	private function getEntityName( EntityId $id ) {
+	private function getEntityName( EntityId $id ): string {
 		$label = $this->labelLookup->getLabelByIdAndLanguage( $id, $this->languageCode );
 
 		return $label === null ? $id->getSerialization() : $label;

src/Serializers/SerializerFactory.php

@@ -5,7 +5,7 @@
 use Queryr\WebApi\Serializers\ItemListSerializer;
 use Queryr\WebApi\Serializers\ItemTypeSerializer;
 use Queryr\WebApi\Serializers\PropertyListSerializer;
-use Queryr\WebApi\Serializers\SimpleFoundationSerializer;
+use Queryr\WebApi\Serializers\SimpleEntitySerializer;
 use Queryr\WebApi\Serializers\SimpleItemSerializer;
 use Queryr\WebApi\Serializers\SimplePropertySerializer;
 use Queryr\WebApi\Serializers\SimpleStatementSerializer;
@@ -24,8 +24,8 @@ class SerializerFactory {
 	 */
 	public function newSimpleItemSerializer() {
 		return new SimpleItemSerializer(
-			new SimpleFoundationSerializer(),
-			new SimpleStatementSerializer()
+			new SimpleEntitySerializer( new SimpleStatementSerializer() )
+
 		);
 	}
 
@@ -34,7 +34,7 @@ public function newSimpleItemSerializer() {
 	 */
 	public function newSimplePropertySerializer() {
 		return new SimplePropertySerializer(
-			new SimpleFoundationSerializer()
+			new SimpleEntitySerializer( new SimpleStatementSerializer() )
 		);
 	}
 
@@ -44,7 +44,7 @@ public function newSimplePropertySerializer() {
 	 */
 	public function newStableItemSerializer( array $propertyMap ) {
 		return new StableItemSerializer(
-			new SimpleFoundationSerializer(),
+			new SimpleEntitySerializer( new SimpleStatementSerializer() ),
 			new SimpleStatementSerializer(),
 			$propertyMap
 		);

src/Serializers/SimpleEntitySerializer.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace Queryr\WebApi\Serializers;
+
+use Queryr\WebApi\ResponseModel\SimpleEntityTrait;
+use Serializers\Exceptions\UnsupportedObjectException;
+use Serializers\Serializer;
+
+/**
+ * @access private
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw < jeroendedauw@gmail.com >
+ */
+class SimpleEntitySerializer implements Serializer {
+
+	/**
+	 * @var SimpleEntityTrait
+	 */
+	private $entity;
+
+	private $statementSerializer;
+
+	public function __construct( Serializer $statementSerializer ) {
+		$this->statementSerializer = $statementSerializer;
+	}
+
+	public function serialize( $object ) {
+		if ( !in_array( SimpleEntityTrait::class, class_uses( $object ) ) ) {
+			throw new UnsupportedObjectException( $object, 'Can only serialize instances of SimpleEntityTrait' );
+		}
+
+		$this->entity = $object;
+
+		return $this->serializeEntity();
+	}
+
+	private function serializeEntity(): array {
+		$serialization = [ 'id' => $this->entity->ids ];
+
+		if ( $this->entity->label !== '' ) {
+			$serialization['label'] = $this->entity->label;
+		}
+
+		if ( $this->entity->description !== '' ) {
+			$serialization['description'] = $this->entity->description;
+		}
+
+		if ( !empty( $this->entity->aliases ) ) {
+			$serialization['aliases'] = $this->entity->aliases;
+		}
+
+		if ( $this->entity->labelUrl !== '' ) {
+			$serialization['label_url'] = $this->entity->labelUrl;
+		}
+
+		if ( $this->entity->description !== '' ) {
+			$serialization['description_url'] = $this->entity->descriptionUrl;
+		}
+
+		if ( $this->entity->aliasesUrl !== '' ) {
+			$serialization['aliases_url'] = $this->entity->aliasesUrl;
+		}
+
+		if ( $this->entity->wikidataUrl !== '' ) {
+			$serialization['wikidata_url'] = $this->entity->wikidataUrl;
+		}
+
+		$serialization['data_url'] = $this->entity->dataUrl;
+
+		$serialization['data'] = $this->getDataSection();
+
+		return $serialization;
+	}
+
+	private function getDataSection(): array {
+		$data = [];
+
+		foreach ( $this->entity->statements as $simpleStatement ) {
+			$data[$simpleStatement->propertyName] = $this->statementSerializer->serialize( $simpleStatement );
+		}
+
+		return $data;
+	}
+
+}

src/Serializers/SimpleItemSerializer.php

@@ -16,21 +16,15 @@ class SimpleItemSerializer implements Serializer {
 	/**
 	 * @var Serializer
 	 */
-	private $foundationalSerializer;
-
-	/**
-	 * @var Serializer
-	 */
-	private $statementSerializer;
+	private $entitySerializer;
 
 	/**
 	 * @var SimpleItem
 	 */
 	private $item;
 
-	public function __construct( Serializer $foundationalSerializer, Serializer $statementSerializer ) {
-		$this->foundationalSerializer = $foundationalSerializer;
-		$this->statementSerializer = $statementSerializer;
+	public function __construct( Serializer $simpleEntitySerializer ) {
+		$this->entitySerializer = $simpleEntitySerializer;
 	}
 
 	public function serialize( $object ) {
@@ -43,22 +37,10 @@ public function serialize( $object ) {
 		return $this->serializeItem();
 	}
 
-	private function serializeItem() {
-		$serialization = $this->foundationalSerializer->serialize( $this->item );
-
-		$serialization['data'] = $this->getDataSection();
+	private function serializeItem(): array {
+		$serialization = $this->entitySerializer->serialize( $this->item );
 
 		return $serialization;
 	}
 
-	private function getDataSection() {
-		$data = [];
-
-		foreach ( $this->item->statements as $simpleStatement ) {
-			$data[$simpleStatement->propertyName] = $this->statementSerializer->serialize( $simpleStatement );
-		}
-
-		return $data;
-	}
-
 }

src/Serializers/SimplePropertySerializer.php

@@ -16,15 +16,15 @@ class SimplePropertySerializer implements Serializer {
 	/**
 	 * @var Serializer
 	 */
-	private $foundationalSerializer;
+	private $entitySerializer;
 
 	/**
 	 * @var SimpleProperty
 	 */
 	private $property;
 
-	public function __construct( Serializer $foundationalSerializer ) {
-		$this->foundationalSerializer = $foundationalSerializer;
+	public function __construct( Serializer $simpleEntitySerializer ) {
+		$this->entitySerializer = $simpleEntitySerializer;
 	}
 
 	public function serialize( $object ) {
@@ -37,12 +37,11 @@ public function serialize( $object ) {
 		return $this->serializeProperty();
 	}
 
-	private function serializeProperty() {
-		$serialization = $this->foundationalSerializer->serialize( $this->property );
-
-		$serialization['type'] = $this->property->type;
-
-		return $serialization;
+	private function serializeProperty(): array {
+		return array_merge(
+			[ 'type' => $this->property->type ],
+			$this->entitySerializer->serialize( $this->property )
+		);
 	}
 
 }