fix #5 network exception issue

Author: bernard-ng

Makefile

@@ -8,18 +8,11 @@ help: ## affiche cet aide
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 .PHONY: lint
-lint: vendor/autoload.php ## affiche les erreurs de formatage de code
+lint: ## affiche les erreurs de formatage de code
 	php vendor/bin/ecs
 	php vendor/bin/phpstan
+	php vendor/bin/rector --dry-run
 
 .PHONY: test
-test: vendor/autoload.php ## lance les tests
+test: ## lance les tests
 	php vendor/bin/phpunit
-
-.PHONY: lint-fix
-lint-fix: vendor/autoload.php ## corrige les erreurs de formatage de code
-	php vendor/bin/ecs --fix
-
-vendor/autoload.php: composer.lock # installe les dépendances PHP
-	composer update
-	composer dump-autoload

composer.json

@@ -31,7 +31,8 @@
         "squizlabs/php_codesniffer": "^3.7",
         "symplify/easy-coding-standard": "^11.0",
         "vimeo/psalm": "^4.24",
-        "symfony/var-dumper": "^6.1|^7.0"
+        "symfony/var-dumper": "^6.1|^7.0",
+        "rector/rector": "^1.2"
     },
     "require": {
         "php": ">=8.2",

composer.lock

@@ -3,5 +3,6 @@ parameters:
     paths:
         - src
         - tests
-    checkMissingIterableValueType: false
-    checkGenericClassInNonGenericObjectType: false
+    ignoreErrors:
+            -   identifier: missingType.generics
+            -   identifier: missingType.iterableValue

docker-compose.yaml

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+    ->withPhpSets(php82: true)
+    ->withTypeCoverageLevel(0);

phpstan.neon

@@ -30,7 +30,7 @@
  *
  * @author bernard-ng <[email protected]>
  */
-class Client
+readonly class Client
 {
     private HttpClientInterface $http;
 
@@ -266,17 +266,14 @@ public function collection(string $id, CollectionParameters $parameters = new Co
 
     /**
      * @throws NetworkException
-     * @noinspection PhpReturnValueOfMethodIsNeverUsedInspection
      */
     private function createExceptionFromResponse(\Throwable $exception): never
     {
         if ($exception instanceof HttpExceptionInterface) {
             try {
                 $response = $exception->getResponse();
-                $body = $response->toArray(throw: false);
                 throw NetworkException::create(
-                    message: $body['message'] ?? '',
-                    type: $body['error'],
+                    message: $response->getContent(false),
                     status: $response->getStatusCode()
                 );
             } catch (\Throwable $exception) {
@@ -309,11 +306,9 @@ private function getMappedData(string $type, array $data): Photos|Videos|Collect
                 fn ($m) => $this->serializer->denormalize($m, type: Collection::class),
                 $data['collections']
             ),
-            $mapped instanceof CollectionMedia => $mapped->media = array_map(function ($m) {
-                return $m['type'] === 'Photo' ?
-                    $this->serializer->denormalize($m, type: Photo::class) :
-                    $this->serializer->denormalize($m, type: Video::class);
-            }, $data['media'])
+            $mapped instanceof CollectionMedia => $mapped->media = array_map(fn($m) => $m['type'] === 'Photo' ?
+                $this->serializer->denormalize($m, type: Photo::class) :
+                $this->serializer->denormalize($m, type: Video::class), $data['media'])
         };
 
         return $mapped;

rector.php

@@ -15,24 +15,20 @@ class NetworkException extends \Exception
 {
     public function __construct(
         string $message,
-        ?string $type = null,
-        public ?int $status = null
+        public ?int $status = null,
+        public ?\Throwable $previous = null
     ) {
-        if ($this->status !== null) {
-            parent::__construct($message . ' (HTTP ' . $status . '/' . $type . ')');
-        } else {
-            parent::__construct($message);
-        }
+        parent::__construct($message, previous: $this->previous);
     }
 
-    public static function create(string $message, string $type, int $status): self
+    public static function create(string $message, int $status, ?\Throwable $previous = null): self
     {
         $message = empty($message) ? 'No message was provided' : $message;
         return match (true) {
-            $status === 401 || $status === 429 => new AccountException($message, $type, $status),
-            $status >= 400 && $status <= 499 => new ClientException($message, $type, $status),
-            $status >= 500 && $status <= 599 => new ServerException($message, $type, $status),
-            default => new self($message, $type, $status)
+            $status === 401 || $status === 429 => new AccountException($message, $status, $previous),
+            $status >= 400 && $status <= 499 => new ClientException($message, $status, $previous),
+            $status >= 500 && $status <= 599 => new ServerException($message, $status, $previous),
+            default => new self($message, $status, $previous)
         };
     }
 }

src/Client.php

@@ -27,11 +27,7 @@ final class ClientTest extends TestCase
     private function getPexels(callable|MockResponse $mock): Client
     {
         $pexels = new Client('your_token');
-        $reflection = new ReflectionClass($pexels);
-
-        $http = $reflection->getProperty('http');
-        $http->setAccessible(true);
-        $http->setValue($pexels, new MockHttpClient($mock));
+        $this->setValue($pexels, 'http', new MockHttpClient($mock));
 
         return $pexels;
     }
@@ -138,4 +134,23 @@ public function testCollection(): void
             }
         }
     }
+
+    private function setValue(object &$object, string $propertyName, mixed $value): void
+    {
+        $reflectionClass = new ReflectionClass($object);
+
+        if ($reflectionClass->getProperty($propertyName)->isReadOnly()) {
+            $mutable = $reflectionClass->newInstanceWithoutConstructor();
+
+            foreach ($reflectionClass->getProperties() as $property) {
+                if ($property->isInitialized($object) && $property->name != $propertyName) {
+                    $reflectionClass->getProperty($property->name)->setValue($mutable, $property->getValue($object));
+                }
+            }
+
+            $object = $mutable;
+        }
+
+        $reflectionClass->getProperty($propertyName)->setValue($object, $value);
+    }
 }