Faсtory methods now returns self instead of static (#24)

avtocod · Oct 22, 2020 · 97e55cb · 97e55cb
1 parent bc8197e
commit 97e55cb
Show file tree

Hide file tree

Showing 25 changed files with 39 additions and 64 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,10 @@ The format is based on [Keep a Changelog][keepachangelog] and this project adher
 - Method `ClientInterface::userReports` now takes optional object `UserReportsParams` as parameter
 - Method `ClientInterface::userReport` now takes object `UserReportParams` as parameter
 - Method `ClientInterface::userReportRefresh` now takes object `UserReportRefreshParams` as parameter
+- Faсtory methods now returns `self` instead of `static` in classes:
+  - `Avtocod\B2BApi\Exceptions\*`
+  - `Avtocod\B2BApi\Responses\Entities\*`
+  - `Avtocod\B2BApi\Responses\*Response`
 
 ### Fixed
 

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,10 +2,3 @@ parameters:
   level: 'max'
   paths:
     - src
-  ignoreErrors:
-    - # Replacing with `return new self` or classes finalization requires major version upping. Make it on next major release
-      message: '#Unsafe usage of new static\(\)#'
-      paths:
-        - src/Responses/*Response.php
-        - src/Responses/Entities/*.php
-        - src/Exceptions/*Exception.php
diff --git a/src/Exceptions/BadResponseException.php b/src/Exceptions/BadResponseException.php
@@ -44,7 +44,7 @@ public static function wrongJson(ResponseInterface $http_response,
                                      ?string $message = null,
                                      ?Throwable $prev = null): self
     {
-        return new static($http_response, $message ?? 'Server sent wrong json', 0, $prev);
+        return new self($http_response, $message ?? 'Server sent wrong json', 0, $prev);
     }
 
     /**

diff --git a/src/Exceptions/TokenParserException.php b/src/Exceptions/TokenParserException.php
@@ -18,6 +18,6 @@ class TokenParserException extends RuntimeException implements B2BApiExceptionIn
      */
     public static function cannotParseToken(?string $message = null, int $code = 0, ?Throwable $prev = null): self
     {
-        return new static($message ?? 'Cannot parse token', $code, $prev);
+        return new self($message ?? 'Cannot parse token', $code, $prev);
     }
 }
diff --git a/src/Responses/DevPingResponse.php b/src/Responses/DevPingResponse.php
@@ -75,7 +75,7 @@ public static function fromHttpResponse(HttpResponseInterface $response): self
             throw BadResponseException::wrongJson($response, $e->getMessage(), $e);
         }
 
-        return new static(
+        return new self(
             $raw_response,
             $as_array['value'],
             $as_array['in'],

diff --git a/src/Responses/DevTokenResponse.php b/src/Responses/DevTokenResponse.php
@@ -137,7 +137,7 @@ public static function fromHttpResponse(HttpResponseInterface $response): self
             throw BadResponseException::wrongJson($response, $e->getMessage(), $e);
         }
 
-        return new static(
+        return new self(
             $raw_response,
             $as_array['user'],
             $as_array['pass'],

diff --git a/src/Responses/Entities/Balance.php b/src/Responses/Entities/Balance.php
@@ -88,13 +88,11 @@ public function __construct(string $report_type_uid,
     }
 
     /**
-     * @param array<string, mixed> $data
-     *
-     * @return self
+     * @inheritDoc
      */
     public static function fromArray(array $data): self
     {
-        return new static(
+        return new self(
             $data['report_type_uid'],
             $data['balance_type'],
             $data['quote_init'],

diff --git a/src/Responses/Entities/CanCreateSelfFromArrayInterface.php b/src/Responses/Entities/CanCreateSelfFromArrayInterface.php
@@ -7,9 +7,9 @@ interface CanCreateSelfFromArrayInterface
     /**
      * Create self using array of data.
      *
-     * @param array<mixed> $data
+     * @param array<string, mixed> $data
      *
-     * @return self|$this
+     * @return self
      */
     public static function fromArray(array $data);
 }
diff --git a/src/Responses/Entities/CleanOptions.php b/src/Responses/Entities/CleanOptions.php
@@ -36,13 +36,11 @@ public function __construct(?int $process_response, ?int $process_request, ?int
     }
 
     /**
-     * @param array<string, int|null> $data
-     *
-     * @return self
+     * @inheritDoc
      */
     public static function fromArray(array $data): self
     {
-        return new static(
+        return new self(
             $data['Process_Response'] ?? null,
             $data['Process_Request'] ?? null,
             $data['ReportLog'] ?? null

diff --git a/src/Responses/Entities/Domain.php b/src/Responses/Entities/Domain.php
@@ -129,13 +129,11 @@ public function __construct(string $uid,
     }
 
     /**
-     * @param array<string, mixed> $data
-     *
-     * @return self
+     * @inheritDoc
      */
     public static function fromArray(array $data): self
     {
-        return new static(
+        return new self(
             $data['uid'],
             $data['comment'],
             $data['name'],

diff --git a/src/Responses/Entities/Report.php b/src/Responses/Entities/Report.php
@@ -185,13 +185,11 @@ public function __construct(string $uid,
     }
 
     /**
-     * @param array<string, mixed> $data
-     *
-     * @return self
+     * @inheritDoc
      */
     public static function fromArray(array $data): self
     {
-        return new static(
+        return new self(
             $data['uid'],
             $data['comment'],
             $data['name'],

diff --git a/src/Responses/Entities/ReportMade.php b/src/Responses/Entities/ReportMade.php
@@ -46,13 +46,11 @@ public function __construct(string $report_uid, bool $is_new, ?string $process_r
     }
 
     /**
-     * @param array<string, string|bool|null> $data
-     *
-     * @return self
+     * @inheritDoc
      */
     public static function fromArray(array $data): self
     {
-        return new static(
+        return new self(
             $data['uid'],
             $data['isnew'],
             $data['process_request_uid'] ?? null,

diff --git a/src/Responses/Entities/ReportQuery.php b/src/Responses/Entities/ReportQuery.php
@@ -36,13 +36,11 @@ public function __construct(?string $type, ?string $body, ?array $data)
     }
 
     /**
-     * @param array<string, string|array<mixed>|null> $data
-     *
-     * @return self
+     * @inheritDoc
      */
     public static function fromArray(array $data): self
     {
-        return new static(
+        return new self(
             $data['type'] ?? null,
             $data['body'] ?? null,
             $data['data'] ?? null

diff --git a/src/Responses/Entities/ReportSourceState.php b/src/Responses/Entities/ReportSourceState.php
@@ -51,13 +51,11 @@ public function __construct(string $name, string $state, ?array $data)
     }
 
     /**
-     * @param array<string, string|array<mixed>|null> $data
-     *
-     * @return self
+     * @inheritDoc
      */
     public static function fromArray(array $data): self
     {
-        return new static(
+        return new self(
             $data['_id'] ?? $data['id'] ?? $data['name'],
             $data['state'],
             $data['data'] ?? null

diff --git a/src/Responses/Entities/ReportState.php b/src/Responses/Entities/ReportState.php
@@ -22,13 +22,11 @@ public function __construct(array $source_states)
     }
 
     /**
-     * @param array<string, array<string, mixed>> $data
-     *
-     * @return self
+     * @inheritDoc
      */
     public static function fromArray(array $data): self
     {
-        return new static(
+        return new self(
             \array_map(static function (array $report_data): ReportSourceState {
                 return ReportSourceState::fromArray($report_data);
             }, $data['sources'])

diff --git a/src/Responses/Entities/ReportType.php b/src/Responses/Entities/ReportType.php
@@ -249,13 +249,11 @@ public function __construct(string $uid,
     }
 
     /**
-     * @param array<string, mixed> $data
-     *
-     * @return self
+     * @inheritDoc
      */
     public static function fromArray(array $data): self
     {
-        return new static(
+        return new self(
             $data['uid'],
             $data['comment'],
             $data['name'],

diff --git a/src/Responses/Entities/ReportTypeContent.php b/src/Responses/Entities/ReportTypeContent.php
@@ -29,13 +29,11 @@ public function __construct(array $sources, array $fields)
     }
 
     /**
-     * @param array<string, array<string>> $data
-     *
-     * @return self
+     * @inheritDoc
      */
     public static function fromArray(array $data): self
     {
-        return new static(
+        return new self(
             $data['sources'],
             $data['fields']
         );

diff --git a/src/Responses/Entities/User.php b/src/Responses/Entities/User.php
@@ -192,13 +192,11 @@ public function __construct(string $uid,
     }
 
     /**
-     * @param array<string, mixed> $data
-     *
-     * @return self
+     * @inheritDoc
      */
     public static function fromArray(array $data): self
     {
-        return new static(
+        return new self(
             $data['uid'],
             $data['comment'],
             $data['contacts'],

diff --git a/src/Responses/UserBalanceResponse.php b/src/Responses/UserBalanceResponse.php
@@ -88,7 +88,7 @@ public static function fromHttpResponse(HttpResponseInterface $response): self
             return Balance::fromArray($balance_data);
         }, $as_array['data']);
 
-        return new static(
+        return new self(
             $raw_response,
             $as_array['state'],
             $as_array['size'],

diff --git a/src/Responses/UserReportMakeResponse.php b/src/Responses/UserReportMakeResponse.php
@@ -88,7 +88,7 @@ public static function fromHttpResponse(HttpResponseInterface $response): self
             return ReportMade::fromArray($data);
         }, $as_array['data']);
 
-        return new static(
+        return new self(
             $raw_response,
             $as_array['state'],
             $as_array['size'],

diff --git a/src/Responses/UserReportRefreshResponse.php b/src/Responses/UserReportRefreshResponse.php
@@ -88,7 +88,7 @@ public static function fromHttpResponse(HttpResponseInterface $response): self
             return ReportMade::fromArray($data);
         }, $as_array['data']);
 
-        return new static(
+        return new self(
             $raw_response,
             $as_array['state'],
             $as_array['size'],

diff --git a/src/Responses/UserReportResponse.php b/src/Responses/UserReportResponse.php
@@ -88,7 +88,7 @@ public static function fromHttpResponse(HttpResponseInterface $response): self
             return Report::fromArray($data);
         }, $as_array['data']);
 
-        return new static(
+        return new self(
             $raw_response,
             $as_array['state'],
             $as_array['size'],

diff --git a/src/Responses/UserReportTypesResponse.php b/src/Responses/UserReportTypesResponse.php
@@ -100,7 +100,7 @@ public static function fromHttpResponse(HttpResponseInterface $response): self
             return ReportType::fromArray($report_type_data);
         }, $as_array['data']);
 
-        return new static(
+        return new self(
             $raw_response,
             $as_array['state'],
             $as_array['size'],

diff --git a/src/Responses/UserReportsResponse.php b/src/Responses/UserReportsResponse.php
@@ -100,7 +100,7 @@ public static function fromHttpResponse(HttpResponseInterface $response): self
             return Report::fromArray($report_data);
         }, $as_array['data']);
 
-        return new static(
+        return new self(
             $raw_response,
             $as_array['state'],
             $as_array['size'],

diff --git a/src/Responses/UserResponse.php b/src/Responses/UserResponse.php
@@ -88,7 +88,7 @@ public static function fromHttpResponse(HttpResponseInterface $response): self
             return User::fromArray($user_data);
         }, $as_array['data']);
 
-        return new static(
+        return new self(
             $raw_response,
             $as_array['state'],
             $as_array['size'],