More tests

src/Model/BasePerCarrierCollection.php

@@ -115,7 +115,7 @@ private function validateCarrier(WithCarrierId $item): void
             return;
         }
 
-        if ($this->carrier !== $item->getCarrier()) {
+        if ($this->carrier->getValue() !== $item->getCarrier()->getValue()) {
             throw new InvalidArgumentException(
                 sprintf(
                     'Item carrier mismatch ("%s" instead "%s")',

src/Model/Status/Statuses.php

@@ -21,7 +21,7 @@ final class Statuses extends BaseCollection implements WithCarrierId
     public function __construct(
         private Carrier $carrier,
         private string $carrierId,
-        array $states,
+        array $states = [],
     ) {
         parent::__construct([]);
 
@@ -49,6 +49,16 @@ public function offsetAdd(mixed $value): void
      */
     private function validateCarrierId(Status $item): void
     {
+        if ($this->carrier->getValue() !== $item->getCarrier()->getValue()) {
+            throw new InvalidArgumentException(
+                sprintf(
+                    'Item carrier mismatch ("%s" instead "%s")',
+                    $item->getCarrier()->getValue(),
+                    $this->carrier->getValue(),
+                )
+            );
+        }
+
         if ($this->carrierId !== $item->getCarrierId()) {
             throw new InvalidArgumentException(
                 sprintf(

src/Service/DefaultSettingService.php

@@ -92,6 +92,9 @@ public function getCountriesData(): CountryCollection
         return $this->countryFactory->createCollection($response);
     }
 
+    /**
+     * @return \Iterator<\Inspirum\Balikobot\Model\ZipCode\ZipCode>
+     */
     public function getZipCodes(Carrier $carrier, Service $service, ?string $country = null): Iterator
     {
         $response = $this->client->call(VersionType::V2V1, $carrier, Request::ZIP_CODES, path: sprintf('%s/%s', $service->getValue(), $country));

src/Service/DefaultTrackService.php

@@ -17,11 +17,11 @@
 use Inspirum\Balikobot\Model\Status\StatusesCollection;
 use OutOfBoundsException;
 
-class DefaultTrackService implements TrackService
+final class DefaultTrackService implements TrackService
 {
     public function __construct(
         private Client $client,
-        private StatusFactory $packageStatusFactory,
+        private StatusFactory $statusFactory,
     ) {
     }
 
@@ -51,7 +51,7 @@ public function trackPackagesByIds(Carrier $carrier, array $carrierIds): Statuse
             shouldHaveStatus: false,
         );
 
-        return $this->packageStatusFactory->createCollection($carrier, $carrierIds, $response);
+        return $this->statusFactory->createCollection($carrier, $carrierIds, $response);
     }
 
     public function trackPackageLastStatus(Package $package): Status
@@ -80,6 +80,6 @@ public function trackPackagesLastStatusesByIds(Carrier $carrier, array $carrierI
             shouldHaveStatus: false,
         );
 
-        return $this->packageStatusFactory->createLastStatusCollection($carrier, $carrierIds, $response);
+        return $this->statusFactory->createLastStatusCollection($carrier, $carrierIds, $response);
     }
 }