Merge branch 'main' into dev-sessions

Author: qschmick

config/bwt-api.php

@@ -1,6 +1,6 @@
 <?php
 
 return [
-    'base_url' => env('BWT_API_BASE_URL', 'https://bwt.com/api/'),
+    'base_url' => env('BWT_API_BASE_URL', 'https://bwt.com/api'),
     'api_key' => env('BWT_API_KEY'),
 ];

phpstan.neon.dist

@@ -5,7 +5,8 @@ parameters:
     level: 5
     paths:
         - src
-        - database
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
-    checkModelProperties: true
+    checkModelProperties: true
+    ignoreErrors:
+        - '#Call to an undefined method Illuminate\\Http\\Client\\Response::getStatusCode\(\)#'

src/BwtApiClient.php

@@ -24,7 +24,7 @@ public function __construct(
         ?string $baseUrl = null,
         ?string $apiKey = null,
     ) {
-        $this->baseUrl = $baseUrl ?? config('bwt-api.base_url', 'https://bwt.com/api/');
+        $this->baseUrl = $baseUrl ?? config('bwt-api.base_url', 'https://bwt.com/api');
         $this->apiKey = $apiKey ?? config('bwt-api.api_key') ?? '';
     }
 

src/DTOs/Amazon/AmazonResult.php

@@ -25,16 +25,16 @@ public function __construct(
         public readonly array $additional_details,
         public readonly array $additional_information,
         public readonly array $additional_technical_details,
-        public readonly string $manufacturer,
+        public readonly ?string $manufacturer,
         public readonly array $best_sellers_rank,
         public readonly array $category,
         public readonly string|int|null $variations,
         public readonly string|int|null $past_month_sales,
-        public readonly array $images,
-        public readonly string $storefront,
+        public readonly ?array $images,
+        public readonly ?string $storefront,
         public readonly ?string $merchant_id,
         public readonly ?string $storefront_url,
-        public readonly string $stock,
+        public readonly ?string $stock,
         public readonly string $condition,
         public readonly string|int|float|null $price,
         public readonly string|int|float|null $sale_price,
@@ -52,7 +52,7 @@ public function __construct(
         /* @var AmazonResultOffer[] $offers */
         #[DataCollectionOf(AmazonResultOffer::class)]
         public readonly ?array $offers,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $collected_at,
         public readonly ?string $exception,
     ) {}

src/DTOs/Amazon/AmazonResults.php

@@ -2,11 +2,13 @@
 
 namespace AlwaysOpen\BwtApi\DTOs\Amazon;
 
+use Spatie\LaravelData\Attributes\DataCollectionOf;
 use Spatie\LaravelData\Data;
 
 class AmazonResults extends Data
 {
     public function __construct(
+        #[DataCollectionOf(AmazonResult::class)]
         public readonly ?array $items,
         public readonly ?int $limit,
         public readonly ?int $offset,

tests/Feature/BwtApiClientTest.php

@@ -11,7 +11,7 @@ class BwtApiClientTest extends BaseTest
     public function test_amazon_response()
     {
         Http::fake([
-            'bwt.com/api/123/results?limit=1&offset=0' => Http::response($this->getFixtureJsonContent('job_results.json'), 200),
+            'https://bwt.com/api/123/results?limit=1&offset=0' => Http::response($this->getFixtureJsonContent('job_results.json'), 200),
         ]);
 
         $client = new BwtApiClient;