small adjustments

kurakin-oleksandr · kurakin-oleksandr · commit 2b72834a1a16 · 2020-08-10T21:21:49.000+02:00
diff --git a/src/Controller/AbstractApiController.php b/src/Controller/AbstractApiController.php
@@ -21,23 +21,13 @@ protected function respond($data, int $statusCode = Response::HTTP_OK): Response
     {
         $view = $this->view($data, $statusCode);
 
-        $serializationGroups = $this->getSerializationGroups();
-
-        if (!empty($serializationGroups)) {
-            $view->getContext()->setGroups($serializationGroups);
+        if (!empty($this->serializationGroups)) {
+            $view->getContext()->setGroups($this->serializationGroups);
         }
 
         return $this->handleView($view);
     }
 
-    /**
-     * @return array
-     */
-    protected function getSerializationGroups(): array
-    {
-        return $this->serializationGroups;
-    }
-
     /**
      * @param array $serializationGroups
      */
diff --git a/src/Controller/CustomerStatisticController.php b/src/Controller/CustomerStatisticController.php
@@ -6,7 +6,6 @@
 
 use App\Dto\Response\Transformer\CustomerStatisticResponseDtoTransformer;
 use App\Entity\Customer;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 class CustomerStatisticController extends AbstractApiController
@@ -18,7 +17,7 @@ public function __construct(CustomerStatisticResponseDtoTransformer $customerSta
         $this->customerStatisticResponseDtoTransformer = $customerStatisticResponseDtoTransformer;
     }
 
-    public function indexAction(Request $request): Response
+    public function indexAction(): Response
     {
         $customers = $this->getDoctrine()->getRepository(Customer::class)->findAll();
 
diff --git a/src/Controller/OrderController.php b/src/Controller/OrderController.php
@@ -6,7 +6,6 @@
 
 use App\Dto\Response\Transformer\OrderResponseDtoTransformer;
 use App\Entity\Order;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 class OrderController extends AbstractApiController
@@ -18,7 +17,7 @@ public function __construct(OrderResponseDtoTransformer $orderResponseDtoTransfo
         $this->orderResponseDtoTransformer = $orderResponseDtoTransformer;
     }
 
-    public function showAction(Request $request): Response
+    public function showAction(): Response
     {
         $orders = $this->getDoctrine()->getRepository(Order::class)->findAll();
 
diff --git a/src/Dto/Response/CustomerResponseDto.php b/src/Dto/Response/CustomerResponseDto.php
@@ -6,7 +6,7 @@
 
 use JMS\Serializer\Annotation as Serialization;
 
-class CustomerResponseDto implements ResponseDtoInterface
+class CustomerResponseDto
 {
     /**
      * @Serialization\Type("string")
diff --git a/src/Dto/Response/CustomerStatisticResponseDto.php b/src/Dto/Response/CustomerStatisticResponseDto.php
@@ -9,11 +9,11 @@
 /**
  * @Serialization\VirtualProperty(
  *     "firstName",
- *     exp="object.getQwe()",
+ *     exp="object.getFirstName()",
  *     options={@Serialization\SerializedName("my_first_name")}
  *  )
  */
-class CustomerStatisticResponseDto implements ResponseDtoInterface
+class CustomerStatisticResponseDto
 {
     /**
      * @Serialization\Type("integer")
@@ -50,8 +50,11 @@ public function setTotalOrdersPrice(\Closure $totalOrdersPrice): void
         $this->totalOrdersPrice = $totalOrdersPrice;
     }
 
-    public function getQwe(): string
+    /**
+     * @return string
+     */
+    public function getFirstName(): string
     {
-        return 'qqqqq';
+        return 'My name';
     }
 }
diff --git a/src/Dto/Response/OrderResponseDto.php b/src/Dto/Response/OrderResponseDto.php
@@ -6,7 +6,7 @@
 
 use JMS\Serializer\Annotation as Serialization;
 
-class OrderResponseDto implements ResponseDtoInterface
+class OrderResponseDto
 {
     /**
      * @Serialization\Type("DateTime<'Y-m-d\TH:i:s'>")
diff --git a/src/Dto/Response/ProductResponseDto.php b/src/Dto/Response/ProductResponseDto.php
@@ -6,7 +6,7 @@
 
 use JMS\Serializer\Annotation as Serialization;
 
-class ProductResponseDto implements ResponseDtoInterface
+class ProductResponseDto
 {
     /**
      * @Serialization\Type("string")
diff --git a/src/Dto/Response/ResponseDtoInterface.php b/src/Dto/Response/ResponseDtoInterface.php
diff --git a/src/Dto/Response/Transformer/AbstractResponseDtoTransformer.php b/src/Dto/Response/Transformer/AbstractResponseDtoTransformer.php
@@ -9,11 +9,11 @@ abstract class AbstractResponseDtoTransformer implements ResponseDtoTransformerI
     /**
      * @inheritdoc
      */
-    public function transformFromObjects(iterable $items): iterable
+    public function transformFromObjects(iterable $objects): iterable
     {
         $dtos = [];
-        foreach ($items as $item) {
-            $dtos[] = $this->transformFromObject($item);
+        foreach ($objects as $object) {
+            $dtos[] = $this->transformFromObject($object);
         }
 
         return $dtos;
diff --git a/src/Dto/Response/Transformer/CustomerResponseDtoTransformer.php b/src/Dto/Response/Transformer/CustomerResponseDtoTransformer.php
@@ -5,17 +5,16 @@
 namespace App\Dto\Response\Transformer;
 
 use App\Dto\Response\CustomerResponseDto;
-use App\Dto\Response\ResponseDtoInterface;
 use App\Entity\Customer;
 
 class CustomerResponseDtoTransformer extends AbstractResponseDtoTransformer
 {
     /**
      * @param Customer $customer
      *
-     * @return ResponseDtoInterface
+     * @return mixed
      */
-    public function transformFromObject($customer): ResponseDtoInterface
+    public function transformFromObject($customer)
     {
         $dto = new CustomerResponseDto();
         $dto->email = $customer->getEmail();
diff --git a/src/Dto/Response/Transformer/CustomerStatisticResponseDtoTransformer.php b/src/Dto/Response/Transformer/CustomerStatisticResponseDtoTransformer.php
@@ -5,7 +5,6 @@
 namespace App\Dto\Response\Transformer;
 
 use App\Dto\Response\CustomerStatisticResponseDto;
-use App\Dto\Response\ResponseDtoInterface;
 use App\Entity\Customer;
 use App\Repository\OrderRepository;
 
@@ -21,9 +20,9 @@ public function __construct(OrderRepository $orderRepository)
     /**
      * @param Customer $customer
      *
-     * @return ResponseDtoInterface
+     * @return mixed
      */
-    public function transformFromObject($customer): ResponseDtoInterface
+    public function transformFromObject($customer)
     {
         $dto = new CustomerStatisticResponseDto();
         $dto->customerId = $customer->getId();
diff --git a/src/Dto/Response/Transformer/OrderResponseDtoTransformer.php b/src/Dto/Response/Transformer/OrderResponseDtoTransformer.php
@@ -5,7 +5,6 @@
 namespace App\Dto\Response\Transformer;
 
 use App\Dto\Response\OrderResponseDto;
-use App\Dto\Response\ResponseDtoInterface;
 use App\Entity\Order;
 
 class OrderResponseDtoTransformer extends AbstractResponseDtoTransformer
@@ -24,9 +23,9 @@ public function __construct(
     /**
      * @param Order $order
      *
-     * @return ResponseDtoInterface
+     * @return mixed
      */
-    public function transformFromObject($order): ResponseDtoInterface
+    public function transformFromObject($order)
     {
         $dto = new OrderResponseDto();
         $dto->createdAt = $order->getCreatedAt();
diff --git a/src/Dto/Response/Transformer/ProductResponseDtoTransformer.php b/src/Dto/Response/Transformer/ProductResponseDtoTransformer.php
@@ -5,17 +5,16 @@
 namespace App\Dto\Response\Transformer;
 
 use App\Dto\Response\ProductResponseDto;
-use App\Dto\Response\ResponseDtoInterface;
 use App\Entity\Product;
 
 class ProductResponseDtoTransformer extends AbstractResponseDtoTransformer
 {
     /**
      * @param Product $product
      *
-     * @return ResponseDtoInterface
+     * @return mixed
      */
-    public function transformFromObject($product): ResponseDtoInterface
+    public function transformFromObject($product)
     {
         $dto = new ProductResponseDto();
         $dto->code = $product->getCode();
diff --git a/src/Dto/Response/Transformer/ResponseDtoTransformerInterface.php b/src/Dto/Response/Transformer/ResponseDtoTransformerInterface.php
@@ -4,11 +4,9 @@
 
 namespace App\Dto\Response\Transformer;
 
-use App\Dto\Response\ResponseDtoInterface;
-
 interface ResponseDtoTransformerInterface
 {
-    public function transformFromObject($object): ?ResponseDtoInterface;
+    public function transformFromObject($object);
 
-    public function transformFromObjects(iterable $items): iterable;
+    public function transformFromObjects(iterable $objects): iterable;
 }
diff --git a/src/Entity/Customer.php b/src/Entity/Customer.php
@@ -13,7 +13,7 @@
 class Customer
 {
     /**
-     * @var int
+     * @var int|null
      *
      * @ORM\Column(name="id", type="integer")
      * @ORM\Id()
diff --git a/src/Entity/Order.php b/src/Entity/Order.php
@@ -15,13 +15,13 @@
 class Order
 {
     /**
-     * @var int
+     * @var int|null
      *
      * @ORM\Column(name="id", type="integer")
      * @ORM\Id()
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private int $id;
+    private ?int $id;
 
     /**
      * @var Customer
@@ -47,7 +47,7 @@ class Order
     /**
      * @var string|null
      *
-     * @ORM\Column(name="comments", type="text", nullable=true)
+     * @ORM\Column(name="comment", type="text", nullable=true)
      */
     private ?string $comment;
 
diff --git a/src/Entity/Product.php b/src/Entity/Product.php
@@ -13,7 +13,7 @@
 class Product
 {
     /**
-     * @var int
+     * @var int|null
      *
      * @ORM\Column(name="id", type="integer")
      * @ORM\Id()
diff --git a/src/Migrations/Version20200731121119.php b/src/Migrations/Version20200731121119.php
@@ -23,7 +23,7 @@ public function up(Schema $schema) : void
         $this->addSql('CREATE SEQUENCE app_order_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE app_product_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE app_customer (id INT NOT NULL, email VARCHAR(255) NOT NULL, phone_number VARCHAR(255) NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('CREATE TABLE app_order (id INT NOT NULL, customer_id INT DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, comments TEXT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE TABLE app_order (id INT NOT NULL, customer_id INT DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, comment TEXT DEFAULT NULL, PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_23FA1E559395C3F3 ON app_order (customer_id)');
         $this->addSql('CREATE TABLE order_product (order_id INT NOT NULL, product_id INT NOT NULL, PRIMARY KEY(order_id, product_id))');
         $this->addSql('CREATE INDEX IDX_2530ADE68D9F6D38 ON order_product (order_id)');

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`use App\Dto\Response\Transformer\CustomerStatisticResponseDtoTransformer;`
`8`	`8`	`use App\Entity\Customer;`
`9`		`-use Symfony\Component\HttpFoundation\Request;`
`10`	`9`	`use Symfony\Component\HttpFoundation\Response;`
`11`	`10`
`12`	`11`	`class CustomerStatisticController extends AbstractApiController`
`@@ -18,7 +17,7 @@ public function __construct(CustomerStatisticResponseDtoTransformer $customerSta`
`18`	`17`	`$this->customerStatisticResponseDtoTransformer = $customerStatisticResponseDtoTransformer;`
`19`	`18`	`}`
`20`	`19`
`21`		`- public function indexAction(Request $request): Response`
	`20`	`+ public function indexAction(): Response`
`22`	`21`	`{`
`23`	`22`	`$customers = $this->getDoctrine()->getRepository(Customer::class)->findAll();`
`24`	`23`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`use App\Dto\Response\Transformer\OrderResponseDtoTransformer;`
`8`	`8`	`use App\Entity\Order;`
`9`		`-use Symfony\Component\HttpFoundation\Request;`
`10`	`9`	`use Symfony\Component\HttpFoundation\Response;`
`11`	`10`
`12`	`11`	`class OrderController extends AbstractApiController`
`@@ -18,7 +17,7 @@ public function __construct(OrderResponseDtoTransformer $orderResponseDtoTransfo`
`18`	`17`	`$this->orderResponseDtoTransformer = $orderResponseDtoTransformer;`
`19`	`18`	`}`
`20`	`19`
`21`		`- public function showAction(Request $request): Response`
	`20`	`+ public function showAction(): Response`
`22`	`21`	`{`
`23`	`22`	`$orders = $this->getDoctrine()->getRepository(Order::class)->findAll();`
`24`	`23`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`use JMS\Serializer\Annotation as Serialization;`
`8`	`8`
`9`		`-class CustomerResponseDto implements ResponseDtoInterface`
	`9`	`+class CustomerResponseDto`
`10`	`10`	`{`
`11`	`11`	`/**`
`12`	`12`	`* @Serialization\Type("string")`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@`
`9`	`9`	`/**`
`10`	`10`	`* @Serialization\VirtualProperty(`
`11`	`11`	`* "firstName",`
`12`		`- * exp="object.getQwe()",`
	`12`	`+ * exp="object.getFirstName()",`
`13`	`13`	`* options={@Serialization\SerializedName("my_first_name")}`
`14`	`14`	`* )`
`15`	`15`	`*/`
`16`		`-class CustomerStatisticResponseDto implements ResponseDtoInterface`
	`16`	`+class CustomerStatisticResponseDto`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`	`19`	`* @Serialization\Type("integer")`
`@@ -50,8 +50,11 @@ public function setTotalOrdersPrice(\Closure $totalOrdersPrice): void`
`50`	`50`	`$this->totalOrdersPrice = $totalOrdersPrice;`
`51`	`51`	`}`
`52`	`52`
`53`		`- public function getQwe(): string`
	`53`	`+ /**`
	`54`	`+ * @return string`
	`55`	`+ */`
	`56`	`+ public function getFirstName(): string`
`54`	`57`	`{`
`55`		`- return 'qqqqq';`
	`58`	`+ return 'My name';`
`56`	`59`	`}`
`57`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`use JMS\Serializer\Annotation as Serialization;`
`8`	`8`
`9`		`-class OrderResponseDto implements ResponseDtoInterface`
	`9`	`+class OrderResponseDto`
`10`	`10`	`{`
`11`	`11`	`/**`
`12`	`12`	`* @Serialization\Type("DateTime<'Y-m-d\TH:i:s'>")`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`use JMS\Serializer\Annotation as Serialization;`
`8`	`8`
`9`		`-class ProductResponseDto implements ResponseDtoInterface`
	`9`	`+class ProductResponseDto`
`10`	`10`	`{`
`11`	`11`	`/**`
`12`	`12`	`* @Serialization\Type("string")`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@ abstract class AbstractResponseDtoTransformer implements ResponseDtoTransformerI`
`9`	`9`	`/**`
`10`	`10`	`* @inheritdoc`
`11`	`11`	`*/`
`12`		`- public function transformFromObjects(iterable $items): iterable`
	`12`	`+ public function transformFromObjects(iterable $objects): iterable`
`13`	`13`	`{`
`14`	`14`	`$dtos = [];`
`15`		`- foreach ($items as $item) {`
`16`		`- $dtos[] = $this->transformFromObject($item);`
	`15`	`+ foreach ($objects as $object) {`
	`16`	`+ $dtos[] = $this->transformFromObject($object);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`return $dtos;`
Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,16 @@`
`5`	`5`	`namespace App\Dto\Response\Transformer;`
`6`	`6`
`7`	`7`	`use App\Dto\Response\CustomerResponseDto;`
`8`		`-use App\Dto\Response\ResponseDtoInterface;`
`9`	`8`	`use App\Entity\Customer;`
`10`	`9`
`11`	`10`	`class CustomerResponseDtoTransformer extends AbstractResponseDtoTransformer`
`12`	`11`	`{`
`13`	`12`	`/**`
`14`	`13`	`* @param Customer $customer`
`15`	`14`	`*`
`16`		`- * @return ResponseDtoInterface`
	`15`	`+ * @return mixed`
`17`	`16`	`*/`
`18`		`- public function transformFromObject($customer): ResponseDtoInterface`
	`17`	`+ public function transformFromObject($customer)`
`19`	`18`	`{`
`20`	`19`	`$dto = new CustomerResponseDto();`
`21`	`20`	`$dto->email = $customer->getEmail();`