Use dto from json-api-dto, drop original sources, extend only

n.gnato · n.gnato · commit c6d029545525 · 2025-03-13T17:49:34.000+03:00
diff --git a/composer.json b/composer.json
@@ -18,6 +18,7 @@
         "doctrine/persistence": "^2.0|^3.0",
         "fig/http-message-util": "^1.0",
         "free-elephants/i18n": "^0.0.1",
+        "free-elephants/json-api-dto": "^0.0.1",
         "laminas/laminas-stratigility": "^3.2",
         "laravel-json-api/neomerx-json-api": "^5.0.2",
         "league/openapi-psr7-validator": "0.19 - 0.22",
diff --git a/src/FreeElephants/JsonApiToolkit/DTO/AbstractAttributes.php b/src/FreeElephants/JsonApiToolkit/DTO/AbstractAttributes.php
@@ -6,6 +6,6 @@
  * @deprecated
  * @see \FreeElephants\JsonApi\DTO\AbstractAttributes
  */
-abstract class AbstractAttributes extends BaseKeyValueStructure
+abstract class AbstractAttributes extends \FreeElephants\JsonApi\DTO\AbstractAttributes
 {
 }
diff --git a/src/FreeElephants/JsonApiToolkit/DTO/AbstractDocument.php b/src/FreeElephants/JsonApiToolkit/DTO/AbstractDocument.php
@@ -9,28 +9,6 @@
  * @see \FreeElephants\JsonApi\DTO\AbstractDocument
  * @property AbstractResourceObject|mixed $data
  */
-abstract class AbstractDocument
+abstract class AbstractDocument extends \FreeElephants\JsonApi\DTO\AbstractDocument
 {
-    final public function __construct(array $data)
-    {
-        $concreteClass = new \ReflectionClass($this);
-        $dataProperty = $concreteClass->getProperty('data');
-        /** @var \ReflectionNamedType $reflectionType */
-        $reflectionType = $dataProperty->getType();
-        $dataClassName = $reflectionType->getName();
-        $this->data = new $dataClassName($data['data']);
-    }
-
-    /**
-     * @param MessageInterface $httpMessage
-     * @return static
-     */
-    public static function fromHttpMessage(MessageInterface $httpMessage): self
-    {
-        $httpMessage->getBody()->rewind();
-        $rawJson = $httpMessage->getBody()->getContents();
-        $decodedJson = json_decode($rawJson, true);
-
-        return new static($decodedJson);
-    }
 }
diff --git a/src/FreeElephants/JsonApiToolkit/DTO/AbstractRelationships.php b/src/FreeElephants/JsonApiToolkit/DTO/AbstractRelationships.php
@@ -6,12 +6,6 @@
  * @deprecated
  * @see \FreeElephants\JsonApi\DTO\AbstractRelationships
  */
-abstract class AbstractRelationships
+abstract class AbstractRelationships extends \FreeElephants\JsonApi\DTO\AbstractRelationships
 {
-    public function __construct(array $data)
-    {
-        foreach ($data as $relationshipName => $relationshipsData) {
-            $this->{$relationshipName} = new RelationshipToOne($relationshipsData);
-        }
-    }
 }
diff --git a/src/FreeElephants/JsonApiToolkit/DTO/AbstractResourceObject.php b/src/FreeElephants/JsonApiToolkit/DTO/AbstractResourceObject.php
@@ -8,42 +8,7 @@
  *
  * @deprecated
  * @see \FreeElephants\JsonApi\DTO\AbstractResourceObject
- * @property AbstractAttributes $attributes
- * @property AbstractRelationships $relationships
  */
-class AbstractResourceObject
+class AbstractResourceObject extends \FreeElephants\JsonApi\DTO\AbstractResourceObject
 {
-    public string $id;
-    public string $type;
-
-    public function __construct(array $data)
-    {
-        $this->id = $data['id'];
-        $this->type = $data['type'];
-
-        $concreteClass = new \ReflectionClass($this);
-
-        if (property_exists($this, 'attributes')) {
-            $attributesProperty = $concreteClass->getProperty('attributes');
-            $attributesClass = $attributesProperty->getType()->getName();
-            $this->attributes = new $attributesClass($data['attributes']);
-        }
-
-        if (property_exists($this, 'relationships')) {
-            $relationshipsData = $data['relationships'];
-            $concreteClass = new \ReflectionClass($this);
-            $relationshipsProperty = $concreteClass->getProperty('relationships');
-            $reflectionType = $relationshipsProperty->getType();
-
-            // handle php 8 union types
-            if ($reflectionType instanceof \ReflectionUnionType) {
-                $relationshipsClass = (new SuitableRelationshipsTypeDetector())->detect($reflectionType, $relationshipsData);
-            } else {
-                $relationshipsClass = $reflectionType->getName();
-            }
-
-            $relationshipsDto = new $relationshipsClass($relationshipsData);
-            $this->relationships = $relationshipsDto;
-        }
-    }
 }
diff --git a/src/FreeElephants/JsonApiToolkit/DTO/BaseKeyValueStructure.php b/src/FreeElephants/JsonApiToolkit/DTO/BaseKeyValueStructure.php
@@ -6,21 +6,6 @@
  * @deprecated
  * @see \FreeElephants\JsonApi\DTO\BaseKeyValueStructure
  */
-class BaseKeyValueStructure
+class BaseKeyValueStructure extends \FreeElephants\JsonApi\DTO\BaseKeyValueStructure
 {
-    public function __construct(array $attributes)
-    {
-        $concreteClass = new \ReflectionClass($this);
-        foreach ($attributes as $name => $value) {
-            $property = $concreteClass->getProperty($name);
-            if ($property->hasType()) {
-                $propertyType = $property->getType();
-                if ($propertyType instanceof \ReflectionNamedType && !$propertyType->isBuiltin()) {
-                    $propertyClassName = $propertyType->getName();
-                    $value = new $propertyClassName($value);
-                }
-            }
-            $this->{$name} = $value;
-        }
-    }
 }
diff --git a/src/FreeElephants/JsonApiToolkit/DTO/RelationshipToOne.php b/src/FreeElephants/JsonApiToolkit/DTO/RelationshipToOne.php
@@ -6,7 +6,6 @@
  * @deprecated
  * @see \FreeElephants\JsonApi\DTO\RelationshipToOne
  */
-class RelationshipToOne extends AbstractDocument
+class RelationshipToOne extends \FreeElephants\JsonApi\DTO\RelationshipToOne
 {
-    public ResourceIdentifierObject $data;
 }
diff --git a/src/FreeElephants/JsonApiToolkit/DTO/ResourceIdentifierObject.php b/src/FreeElephants/JsonApiToolkit/DTO/ResourceIdentifierObject.php
@@ -6,14 +6,6 @@
  * @deprecated
  * @see \FreeElephants\JsonApi\DTO\ResourceIdentifierObject
  */
-class ResourceIdentifierObject
+class ResourceIdentifierObject extends \FreeElephants\JsonApi\DTO\ResourceIdentifierObject
 {
-    public string $id;
-    public string $type;
-
-    public function __construct(array $data)
-    {
-        $this->id = $data['id'];
-        $this->type = $data['type'];
-    }
 }
diff --git a/tests/FreeElephants/JsonApiToolkit/DTO/DocumentTest.php b/tests/FreeElephants/JsonApiToolkit/DTO/DocumentTest.php
@@ -70,7 +70,7 @@ class FooAttributes extends AbstractAttributes
 
 class FooRelationships extends AbstractRelationships
 {
-    public RelationshipToOne $baz;
+    public \FreeElephants\JsonApi\DTO\RelationshipToOne $baz;
 }
 
 class Nested extends BaseKeyValueStructure
diff --git a/tests/FreeElephants/JsonApiToolkit/DTO/Example/OneRelationships.php b/tests/FreeElephants/JsonApiToolkit/DTO/Example/OneRelationships.php
@@ -7,5 +7,5 @@
 
 class OneRelationships extends AbstractRelationships
 {
-    public RelationshipToOne $one;
+    public \FreeElephants\JsonApi\DTO\RelationshipToOne $one;
 }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`* @deprecated`
`7`	`7`	`* @see \FreeElephants\JsonApi\DTO\AbstractAttributes`
`8`	`8`	`*/`
`9`		`-abstract class AbstractAttributes extends BaseKeyValueStructure`
	`9`	`+abstract class AbstractAttributes extends \FreeElephants\JsonApi\DTO\AbstractAttributes`
`10`	`10`	`{`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,6 @@`
`6`	`6`	`* @deprecated`
`7`	`7`	`* @see \FreeElephants\JsonApi\DTO\AbstractRelationships`
`8`	`8`	`*/`
`9`		`-abstract class AbstractRelationships`
	`9`	`+abstract class AbstractRelationships extends \FreeElephants\JsonApi\DTO\AbstractRelationships`
`10`	`10`	`{`
`11`		`- public function __construct(array $data)`
`12`		`- {`
`13`		`- foreach ($data as $relationshipName => $relationshipsData) {`
`14`		`- $this->{$relationshipName} = new RelationshipToOne($relationshipsData);`
`15`		`- }`
`16`		`- }`
`17`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`* @deprecated`
`7`	`7`	`* @see \FreeElephants\JsonApi\DTO\RelationshipToOne`
`8`	`8`	`*/`
`9`		`-class RelationshipToOne extends AbstractDocument`
	`9`	`+class RelationshipToOne extends \FreeElephants\JsonApi\DTO\RelationshipToOne`
`10`	`10`	`{`
`11`		`- public ResourceIdentifierObject $data;`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class FooAttributes extends AbstractAttributes`
`70`	`70`
`71`	`71`	`class FooRelationships extends AbstractRelationships`
`72`	`72`	`{`
`73`		`- public RelationshipToOne $baz;`
	`73`	`+ public \FreeElephants\JsonApi\DTO\RelationshipToOne $baz;`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`class Nested extends BaseKeyValueStructure`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@`
`7`	`7`
`8`	`8`	`class OneRelationships extends AbstractRelationships`
`9`	`9`	`{`
`10`		`- public RelationshipToOne $one;`
	`10`	`+ public \FreeElephants\JsonApi\DTO\RelationshipToOne $one;`
`11`	`11`	`}`