Прописала в Data конкретные реализации вместо интерфейсов

homeappcorporate · Mar 17, 2021 · 4f141bf · 4f141bf
1 parent 4088af9
commit 4f141bf
Show file tree

Hide file tree

Showing 15 changed files with 57 additions and 57 deletions.
diff --git a/HomeappData/Registry/Dto/Address/Data.php b/HomeappData/Registry/Dto/Address/Data.php
@@ -5,9 +5,9 @@
 namespace Homeapp\HomeappData\Registry\Dto\Address;
 
 use Homeapp\HomeappData\Registry\Dto\ResourceObject;
-use Homeapp\JsonApi\Attributes\AttributesInterface;
-use Homeapp\JsonApi\Relationships\RelationshipsInterface;
 use Homeapp\HomeappData\Registry\Enum\EntityNameEnum;
+use Homeapp\HomeappData\Registry\Dto\Address\Attributes as Attributes;
+use Homeapp\HomeappData\Registry\Dto\Address\Relationships as Relationships;
 use JMS\Serializer\Annotation as Serializer;
 
 /**
@@ -20,15 +20,15 @@ class Data extends ResourceObject
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\Address\Attributes")
      * @Serializer\Groups({"API"})
      */
-    public ?AttributesInterface $attributes = null;
+    public ?Attributes $attributes = null;
 
     /**
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\Address\Relationships")
      * @Serializer\Groups({"API"})
      */
-    public ?RelationshipsInterface $relationships = null;
+    public ?Relationships $relationships = null;
 
-    public function __construct(?string $id, ?AttributesInterface $attributes, ?RelationshipsInterface $relationships)
+    public function __construct(?string $id, ?Attributes $attributes, ?Relationships $relationships)
     {
         parent::__construct($id, EntityNameEnum::ADDRESS);
         $this->attributes = $attributes;

diff --git a/HomeappData/Registry/Dto/AddressBti/Data.php b/HomeappData/Registry/Dto/AddressBti/Data.php
@@ -5,9 +5,9 @@
 namespace Homeapp\HomeappData\Registry\Dto\AddressBti;
 
 use Homeapp\HomeappData\Registry\Dto\ResourceObject;
-use Homeapp\JsonApi\Attributes\AttributesInterface;
 use Homeapp\HomeappData\Registry\Enum\EntityNameEnum;
-use Homeapp\JsonApi\Relationships\RelationshipsInterface;
+use Homeapp\HomeappData\Registry\Dto\AddressBti\Attributes as Attributes;
+use Homeapp\HomeappData\Registry\Dto\AddressBti\Relationships as Relationships;
 use JMS\Serializer\Annotation as Serializer;
 
 /**
@@ -19,15 +19,15 @@ class Data extends ResourceObject
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\AddressBti\Attributes")
      * @Serializer\Groups({"API"})
      */
-    public ?AttributesInterface $attributes = null;
+    public ?Attributes $attributes = null;
 
     /**
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\AddressBti\Relationships")
      * @Serializer\Groups({"API"})
      */
-    public ?RelationshipsInterface $relationships = null;
+    public ?Relationships $relationships = null;
 
-    public function __construct(?string $id, ?AttributesInterface $attributes, ?RelationshipsInterface $relationships = null)
+    public function __construct(?string $id, ?Attributes $attributes, ?Relationships $relationships = null)
     {
         parent::__construct($id, EntityNameEnum::ADDRESS_BTI);
         $this->attributes = $attributes;

diff --git a/HomeappData/Registry/Dto/AddressMetroDistance/Data.php b/HomeappData/Registry/Dto/AddressMetroDistance/Data.php
@@ -5,9 +5,9 @@
 namespace Homeapp\HomeappData\Registry\Dto\AddressMetroDistance;
 
 use Homeapp\HomeappData\Registry\Dto\ResourceObject;
-use Homeapp\JsonApi\Attributes\AttributesInterface;
-use Homeapp\JsonApi\Relationships\RelationshipsInterface;
 use Homeapp\HomeappData\Registry\Enum\EntityNameEnum;
+use Homeapp\HomeappData\Registry\Dto\AddressMetroDistance\Attributes as Attributes;
+use Homeapp\HomeappData\Registry\Dto\AddressMetroDistance\Relationships as Relationships;
 use JMS\Serializer\Annotation as Serializer;
 
 /**
@@ -20,15 +20,15 @@ class Data extends ResourceObject
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\AddressMetroDistance\Attributes")
      * @Serializer\Groups({"API"})
      */
-    public ?AttributesInterface $attributes = null;
+    public ?Attributes $attributes = null;
 
     /**
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\AddressMetroDistance\Relationships")
      * @Serializer\Groups({"API"})
      */
-    public ?RelationshipsInterface $relationships = null;
+    public ?Relationships $relationships = null;
 
-    public function __construct(?string $id, ?AttributesInterface $attributes, ?RelationshipsInterface $relationships)
+    public function __construct(?string $id, ?Attributes $attributes, ?Relationships $relationships)
     {
         parent::__construct($id, EntityNameEnum::ADDRESS_METRO_DIST);
         $this->attributes = $attributes;

diff --git a/HomeappData/Registry/Dto/CityArea/Data.php b/HomeappData/Registry/Dto/CityArea/Data.php
@@ -5,8 +5,8 @@
 namespace Homeapp\HomeappData\Registry\Dto\CityArea;
 
 use Homeapp\HomeappData\Registry\Dto\ResourceObject;
-use Homeapp\JsonApi\Attributes\AttributesInterface;
 use Homeapp\HomeappData\Registry\Enum\EntityNameEnum;
+use Homeapp\HomeappData\Registry\Dto\CityArea\Attributes as Attributes;
 use JMS\Serializer\Annotation as Serializer;
 
 /**
@@ -18,9 +18,9 @@ class Data extends ResourceObject
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\CityArea\Attributes")
      * @Serializer\Groups({"API"})
      */
-    public ?AttributesInterface $attributes = null;
+    public ?Attributes $attributes = null;
 
-    public function __construct(?string $id, ?AttributesInterface $attributes)
+    public function __construct(?string $id, ?Attributes $attributes)
     {
         parent::__construct($id, EntityNameEnum::CITY_AREA);
         $this->attributes = $attributes;

diff --git a/HomeappData/Registry/Dto/Complex/Data.php b/HomeappData/Registry/Dto/Complex/Data.php
@@ -5,8 +5,8 @@
 namespace Homeapp\HomeappData\Registry\Dto\Complex;
 
 use Homeapp\HomeappData\Registry\Dto\ResourceObject;
-use Homeapp\JsonApi\Attributes\AttributesInterface;
 use Homeapp\HomeappData\Registry\Enum\EntityNameEnum;
+use Homeapp\HomeappData\Registry\Dto\Complex\Attributes as Attributes;
 use JMS\Serializer\Annotation as Serializer;
 
 /**
@@ -18,9 +18,9 @@ class Data extends ResourceObject
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\Complex\Attributes")
      * @Serializer\Groups({"API"})
      */
-    public ?AttributesInterface $attributes = null;
+    public ?Attributes $attributes = null;
 
-    public function __construct(?string $id, ?AttributesInterface $attributes)
+    public function __construct(?string $id, ?Attributes $attributes)
     {
         parent::__construct($id, EntityNameEnum::COMPLEX);
         $this->attributes = $attributes;

diff --git a/HomeappData/Registry/Dto/District/Data.php b/HomeappData/Registry/Dto/District/Data.php
@@ -5,8 +5,8 @@
 namespace Homeapp\HomeappData\Registry\Dto\District;
 
 use Homeapp\HomeappData\Registry\Dto\ResourceObject;
-use Homeapp\JsonApi\Attributes\AttributesInterface;
 use Homeapp\HomeappData\Registry\Enum\EntityNameEnum;
+use Homeapp\HomeappData\Registry\Dto\District\Attributes as Attributes;
 use JMS\Serializer\Annotation as Serializer;
 
 /**
@@ -18,9 +18,9 @@ class Data extends ResourceObject
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\District\Attributes")
      * @Serializer\Groups({"API"})
      */
-    public ?AttributesInterface $attributes = null;
+    public ?Attributes $attributes = null;
 
-    public function __construct(?string $id, ?AttributesInterface $attributes)
+    public function __construct(?string $id, ?Attributes $attributes)
     {
         parent::__construct($id, EntityNameEnum::DISTRICT);
         $this->attributes = $attributes;

diff --git a/HomeappData/Registry/Dto/Highway/Data.php b/HomeappData/Registry/Dto/Highway/Data.php
@@ -5,8 +5,8 @@
 namespace Homeapp\HomeappData\Registry\Dto\Highway;
 
 use Homeapp\HomeappData\Registry\Dto\ResourceObject;
-use Homeapp\JsonApi\Attributes\AttributesInterface;
 use Homeapp\HomeappData\Registry\Enum\EntityNameEnum;
+use Homeapp\HomeappData\Registry\Dto\Highway\Attributes as Attributes;
 use JMS\Serializer\Annotation as Serializer;
 
 /**
@@ -18,9 +18,9 @@ class Data extends ResourceObject
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\Highway\Attributes")
      * @Serializer\Groups({"API"})
      */
-    public ?AttributesInterface $attributes = null;
+    public ?Attributes $attributes = null;
 
-    public function __construct(?string $id, ?AttributesInterface $attributes)
+    public function __construct(?string $id, ?Attributes $attributes)
     {
         parent::__construct($id, EntityNameEnum::HIGHWAY);
         $this->attributes = $attributes;

diff --git a/HomeappData/Registry/Dto/HouseHighwayDistance/Data.php b/HomeappData/Registry/Dto/HouseHighwayDistance/Data.php
@@ -5,9 +5,9 @@
 namespace Homeapp\HomeappData\Registry\Dto\HouseHighwayDistance;
 
 use Homeapp\HomeappData\Registry\Dto\ResourceObject;
-use Homeapp\JsonApi\Attributes\AttributesInterface;
-use Homeapp\JsonApi\Relationships\RelationshipsInterface;
 use Homeapp\HomeappData\Registry\Enum\EntityNameEnum;
+use Homeapp\HomeappData\Registry\Dto\HouseHighwayDistance\Attributes as Attributes;
+use Homeapp\HomeappData\Registry\Dto\HouseHighwayDistance\Relationships as Relationships;
 use JMS\Serializer\Annotation as Serializer;
 
 /**
@@ -20,15 +20,15 @@ class Data extends ResourceObject
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\HouseHighwayDistance\Attributes")
      * @Serializer\Groups({"API"})
      */
-    public ?AttributesInterface $attributes = null;
+    public ?Attributes $attributes = null;
 
     /**
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\HouseHighwayDistance\Relationships")
      * @Serializer\Groups({"API"})
      */
-    public ?RelationshipsInterface $relationships = null;
+    public ?Relationships $relationships = null;
 
-    public function __construct(?string $id, ?AttributesInterface $attributes, ?RelationshipsInterface $relationships)
+    public function __construct(?string $id, ?Attributes $attributes, ?Relationships $relationships)
     {
         parent::__construct($id, EntityNameEnum::HOUSE_HIGHWAY_DISTANCE);
         $this->attributes = $attributes;

diff --git a/HomeappData/Registry/Dto/Image/Data.php b/HomeappData/Registry/Dto/Image/Data.php
@@ -5,8 +5,8 @@
 namespace Homeapp\HomeappData\Registry\Dto\Image;
 
 use Homeapp\HomeappData\Registry\Dto\ResourceObject;
-use Homeapp\JsonApi\Attributes\AttributesInterface;
 use Homeapp\HomeappData\Registry\Enum\EntityNameEnum;
+use Homeapp\HomeappData\Registry\Dto\Image\Attributes as Attributes;
 use JMS\Serializer\Annotation as Serializer;
 
 /**
@@ -18,9 +18,9 @@ class Data extends ResourceObject
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\Image\Attributes")
      * @Serializer\Groups({"API"})
      */
-    public ?AttributesInterface $attributes = null;
+    public ?Attributes $attributes = null;
 
-    public function __construct(?string $id, ?AttributesInterface $attributes)
+    public function __construct(?string $id, ?Attributes $attributes)
     {
         parent::__construct($id, EntityNameEnum::IMAGE);
         $this->attributes = $attributes;

diff --git a/HomeappData/Registry/Dto/MetroStation/Data.php b/HomeappData/Registry/Dto/MetroStation/Data.php
@@ -5,8 +5,8 @@
 namespace Homeapp\HomeappData\Registry\Dto\MetroStation;
 
 use Homeapp\HomeappData\Registry\Dto\ResourceObject;
-use Homeapp\JsonApi\Attributes\AttributesInterface;
 use Homeapp\HomeappData\Registry\Enum\EntityNameEnum;
+use Homeapp\HomeappData\Registry\Dto\MetroStation\Attributes as Attributes;
 use JMS\Serializer\Annotation as Serializer;
 
 /**
@@ -18,9 +18,9 @@ class Data extends ResourceObject
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\MetroStation\Attributes")
      * @Serializer\Groups({"API"})
      */
-    public ?AttributesInterface $attributes = null;
+    public ?Attributes $attributes = null;
 
-    public function __construct(?string $id, ?AttributesInterface $attributes)
+    public function __construct(?string $id, ?Attributes $attributes)
     {
         parent::__construct($id, EntityNameEnum::METRO_STATION);
         $this->attributes = $attributes;

diff --git a/HomeappData/Registry/Dto/Realty/Data.php b/HomeappData/Registry/Dto/Realty/Data.php
@@ -5,9 +5,9 @@
 namespace Homeapp\HomeappData\Registry\Dto\Realty;
 
 use Homeapp\HomeappData\Registry\Dto\ResourceObject;
-use Homeapp\JsonApi\Attributes\AttributesInterface;
-use Homeapp\JsonApi\Relationships\RelationshipsInterface;
 use Homeapp\HomeappData\Registry\Enum\EntityNameEnum;
+use Homeapp\HomeappData\Registry\Dto\Realty\Attributes as Attributes;
+use Homeapp\HomeappData\Registry\Dto\Realty\Relationships as Relationships;
 use JMS\Serializer\Annotation as Serializer;
 
 /**
@@ -26,9 +26,9 @@ class Data extends ResourceObject
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\Realty\Relationships")
      * @Serializer\Groups({"API"})
      */
-    public ?RelationshipsInterface $relationships = null;
+    public ?Relationships $relationships = null;
 
-    public function __construct(?string $id, ?AttributesInterface $attributes, ?RelationshipsInterface $relationships)
+    public function __construct(?string $id, ?Attributes $attributes, ?Relationships $relationships)
     {
         parent::__construct($id, EntityNameEnum::REALTY);
         $this->attributes = $attributes;

diff --git a/HomeappData/Registry/Dto/RealtyImage/Data.php b/HomeappData/Registry/Dto/RealtyImage/Data.php
@@ -5,9 +5,9 @@
 namespace Homeapp\HomeappData\Registry\Dto\RealtyImage;
 
 use Homeapp\HomeappData\Registry\Dto\ResourceObject;
-use Homeapp\JsonApi\Attributes\AttributesInterface;
-use Homeapp\JsonApi\Relationships\RelationshipsInterface;
 use Homeapp\HomeappData\Registry\Enum\EntityNameEnum;
+use Homeapp\HomeappData\Registry\Dto\RealtyImage\Attributes as Attributes;
+use Homeapp\HomeappData\Registry\Dto\RealtyImage\Relationships as Relationships;
 use JMS\Serializer\Annotation as Serializer;
 
 /**
@@ -20,15 +20,15 @@ class Data extends ResourceObject
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\RealtyImage\Attributes")
      * @Serializer\Groups({"API"})
      */
-    public ?AttributesInterface $attributes = null;
+    public ?Attributes $attributes = null;
 
     /**
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\RealtyImage\Relationships")
      * @Serializer\Groups({"API"})
      */
-    public ?RelationshipsInterface $relationships = null;
+    public ?Relationships $relationships = null;
 
-    public function __construct(?string $id, ?AttributesInterface $attributes, ?RelationshipsInterface $relationships)
+    public function __construct(?string $id, ?Attributes $attributes, ?Relationships $relationships)
     {
         parent::__construct($id, EntityNameEnum::REALTY_IMAGE);
         $this->attributes = $attributes;

diff --git a/HomeappData/Registry/Dto/RealtyMetroDistance/Attributes.php b/HomeappData/Registry/Dto/RealtyMetroDistance/Attributes.php
@@ -18,19 +18,19 @@ class Attributes implements AttributesInterface
      * @Serializer\Type("int")
      * @Serializer\Groups({"API"})
      */
-    public int $distance;
+    public ?int $distance = null;
 
     /**
      * @Serializer\Type("int")
      * @Serializer\Groups({"API"})
      */
-    public int $time;
+    public ?int $time = null;
 
     /**
      * @Serializer\Type("string")
      * @Serializer\Groups({"API"})
      */
-    public string $method;
+    public ?string $method = null;
 
     public function __construct(int $distance, int $time, string $method)
     {

diff --git a/HomeappData/Registry/Dto/RealtyMetroDistance/Data.php b/HomeappData/Registry/Dto/RealtyMetroDistance/Data.php
@@ -5,9 +5,9 @@
 namespace Homeapp\HomeappData\Registry\Dto\RealtyMetroDistance;
 
 use Homeapp\HomeappData\Registry\Dto\ResourceObject;
-use Homeapp\JsonApi\Attributes\AttributesInterface;
-use Homeapp\JsonApi\Relationships\RelationshipsInterface;
 use Homeapp\HomeappData\Registry\Enum\EntityNameEnum;
+use Homeapp\HomeappData\Registry\Dto\RealtyMetroDistance\Attributes as Attributes;
+use Homeapp\HomeappData\Registry\Dto\RealtyMetroDistance\Relationships as Relationships;
 use JMS\Serializer\Annotation as Serializer;
 
 /**
@@ -20,15 +20,15 @@ class Data extends ResourceObject
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\RealtyMetroDistance\Attributes")
      * @Serializer\Groups({"API"})
      */
-    public ?AttributesInterface $attributes = null;
+    public ?Attributes $attributes = null;
 
     /**
      * @Serializer\Type("Homeapp\HomeappData\Registry\Dto\RealtyMetroDistance\Relationships")
      * @Serializer\Groups({"API"})
      */
-    public ?RelationshipsInterface $relationships = null;
+    public ?Relationships $relationships = null;
 
-    public function __construct(?string $id, ?AttributesInterface $attributes, ?RelationshipsInterface $relationships)
+    public function __construct(?string $id, ?Attributes $attributes, ?Relationships $relationships)
     {
         parent::__construct($id, EntityNameEnum::REALTY_METRO_DIST);
         $this->attributes = $attributes;

diff --git a/JsonApi/ResourceIdentifierObject.php b/JsonApi/ResourceIdentifierObject.php
@@ -16,13 +16,13 @@ class ResourceIdentifierObject implements ResourceInterface
      * @Serializer\Type("string")
      * @Serializer\Groups({"API"})
      */
-    public string $id;
+    public ?string $id = null;
 
     /**
      * @Serializer\Type("string")
      * @Serializer\Groups({"API"})
      */
-    public string $type;
+    public ?string $type = null;
 
     /**
      * @param string $id