Support symfony 7

answear · Oct 1, 2024 · 4ac81d1 · 4ac81d1
1 parent 38fda42
commit 4ac81d1
Show file tree

Hide file tree

Showing 33 changed files with 188 additions and 423 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -11,15 +11,10 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "7.4"
-                    - "8.0"
-                    - "8.1"
+                    - "8.2"
                 deps:
                     - "normal"
-                include:
-                    - deps: "low"
-                      php-version: "7.4"
-
+                    - "low"
         steps:
             - name: "Checkout"
               uses: "actions/checkout@v2"

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -11,9 +11,7 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "7.4"
-                    - "8.0"
-                    - "8.1"
+                    - "8.2"
 
         steps:
             -   name: "Checkout"

diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -20,7 +20,7 @@
             'strict_param' => false,
             'array_syntax' => ['syntax' => 'short'],
             'concat_space' => ['spacing' => 'one'],
-            'phpdoc_align' => [],
+            'phpdoc_align' => ['align' => 'left'],
             'phpdoc_summary' => false,
             'void_return' => false,
             'phpdoc_var_without_name' => false,

diff --git a/composer.json b/composer.json
@@ -4,20 +4,20 @@
     "type": "symfony-bundle",
     "license": "MIT",
     "require": {
-        "php": ">=7.4|^8.0",
+        "php": "^8.2",
         "ext-json": "*",
-        "webmozart/assert": "^1.3",
+        "webmozart/assert": "^1.11",
         "guzzlehttp/guzzle": "^6.0|^7.0",
-        "symfony/http-kernel": "^5.4|^6.0"
+        "symfony/http-kernel": "^6.0|^7.0"
     },
     "require-dev": {
         "roave/security-advisories": "dev-master",
-        "phpunit/phpunit": "^9.5",
-        "symfony/phpunit-bridge": "6.1.*",
-        "phpro/grumphp": "^1.5.0",
-        "friendsofphp/php-cs-fixer": "^3.4",
-        "phpstan/phpstan": "^1.4",
-        "phpstan/phpstan-webmozart-assert": "^1.0"
+        "phpunit/phpunit": "^10.5",
+        "symfony/phpunit-bridge": "6.1.*|^7.0",
+        "phpro/grumphp": "^2.8",
+        "friendsofphp/php-cs-fixer": "^3.64",
+        "phpstan/phpstan": "^1.12",
+        "phpstan/phpstan-webmozart-assert": "^1.2"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,29 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          bootstrap="./vendor/autoload.php"
          backupGlobals="false"
-         beStrictAboutCoversAnnotation="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutTodoAnnotatedTests="true"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         verbose="true"
+         cacheDirectory=".phpunit.cache"
+         beStrictAboutCoverageMetadata="true"
 >
     <php>
-        <ini name="error_reporting" value="-1"/>
+        <ini name="error_reporting" value="1"/>
     </php>
-
     <testsuites>
         <testsuite name="Answear WideEyesBundle Test Suite">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
 </phpunit>
diff --git a/src/Exception/MalformedResponse.php b/src/Exception/MalformedResponse.php
@@ -6,20 +6,11 @@
 
 class MalformedResponse extends \RuntimeException
 {
-    /**
-     * @var mixed
-     */
-    private $response;
-
-    public function __construct($message, $response, ?\Throwable $previous = null)
-    {
+    public function __construct(
+        $message,
+        public readonly mixed $response,
+        ?\Throwable $previous = null,
+    ) {
         parent::__construct($message, 0, $previous);
-
-        $this->response = $response;
-    }
-
-    public function getResponse()
-    {
-        return $this->response;
     }
 }
diff --git a/src/Request/DetectAndFeaturesRequest.php b/src/Request/DetectAndFeaturesRequest.php
@@ -4,21 +4,19 @@
 
 namespace Answear\WideEyesBundle\Request;
 
-class DetectAndFeaturesRequest implements Request
+readonly class DetectAndFeaturesRequest implements Request
 {
-    private string $image;
-
-    public function __construct(string $image)
+    public function __construct(private string $image)
     {
-        $this->image = $image;
     }
 
     public function toJson(): string
     {
         return json_encode(
             [
                 'image' => $this->image,
-            ]
+            ],
+            JSON_THROW_ON_ERROR
         );
     }
 }
diff --git a/src/Request/GetSimilarRequest.php b/src/Request/GetSimilarRequest.php
@@ -4,15 +4,12 @@
 
 namespace Answear\WideEyesBundle\Request;
 
-class GetSimilarRequest implements Request
+readonly class GetSimilarRequest implements Request
 {
-    private string $uid;
-    private string $country;
-
-    public function __construct(string $uid, string $country)
-    {
-        $this->uid = $uid;
-        $this->country = $country;
+    public function __construct(
+        private string $uid,
+        private string $country,
+    ) {
     }
 
     public function toJson(): string
@@ -21,7 +18,8 @@ public function toJson(): string
             [
                 'uid' => $this->uid,
                 'country' => $this->country,
-            ]
+            ],
+            JSON_THROW_ON_ERROR
         );
     }
 }
diff --git a/src/Request/SearchByFeatureRequest.php b/src/Request/SearchByFeatureRequest.php
@@ -4,21 +4,15 @@
 
 namespace Answear\WideEyesBundle\Request;
 
-class SearchByFeatureRequest implements Request
+readonly class SearchByFeatureRequest implements Request
 {
-    private string $featureId;
-    private string $label;
-    private ?string $gender;
-    private ?string $filters;
-    private ?int $maxNumResults;
-
-    public function __construct(string $featureId, string $label, ?string $gender = null, ?string $filters = null, ?int $maxNumResults = null)
-    {
-        $this->featureId = $featureId;
-        $this->label = $label;
-        $this->gender = $gender;
-        $this->filters = $filters;
-        $this->maxNumResults = $maxNumResults;
+    public function __construct(
+        private string $featureId,
+        private string $label,
+        private ?string $gender = null,
+        private ?string $filters = null,
+        private ?int $maxNumResults = null,
+    ) {
     }
 
     public function toJson(): string
@@ -32,7 +26,8 @@ public function toJson(): string
                     'filters' => $this->filters,
                     'maxNumResults' => $this->maxNumResults,
                 ]
-            )
+            ),
+            JSON_THROW_ON_ERROR
         );
     }
 }
diff --git a/src/Response/DetectAndFeaturesResponse.php b/src/Response/DetectAndFeaturesResponse.php
@@ -8,17 +8,14 @@
 use Answear\WideEyesBundle\ValueObject\Detection;
 use Webmozart\Assert\Assert;
 
-class DetectAndFeaturesResponse
+readonly class DetectAndFeaturesResponse
 {
     /**
-     * @var Detection[]
+     * @param Detection[] $detections
      */
-    private array $detections;
-
-    private function __construct(array $detections)
+    private function __construct(public array $detections)
     {
         Assert::allIsInstanceOf($detections, Detection::class);
-        $this->detections = $detections;
     }
 
     public static function fromArray(array $response): DetectAndFeaturesResponse
@@ -34,13 +31,8 @@ static function ($item) {
                     $response['detections'],
                 )
             );
-        } catch (\Throwable $e) {
-            throw new MalformedResponse($e->getMessage(), $response, $e);
+        } catch (\Throwable $throwable) {
+            throw new MalformedResponse($throwable->getMessage(), $response, $throwable);
         }
     }
-
-    public function getDetections(): array
-    {
-        return $this->detections;
-    }
 }
diff --git a/src/Response/GetSimilarResponse.php b/src/Response/GetSimilarResponse.php
@@ -7,14 +7,14 @@
 use Answear\WideEyesBundle\Exception\MalformedResponse;
 use Webmozart\Assert\Assert;
 
-class GetSimilarResponse
+readonly class GetSimilarResponse
 {
-    private array $uids;
-
-    private function __construct(array $uids)
+    /**
+     * @param string[] $uids
+     */
+    private function __construct(public array $uids)
     {
         Assert::allString($uids);
-        $this->uids = $uids;
     }
 
     public static function fromArray(array $response, string $originalUid): GetSimilarResponse
@@ -33,17 +33,12 @@ static function ($item) {
                 array_values(
                     array_filter(
                         $responseUids,
-                        static fn ($item) => $item !== $originalUid,
+                        static fn($item) => $item !== $originalUid,
                     )
                 )
             );
         } catch (\Throwable $e) {
             throw new MalformedResponse($e->getMessage(), $response, $e);
         }
     }
-
-    public function getUids(): array
-    {
-        return $this->uids;
-    }
 }
diff --git a/src/Response/SearchByFeatureResponse.php b/src/Response/SearchByFeatureResponse.php
@@ -7,14 +7,14 @@
 use Answear\WideEyesBundle\Exception\MalformedResponse;
 use Webmozart\Assert\Assert;
 
-class SearchByFeatureResponse
+readonly class SearchByFeatureResponse
 {
-    private array $uids;
-
-    private function __construct(array $uids)
+    /**
+     * @param string[] $uids
+     */
+    private function __construct(public array $uids)
     {
         Assert::allString($uids);
-        $this->uids = $uids;
     }
 
     public static function fromArray(array $response): SearchByFeatureResponse
@@ -39,9 +39,4 @@ static function ($item) {
             throw new MalformedResponse($e->getMessage(), $response, $e);
         }
     }
-
-    public function getUids(): array
-    {
-        return $this->uids;
-    }
 }
diff --git a/src/Service/AbstractClient.php b/src/Service/AbstractClient.php
@@ -15,19 +15,16 @@
 
 abstract class AbstractClient
 {
-    protected ConfigProvider $configProvider;
-    protected ClientInterface $guzzle;
-
-    public function __construct(ConfigProvider $configProvider, ClientInterface $client)
-    {
-        $this->configProvider = $configProvider;
-        $this->guzzle = $client;
+    public function __construct(
+        protected ConfigProvider $configProvider,
+        protected ClientInterface $client,
+    ) {
     }
 
     protected function request(string $endpoint, Request $request): array
     {
         try {
-            $response = $this->guzzle->request(
+            $response = $this->client->request(
                 'POST',
                 $endpoint,
                 [
@@ -51,7 +48,7 @@ protected function manyRequests(string $endpoint, array $requests): array
         $promises = [];
 
         foreach ($requests as $key => $request) {
-            $promises[$key] = $this->guzzle->requestAsync(
+            $promises[$key] = $this->client->requestAsync(
                 'POST',
                 $endpoint,
                 [
@@ -61,7 +58,7 @@ protected function manyRequests(string $endpoint, array $requests): array
             );
         }
 
-        $promisesResults = Promise\settle($promises)->wait();
+        $promisesResults = Promise\Utils::settle($promises)->wait();
 
         $processedResults = [];
         foreach ($promisesResults as $key => $result) {