Merge pull request #30 from DoclerLabs/only-add-needed-content-type-serializers

only add needed content type serializers

Author: vsouz4

.php_cs.php

@@ -13,6 +13,7 @@
     'array_syntax'                              => ['syntax' => 'short'],
     'no_multiline_whitespace_before_semicolons' => true,
     'no_short_echo_tag'                         => true,
+    'no_unused_imports'                         => true,
     'not_operator_with_successor_space'         => true,
     'no_useless_else'                           => true,
     'ordered_imports'                           => [

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 
+## [5.1.0] - 2021-04-02
+### Changed
+ - Only content type serializers which are used are included
+
 ## [5.0.0] - 2021-02-15
 ### Changed
  - By default, the PHP version used in the generated client is 7.4.

example/gen/README.md

@@ -11,7 +11,7 @@ docker run -it \
 -e OPENAPI=/openapi.yaml \
 -e OUTPUT_DIR=/client \
 -e PACKAGE=openapi/pet-store-client \
--e CLIENT_PHP_VERSION=7.2 \
+-e CLIENT_PHP_VERSION=7.4 \
 dhlabs/api-client-generator
 ```
 

example/gen/composer.json

@@ -8,7 +8,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.4",
         "docler-labs/api-client-exception": "^1.0",
         "guzzlehttp/psr7": "^1.6",
         "pimple/pimple": "^3.3",

example/gen/src/Request/AddPetRequest.php

@@ -12,11 +12,9 @@
 
 class AddPetRequest implements RequestInterface
 {
-    /** @var Pet */
-    private $pet;
+    private Pet $pet;
 
-    /** @var string */
-    private $contentType;
+    private string $contentType;
 
     public function __construct(Pet $pet, string $contentType)
     {

example/gen/src/Request/CreateUserRequest.php

@@ -12,11 +12,9 @@
 
 class CreateUserRequest implements RequestInterface
 {
-    /** @var User */
-    private $user;
+    private User $user;
 
-    /** @var string */
-    private $contentType;
+    private string $contentType;
 
     public function __construct(User $user, string $contentType)
     {

example/gen/src/Request/CreateUsersWithListInputRequest.php

@@ -12,11 +12,9 @@
 
 class CreateUsersWithListInputRequest implements RequestInterface
 {
-    /** @var UserCollection */
-    private $createUsersWithListInputRequestBody;
+    private UserCollection $createUsersWithListInputRequestBody;
 
-    /** @var string */
-    private $contentType = 'application/json';
+    private string $contentType = 'application/json';
 
     public function __construct(UserCollection $createUsersWithListInputRequestBody)
     {

example/gen/src/Request/DeleteOrderRequest.php

@@ -10,11 +10,9 @@
 
 class DeleteOrderRequest implements RequestInterface
 {
-    /** @var int */
-    private $orderId;
+    private int $orderId;
 
-    /** @var string */
-    private $contentType = '';
+    private string $contentType = '';
 
     public function __construct(int $orderId)
     {

example/gen/src/Request/DeletePetRequest.php

@@ -12,14 +12,11 @@
 
 class DeletePetRequest implements RequestInterface
 {
-    /** @var string|null */
-    private $apiKey;
+    private ?string $apiKey = null;
 
-    /** @var int */
-    private $petId;
+    private int $petId;
 
-    /** @var string */
-    private $contentType = '';
+    private string $contentType = '';
 
     public function __construct(int $petId)
     {

example/gen/src/Request/DeleteUserRequest.php

@@ -10,11 +10,9 @@
 
 class DeleteUserRequest implements RequestInterface
 {
-    /** @var string */
-    private $username;
+    private string $username;
 
-    /** @var string */
-    private $contentType = '';
+    private string $contentType = '';
 
     public function __construct(string $username)
     {

example/gen/src/Request/FindPetsByStatusRequest.php

@@ -21,11 +21,9 @@ class FindPetsByStatusRequest implements RequestInterface
 
     public const ALLOWED_STATUS_LIST = [self::STATUS_AVAILABLE, self::STATUS_PENDING, self::STATUS_SOLD];
 
-    /** @var string|null */
-    private $status;
+    private ?string $status = null;
 
-    /** @var string */
-    private $contentType = '';
+    private string $contentType = '';
 
     public function getContentType(): string
     {

example/gen/src/Request/FindPetsByTagsRequest.php

@@ -12,11 +12,9 @@
 
 class FindPetsByTagsRequest implements RequestInterface
 {
-    /** @var string[]|null */
-    private $tags;
+    private ?array $tags = null;
 
-    /** @var string */
-    private $contentType = '';
+    private string $contentType = '';
 
     public function getContentType(): string
     {

example/gen/src/Request/GetInventoryRequest.php

@@ -10,8 +10,7 @@
 
 class GetInventoryRequest implements RequestInterface
 {
-    /** @var string */
-    private $contentType = '';
+    private string $contentType = '';
 
     public function getContentType(): string
     {

example/gen/src/Request/GetOrderByIdRequest.php

@@ -10,11 +10,9 @@
 
 class GetOrderByIdRequest implements RequestInterface
 {
-    /** @var int */
-    private $orderId;
+    private int $orderId;
 
-    /** @var string */
-    private $contentType = '';
+    private string $contentType = '';
 
     public function __construct(int $orderId)
     {

example/gen/src/Request/GetPetByIdRequest.php

@@ -10,11 +10,9 @@
 
 class GetPetByIdRequest implements RequestInterface
 {
-    /** @var int */
-    private $petId;
+    private int $petId;
 
-    /** @var string */
-    private $contentType = '';
+    private string $contentType = '';
 
     public function __construct(int $petId)
     {

example/gen/src/Request/GetUserByNameRequest.php

@@ -10,11 +10,9 @@
 
 class GetUserByNameRequest implements RequestInterface
 {
-    /** @var string */
-    private $username;
+    private string $username;
 
-    /** @var string */
-    private $contentType = '';
+    private string $contentType = '';
 
     public function __construct(string $username)
     {

example/gen/src/Request/LoginUserRequest.php

@@ -12,14 +12,11 @@
 
 class LoginUserRequest implements RequestInterface
 {
-    /** @var string|null */
-    private $username;
+    private ?string $username = null;
 
-    /** @var string|null */
-    private $password;
+    private ?string $password = null;
 
-    /** @var string */
-    private $contentType = '';
+    private string $contentType = '';
 
     public function getContentType(): string
     {

example/gen/src/Request/LogoutUserRequest.php

@@ -10,8 +10,7 @@
 
 class LogoutUserRequest implements RequestInterface
 {
-    /** @var string */
-    private $contentType = '';
+    private string $contentType = '';
 
     public function getContentType(): string
     {

example/gen/src/Request/Mapper/GuzzleRequestMapper.php

@@ -17,11 +17,9 @@
 
 class GuzzleRequestMapper implements RequestMapperInterface
 {
-    /** @var BodySerializer */
-    private $bodySerializer;
+    private BodySerializer $bodySerializer;
 
-    /** @var QuerySerializer */
-    private $querySerializer;
+    private QuerySerializer $querySerializer;
 
     public function __construct(BodySerializer $bodySerializer, QuerySerializer $querySerializer)
     {

example/gen/src/Request/PlaceOrderRequest.php

@@ -12,11 +12,9 @@
 
 class PlaceOrderRequest implements RequestInterface
 {
-    /** @var Order */
-    private $order;
+    private Order $order;
 
-    /** @var string */
-    private $contentType;
+    private string $contentType;
 
     public function __construct(Order $order, string $contentType)
     {

example/gen/src/Request/UpdatePetRequest.php

@@ -12,11 +12,9 @@
 
 class UpdatePetRequest implements RequestInterface
 {
-    /** @var Pet */
-    private $pet;
+    private Pet $pet;
 
-    /** @var string */
-    private $contentType;
+    private string $contentType;
 
     public function __construct(Pet $pet, string $contentType)
     {

example/gen/src/Request/UpdatePetWithFormRequest.php

@@ -12,17 +12,13 @@
 
 class UpdatePetWithFormRequest implements RequestInterface
 {
-    /** @var int */
-    private $petId;
+    private int $petId;
 
-    /** @var string|null */
-    private $name;
+    private ?string $name = null;
 
-    /** @var string|null */
-    private $status;
+    private ?string $status = null;
 
-    /** @var string */
-    private $contentType = '';
+    private string $contentType = '';
 
     public function __construct(int $petId)
     {

example/gen/src/Request/UpdateUserRequest.php

@@ -12,14 +12,11 @@
 
 class UpdateUserRequest implements RequestInterface
 {
-    /** @var string */
-    private $username;
+    private string $username;
 
-    /** @var User */
-    private $user;
+    private User $user;
 
-    /** @var string */
-    private $contentType;
+    private string $contentType;
 
     public function __construct(string $username, User $user, string $contentType)
     {

example/gen/src/Schema/Category.php

@@ -12,11 +12,9 @@
 
 class Category implements SerializableInterface, JsonSerializable
 {
-    /** @var int|null */
-    private $id;
+    private ?int $id = null;
 
-    /** @var string|null */
-    private $name;
+    private ?string $name = null;
 
     public function setId(int $id): self
     {

example/gen/src/Schema/Mapper/PetCollectionMapper.php

@@ -12,8 +12,7 @@
 
 class PetCollectionMapper implements SchemaMapperInterface
 {
-    /** @var PetMapper */
-    private $petMapper;
+    private PetMapper $petMapper;
 
     public function __construct(PetMapper $petMapper)
     {

example/gen/src/Schema/Mapper/PetMapper.php

@@ -13,11 +13,9 @@
 
 class PetMapper implements SchemaMapperInterface
 {
-    /** @var CategoryMapper */
-    private $categoryMapper;
+    private CategoryMapper $categoryMapper;
 
-    /** @var TagCollectionMapper */
-    private $tagCollectionMapper;
+    private TagCollectionMapper $tagCollectionMapper;
 
     public function __construct(CategoryMapper $categoryMapper, TagCollectionMapper $tagCollectionMapper)
     {

example/gen/src/Schema/Mapper/TagCollectionMapper.php

@@ -12,8 +12,7 @@
 
 class TagCollectionMapper implements SchemaMapperInterface
 {
-    /** @var TagMapper */
-    private $tagMapper;
+    private TagMapper $tagMapper;
 
     public function __construct(TagMapper $tagMapper)
     {

example/gen/src/Schema/Order.php

@@ -22,23 +22,17 @@ class Order implements SerializableInterface, JsonSerializable
 
     public const ALLOWED_STATUS_LIST = [self::STATUS_PLACED, self::STATUS_APPROVED, self::STATUS_DELIVERED];
 
-    /** @var int|null */
-    private $id;
+    private ?int $id = null;
 
-    /** @var int|null */
-    private $petId;
+    private ?int $petId = null;
 
-    /** @var int|null */
-    private $quantity;
+    private ?int $quantity = null;
 
-    /** @var DateTimeInterface|null */
-    private $shipDate;
+    private ?DateTimeInterface $shipDate = null;
 
-    /** @var string|null */
-    private $status;
+    private ?string $status = null;
 
-    /** @var bool|null */
-    private $complete;
+    private ?bool $complete = null;
 
     public function setId(int $id): self
     {