Chore/upgrade symfony (#2)

* chore: update to symfony 6 & php8 * style: stan * chore: upgrade to sf6.4 * chore: upgrade to sf6.4
johnkhansrc · Dec 1, 2023 · 2e90ad2 · 2e90ad2
1 parent d6fbcbb
commit 2e90ad2
Show file tree

Hide file tree

Showing 17 changed files with 80 additions and 32 deletions.
diff --git a/composer.json b/composer.json
@@ -10,11 +10,11 @@
         }
     ],
     "require": {
-        "php": "^7.4",
-        "symfony/http-client": "^5.4",
-        "symfony/config": "^5.4",
-        "symfony/dependency-injection": "^5.4",
-        "symfony/http-kernel": "^5.4",
+        "php": ">=8.3",
+        "symfony/http-client": "6.4.*",
+        "symfony/config": "6.4.*",
+        "symfony/dependency-injection": "v6.4.*",
+        "symfony/http-kernel": "6.4.*",
         "ext-json": "*"
     },
     "autoload": {
@@ -28,8 +28,9 @@
         }
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^6.0",
-        "symfony/framework-bundle": "5.4",
-        "symfony/browser-kit": "^5.4"
+        "symfony/phpunit-bridge": "^6.4",
+        "symfony/framework-bundle": "6.4.*",
+        "symfony/browser-kit": "6.4.*",
+        "phpstan/phpstan": "^1.10"
     }
 }
diff --git a/src/Controller/IaphubWebhookEntrypointController.php b/src/Controller/IaphubWebhookEntrypointController.php
@@ -52,7 +52,7 @@ public function __construct(
     public function index(Request $request): JsonResponse
     {
         if (!$this->requestValidator->isValidHeader($request)) {
-            return $this->json([], Response::HTTP_UNAUTHORIZED);
+            return $this->json(Response::HTTP_UNAUTHORIZED);
         }
 
         $payload = json_decode($request->getContent(), true, 512, JSON_THROW_ON_ERROR);
@@ -117,8 +117,8 @@ public function index(Request $request): JsonResponse
         return $this->json();
     }
 
-    public function json(): JsonResponse
+    public function json(int $status = 200): JsonResponse
     {
-        return new JsonResponse(null, 200);
+        return new JsonResponse(null, $status);
     }
 }
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -12,6 +12,7 @@ public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('johnkhansrc_iaphub');
         $rootNode = $treeBuilder->getRootNode();
+        /* @phpstan-ignore-next-line */
         $rootNode
             ->children()
                 ->scalarNode('apikey')

diff --git a/src/Exception/IaphubBundleBadQueryStringException.php b/src/Exception/IaphubBundleBadQueryStringException.php
@@ -6,8 +6,15 @@
 
 class IaphubBundleBadQueryStringException extends Exception
 {
-    public function __construct($uri, $expected, $rejected)
+    /**
+     * @param array<int, int|string> $expected
+     */
+    public function __construct(?string $uri, array $expected, ?string $rejected)
     {
+        if (!$uri || !$rejected) {
+            $uri = 'unknown uri';
+            $rejected = 'unknown rejected parameter';
+        }
         $acceptedParameters = implode(', ', $expected);
         $message = "Cant call $uri with query parameter '$rejected', accepted parameters: $acceptedParameters";
 

diff --git a/src/Exception/IaphubBundleBadQueryStringValueException.php b/src/Exception/IaphubBundleBadQueryStringValueException.php
@@ -6,7 +6,10 @@
 
 class IaphubBundleBadQueryStringValueException extends Exception
 {
-    public function __construct($uri, $expected, $rejected)
+    /**
+     * @param array<int, int|string> $expected
+     */
+    public function __construct(string $uri, array $expected, string $rejected)
     {
         $acceptedParameters = implode(', ', $expected);
         $message = "Cant call $uri with query parameter value '$rejected', accepted values: $acceptedParameters";

diff --git a/src/Exception/IaphubUnsuportedWebhookException.php b/src/Exception/IaphubUnsuportedWebhookException.php
@@ -6,7 +6,7 @@
 
 class IaphubUnsuportedWebhookException extends Exception
 {
-    public function __construct($webhookType)
+    public function __construct(string $webhookType)
     {
         $message = "Unexpected webhook type: $webhookType";
 

diff --git a/src/Factory/Api/GetPurchasesFactory.php b/src/Factory/Api/GetPurchasesFactory.php
@@ -7,6 +7,7 @@
 class GetPurchasesFactory
 {
     /**
+     * @param mixed[] $data
      * @throws \Exception
      */
     public static function build(array $data): GetPurchases

diff --git a/src/Factory/Api/GetUserApiResponseFactory.php b/src/Factory/Api/GetUserApiResponseFactory.php
@@ -11,6 +11,7 @@
 class GetUserApiResponseFactory
 {
     /**
+     * @param mixed[] $payload
      * @throws Exception
      */
     public static function build(array $payload): GetUserApiResponse

diff --git a/src/Factory/Api/PostUserReceiptResponseFactory.php b/src/Factory/Api/PostUserReceiptResponseFactory.php
@@ -7,6 +7,7 @@
 class PostUserReceiptResponseFactory
 {
     /**
+     * @param mixed[] $data
      * @throws \Exception
      */
     public static function build(array $data): PostUserReceiptResponse

diff --git a/src/Factory/Api/PurchaseFactory.php b/src/Factory/Api/PurchaseFactory.php
@@ -9,6 +9,8 @@
 class PurchaseFactory
 {
     /**
+     * @param mixed[] $purchasesData
+     * @return Purchase[]
      * @throws Exception
      */
     public static function buildPurchases(array $purchasesData): array
@@ -22,6 +24,7 @@ public static function buildPurchases(array $purchasesData): array
     }
 
     /**
+     * @param mixed[] $purchaseData
      * @throws Exception
      */
     public static function buildPurchase(array $purchaseData): Purchase

diff --git a/src/Factory/Api/ReceiptFactory.php b/src/Factory/Api/ReceiptFactory.php
@@ -9,6 +9,7 @@
 class ReceiptFactory
 {
     /**
+     * @param mixed[] $data
      * @throws Exception
      */
     public static function build(array $data): Receipt

diff --git a/src/Factory/Api/TransactionFactory.php b/src/Factory/Api/TransactionFactory.php
@@ -9,6 +9,7 @@
 class TransactionFactory
 {
     /**
+     * @param mixed[] $data
      * @throws Exception
      */
     public static function build(array $data): Transaction

diff --git a/src/Model/Api/ActiveProducts.php b/src/Model/Api/ActiveProducts.php
@@ -173,9 +173,9 @@ public function setSku(string $sku): ActiveProducts
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getPlatform(): string
+    public function getPlatform(): ?string
     {
         return $this->platform;
     }
@@ -191,9 +191,9 @@ public function setPlatform(string $platform): ActiveProducts
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getPurchase(): string
+    public function getPurchase(): ?string
     {
         return $this->purchase;
     }
@@ -227,9 +227,9 @@ public function setPurchaseDate(DateTime $purchaseDate): ActiveProducts
     }
 
     /**
-     * @return bool
+     * @return bool|null
      */
-    public function isFamilyShare(): bool
+    public function isFamilyShare(): ?bool
     {
         return $this->isFamilyShare;
     }

diff --git a/src/Model/Api/GetUserApiResponse.php b/src/Model/Api/GetUserApiResponse.php
@@ -6,6 +6,7 @@ class GetUserApiResponse
 {
     /**
      * User tags.
+     * @var string[]|null
      */
     private ?array $tags;
     /**
@@ -20,7 +21,7 @@ class GetUserApiResponse
     private array $activeProducts;
 
     /**
-     * @param array|null $tags
+     * @param string[]|null $tags
      * @param ProductsForSale[] $productsForSale
      * @param ActiveProducts[] $activeProducts
      */
@@ -32,15 +33,15 @@ public function __construct(?array $tags, array $productsForSale, array $activeP
     }
 
     /**
-     * @return array|null
+     * @return string[]|null
      */
     public function getTags(): ?array
     {
         return $this->tags;
     }
 
     /**
-     * @param array|null $tags
+     * @param string[]|null $tags
      * @return GetUserApiResponse
      */
     public function setTags(?array $tags): GetUserApiResponse

diff --git a/src/Model/Api/Purchase.php b/src/Model/Api/Purchase.php
@@ -29,6 +29,7 @@ class Purchase
     private string $country;
     /**
      * Tags of the user on purchase.
+     * @var string[]
      */
     private array $tags;
     /**
@@ -50,6 +51,7 @@ class Purchase
     /**
      * Only if the mode allowing an user to have multiple user ids is enabled
      * User ids of the user owning the purchase (A purchase can be owned by multiple user ids if restored).
+     * @var string[]|null
      */
     private ?array $userIds;
     /**
@@ -280,6 +282,10 @@ class Purchase
      */
     private ?string $originalPurchase;
 
+    /**
+     * @param string[] $tags
+     * @param string[]|null $userIds
+     */
     public function __construct(string $id,
                                 DateTime $purchaseDate,
                                 int $quantity,
@@ -472,15 +478,15 @@ public function setCountry(string $country): Purchase
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function getTags(): array
     {
         return $this->tags;
     }
 
     /**
-     * @param array $tags
+     * @param string[] $tags
      * @return Purchase
      */
     public function setTags(array $tags): Purchase
@@ -562,15 +568,15 @@ public function setUserId(string $userId): Purchase
     }
 
     /**
-     * @return array|null
+     * @return string[]|null
      */
     public function getUserIds(): ?array
     {
         return $this->userIds;
     }
 
     /**
-     * @param array|null $userIds
+     * @param string[]|null $userIds
      * @return Purchase
      */
     public function setUserIds(?array $userIds): Purchase