Use explicit nullable types

firstred · firstred · commit b6e1b56aed54 · 2024-11-29T02:57:08.000+01:00
diff --git a/src/Cache/CacheableServiceInterface.php b/src/Cache/CacheableServiceInterface.php
@@ -87,7 +87,7 @@ public function getTtl(): DateInterval|DateTimeInterface|int|null;
      *
      * @since 1.2.0
      */
-    public function setTtl(DateInterval|DateTimeInterface|int $ttl = null): static;
+    public function setTtl(DateInterval|DateTimeInterface|int|null $ttl = null): static;
 
     /**
      * @return CacheItemPoolInterface|null
@@ -103,5 +103,5 @@ public function getCache(): ?CacheItemPoolInterface;
      *
      * @since 1.2.0
      */
-    public function setCache(CacheItemPoolInterface $cache = null): static;
-}
+    public function setCache(?CacheItemPoolInterface $cache = null): static;
+}
diff --git a/src/Entity/Location.php b/src/Entity/Location.php
@@ -127,13 +127,13 @@ public function __construct(
         /* @param string|DateTimeInterface|null $DeliveryDate */
         string|DateTimeInterface|null $DeliveryDate = null,
         /* @param string[]|null $DeliveryOptions */
-        array $DeliveryOptions = null,
+        ?array $DeliveryOptions = null,
         ?string $OpeningTime = null,
         /* @param string[]|null $Options */
-        array $Options = null,
-        Coordinates $Coordinates = null,
-        CoordinatesNorthWest $CoordinatesNorthWest = null,
-        CoordinatesSouthEast $CoordinatesSouthEast = null,
+        ?array $Options = null,
+        ?Coordinates $Coordinates = null,
+        ?CoordinatesNorthWest $CoordinatesNorthWest = null,
+        ?CoordinatesSouthEast $CoordinatesSouthEast = null,
         ?string $City = null,
         ?string $Street = null,
         ?string $HouseNr = null,
diff --git a/src/Entity/Response/CompleteStatusResponseShipment.php b/src/Entity/Response/CompleteStatusResponseShipment.php
@@ -137,9 +137,9 @@ class CompleteStatusResponseShipment extends AbstractEntity
      */
     public function __construct(
         /* @param StatusAddress[]|null $Addresses */
-        array $Addresses = null,
+        ?array $Addresses = null,
         /* @param Amount[]|null $Amounts */
-        array $Amounts = null,
+        ?array $Amounts = null,
         ?string $Barcode = null,
         ?Customer $Customer = null,
         DateTimeInterface|string|null $DeliveryDate = null,
diff --git a/src/Entity/Response/GetDeliveryDateResponse.php b/src/Entity/Response/GetDeliveryDateResponse.php
@@ -60,7 +60,7 @@ class GetDeliveryDateResponse extends AbstractEntity
     public function __construct(
         string|DateTimeInterface|null $DeliveryDate = null,
         /* @param string[]|null $Options */
-        array $Options = null,
+        ?array $Options = null,
     ) {
         parent::__construct();
 
diff --git a/src/Entity/Response/GetLocationsInAreaResponse.php b/src/Entity/Response/GetLocationsInAreaResponse.php
@@ -47,7 +47,7 @@ class GetLocationsInAreaResponse extends AbstractEntity
      */
     public function __construct(
         /* @param GetLocationsResult|null $GetLocationsResult */
-        GetLocationsResult $GetLocationsResult = null,
+        ?GetLocationsResult $GetLocationsResult = null,
     ) {
         parent::__construct();
 
diff --git a/src/Entity/Response/GetNearestLocationsResponse.php b/src/Entity/Response/GetNearestLocationsResponse.php
@@ -50,7 +50,7 @@ class GetNearestLocationsResponse extends AbstractEntity
     /**
      * @param GetLocationsResult|null $GetLocationsResult
      */
-    public function __construct(GetLocationsResult $GetLocationsResult = null)
+    public function __construct(?GetLocationsResult $GetLocationsResult = null)
     {
         parent::__construct();
 
diff --git a/src/Entity/Response/GetSentDateResponse.php b/src/Entity/Response/GetSentDateResponse.php
@@ -56,7 +56,7 @@ class GetSentDateResponse extends AbstractEntity
     public function __construct(
         ?DateTimeInterface $GetSentDate = null,
         /*  @param string[]|null $Options */
-        array $Options = null,
+        ?array $Options = null,
     ) {
         parent::__construct();
 
diff --git a/src/Entity/Response/ResponseAddress.php b/src/Entity/Response/ResponseAddress.php
@@ -552,7 +552,7 @@ public function getZipcode(): ?string
      *
      * @return static
      */
-    public function setZipcode(string $Zipcode = null): static
+    public function setZipcode(?string $Zipcode = null): static
     {
         if (is_null(value: $Zipcode)) {
             $this->Zipcode = null;
diff --git a/src/Entity/Response/ResponseLocation.php b/src/Entity/Response/ResponseLocation.php
@@ -133,9 +133,9 @@ class ResponseLocation extends AbstractEntity
      * @param Sustainability|null $Sustainability
      */
     public function __construct(
-        Address $Address = null,
+        ?Address $Address = null,
         /* @param string[]|null $DeliveryOptions */
-        array $DeliveryOptions = null,
+        ?array $DeliveryOptions = null,
         ?string $Distance = null,
         ?string $Latitude = null,
         ?string $Longitude = null,
diff --git a/src/Entity/Response/ResponseTimeframes.php b/src/Entity/Response/ResponseTimeframes.php
@@ -54,9 +54,9 @@ class ResponseTimeframes extends AbstractEntity
      */
     public function __construct(
         /* @param ReasonNoTimeframe[]|null $ReasonNoTimeframes */
-        array $ReasonNoTimeframes = null,
+        ?array $ReasonNoTimeframes = null,
         /* @param Timeframe[]|null $Timeframes */
-        array $Timeframes = null,
+        ?array $Timeframes = null,
     ) {
         parent::__construct();
 
diff --git a/src/Entity/Response/SendShipmentResponse.php b/src/Entity/Response/SendShipmentResponse.php
@@ -51,9 +51,9 @@ class SendShipmentResponse extends AbstractEntity
      */
     public function __construct(
         /* @param MergedLabel[]|null $MergedLabels */
-        array $MergedLabels = null,
+        ?array $MergedLabels = null,
         /* @param ResponseShipment[]|null $ResponseShipments */
-        array $ResponseShipments = null,
+        ?array $ResponseShipments = null,
     ) {
         parent::__construct();
 
diff --git a/src/Entity/Response/SignatureResponse.php b/src/Entity/Response/SignatureResponse.php
@@ -45,7 +45,7 @@ class SignatureResponse extends AbstractEntity
     /**
      * @param Signature|null $Signature
      */
-    public function __construct(Signature $Signature = null)
+    public function __construct(?Signature $Signature = null)
     {
         parent::__construct();
 
diff --git a/src/Entity/Shipment.php b/src/Entity/Shipment.php
@@ -203,12 +203,12 @@ class Shipment extends AbstractEntity
      */
     public function __construct(
         /* @param Address[]|null $Addresses */
-        array $Addresses = null,
+        ?array $Addresses = null,
         /* @param Amount[]|null $Amounts */
-        array $Amounts = null,
+        ?array $Amounts = null,
         ?string $Barcode = null,
         /* @param Contact[]|null $Contacts */
-        array $Contacts = null,
+        ?array $Contacts = null,
         ?string $Content = null,
         string|DateTimeInterface|null $CollectionTimeStampEnd = null,
         string|DateTimeInterface|null $CollectionTimeStampStart = null,
@@ -223,18 +223,18 @@ public function __construct(
         ?string $DownPartnerID = null,
         ?string $DownPartnerLocation = null,
         /* @param Event[]|null $Events */
-        array $Events = null,
+        ?array $Events = null,
         /* @param Group[]|null $Groups */
-        array $Groups = null,
+        ?array $Groups = null,
         ?string $IDExpiration = null,
         ?string $IDNumber = null,
         ?string $IDType = null,
         /* @param OldStatus[]|null $OldStatuses */
-        array $OldStatuses = null,
+        ?array $OldStatuses = null,
         ?string $ProductCodeCollect = null,
         ?string $ProductCodeDelivery = null,
         /* @param ProductOption[]|null $ProductOptions */
-        array $ProductOptions = null,
+        ?array $ProductOptions = null,
         ?string $ReceiverDateOfBirth = null,
         ?string $Reference = null,
         ?string $ReferenceCollect = null,
diff --git a/src/Entity/Timeframes.php b/src/Entity/Timeframes.php
@@ -51,9 +51,9 @@ class Timeframes extends AbstractEntity
      */
     public function __construct(
         /* @param Timeframe[]|null $timeframes */
-        array $timeframes = null,
+        ?array $timeframes = null,
         /* @param TimeframeTimeFrame[]|null $timeframetimeframes */
-        array $timeframetimeframes = null
+        ?array $timeframetimeframes = null
     ) {
         parent::__construct();
 
diff --git a/src/Exception/CifException.php b/src/Exception/CifException.php
@@ -54,7 +54,7 @@ class CifException extends ApiException
      * @param int             $code
      * @param \Throwable|null $previous
      */
-    public function __construct($message = '', int $code = 0, \Throwable $previous = null)
+    public function __construct($message = '', int $code = 0, ?\Throwable $previous = null)
     {
         if (is_array(value: $message)) {
             $this->messages = $message;
diff --git a/src/Exception/ResponseException.php b/src/Exception/ResponseException.php
@@ -52,7 +52,7 @@ class ResponseException extends ApiException
      * @param Exception|null         $previous
      * @param ResponseInterface|null $response
      */
-    public function __construct(string $message = '', int $code = 0, $previous = null, ResponseInterface $response = null)
+    public function __construct(string $message = '', int $code = 0, $previous = null, ?ResponseInterface $response = null)
     {
         parent::__construct(message: $message, code: $code, previous: $previous);
 
diff --git a/src/HttpClient/GuzzleHttpClient.php b/src/HttpClient/GuzzleHttpClient.php
@@ -76,8 +76,8 @@ class GuzzleHttpClient extends BaseHttpClient implements HttpClientInterface
      * @since 1.3.0 Custom constructor
      */
     public function __construct(
-        Client $client = null,
-        LoggerInterface $logger = null,
+        ?Client $client = null,
+        ?LoggerInterface $logger = null,
         int $concurrency = 5,
         int $maxRetries = 5
     ) {
@@ -106,8 +106,8 @@ private function getClient(): Client
             $stack->push(middleware: Middleware::retry(decider: function (
                 $retries,
                 RequestInterface $request,
-                ResponseInterface $response = null,
-                GuzzleException $exception = null
+                ?ResponseInterface $response = null,
+                ?GuzzleException $exception = null
             ) {
                 // Limit the number of retries to 5
                 if ($retries >= $this->getMaxRetries()) {
diff --git a/src/PostNL.php b/src/PostNL.php
@@ -1050,7 +1050,7 @@ public function setShippingService(ShippingServiceInterface $service): static
      *
      * @since 1.0.0
      */
-    public function generateBarcode(string $type = '3S', string $range = null, string $serie = null, bool $eps = false): string
+    public function generateBarcode(string $type = '3S', ?string $range = null, ?string $serie = null, bool $eps = false): string
     {
         if (2 !== strlen(string: $type)) {
             throw new InvalidBarcodeException(message: "Barcode type `$type` is invalid");
@@ -1925,7 +1925,7 @@ public function getShippingStatusesByReferences(array $references, bool $complet
      *
      * @since 1.2.0
      */
-    public function getUpdatedShipments(DateTimeInterface $dateTimeFrom = null, DateTimeInterface $dateTimeTo = null): array
+    public function getUpdatedShipments(?DateTimeInterface $dateTimeFrom = null, ?DateTimeInterface $dateTimeTo = null): array
     {
         return $this->getShippingStatusService()->getUpdatedShipments(
             customer: $this->getCustomer(),
diff --git a/src/Service/AbstractCacheableService.php b/src/Service/AbstractCacheableService.php
@@ -90,8 +90,8 @@ public function __construct(
         HttpClientInterface $httpClient,
         RequestFactoryInterface $requestFactory,
         StreamFactoryInterface $streamFactory,
-        CacheItemPoolInterface $cache = null,
-        DateInterval|DateTimeInterface|int $ttl = null
+        ?CacheItemPoolInterface $cache = null,
+        DateInterval|DateTimeInterface|int|null $ttl = null
     ) {
         $this->cache = $cache;
         $this->ttl = $ttl;
diff --git a/src/Service/DeliveryDateService.php b/src/Service/DeliveryDateService.php
@@ -86,8 +86,8 @@ public function __construct(
         HttpClientInterface $httpClient,
         RequestFactoryInterface $requestFactory,
         StreamFactoryInterface $streamFactory,
-        CacheItemPoolInterface $cache = null,
-        DateInterval|DateTimeInterface|int $ttl = null,
+        ?CacheItemPoolInterface $cache = null,
+        DateInterval|DateTimeInterface|int|null $ttl = null,
     ) {
         parent::__construct(
             apiKey: $apiKey,
diff --git a/src/Service/LocationService.php b/src/Service/LocationService.php
@@ -87,8 +87,8 @@ public function __construct(
         HttpClientInterface $httpClient,
         RequestFactoryInterface $requestFactory,
         StreamFactoryInterface $streamFactory,
-        CacheItemPoolInterface $cache = null,
-        DateInterval|DateTimeInterface|int $ttl = null,
+        ?CacheItemPoolInterface $cache = null,
+        DateInterval|DateTimeInterface|int|null $ttl = null,
     ) {
         parent::__construct(
             apiKey: $apiKey,
diff --git a/src/Service/ShippingStatusService.php b/src/Service/ShippingStatusService.php
@@ -93,8 +93,8 @@ public function __construct(
         HttpClientInterface $httpClient,
         RequestFactoryInterface $requestFactory,
         StreamFactoryInterface $streamFactory,
-        CacheItemPoolInterface $cache = null,
-        DateInterval|DateTimeInterface|int $ttl = null,
+        ?CacheItemPoolInterface $cache = null,
+        DateInterval|DateTimeInterface|int|null $ttl = null,
     ) {
         parent::__construct(
             apiKey: $apiKey,
@@ -473,8 +473,8 @@ public function getSignatures(array $getSignatures): array
      */
     public function getUpdatedShipments(
         Customer $customer,
-        DateTimeInterface $dateTimeFrom = null,
-        DateTimeInterface $dateTimeTo = null,
+        ?DateTimeInterface $dateTimeFrom = null,
+        ?DateTimeInterface $dateTimeTo = null,
     ): array {
         if ((!$dateTimeFrom && $dateTimeTo) || ($dateTimeFrom && !$dateTimeTo)) {
             throw new NotSupportedException(message: 'Either pass both dates or none. A single date is not supported.');
diff --git a/src/Service/ShippingStatusServiceInterface.php b/src/Service/ShippingStatusServiceInterface.php
@@ -205,7 +205,7 @@ public function getSignatures(array $getSignatures): array;
      */
     public function getUpdatedShipments(
         Customer $customer,
-        DateTimeInterface $dateTimeFrom = null,
-        DateTimeInterface $dateTimeTo = null,
+        ?DateTimeInterface $dateTimeFrom = null,
+        ?DateTimeInterface $dateTimeTo = null,
     ): array;
 }
diff --git a/src/Service/TimeframeService.php b/src/Service/TimeframeService.php
@@ -84,8 +84,8 @@ public function __construct(
         HttpClientInterface $httpClient,
         RequestFactoryInterface $requestFactory,
         StreamFactoryInterface $streamFactory,
-        CacheItemPoolInterface $cache = null,
-        DateInterval|DateTimeInterface|int $ttl = null,
+        ?CacheItemPoolInterface $cache = null,
+        DateInterval|DateTimeInterface|int|null $ttl = null,
     ) {
         parent::__construct(
             apiKey: $apiKey,
diff --git a/src/Util/Util.php b/src/Util/Util.php
@@ -57,7 +57,7 @@ class Util
      *
      * @codeCoverageIgnore
      */
-    public static function urlEncode(array $arr, string $prefix = null): string
+    public static function urlEncode(array $arr, ?string $prefix = null): string
     {
         $r = [];
         foreach ($arr as $k => $v) {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class GetNearestLocationsResponse extends AbstractEntity`
`50`	`50`	`/**`
`51`	`51`	`* @param GetLocationsResult\|null $GetLocationsResult`
`52`	`52`	`*/`
`53`		`- public function __construct(GetLocationsResult $GetLocationsResult = null)`
	`53`	`+ public function __construct(?GetLocationsResult $GetLocationsResult = null)`
`54`	`54`	`{`
`55`	`55`	`parent::__construct();`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,7 @@ public function getZipcode(): ?string`
`552`	`552`	`*`
`553`	`553`	`* @return static`
`554`	`554`	`*/`
`555`		`- public function setZipcode(string $Zipcode = null): static`
	`555`	`+ public function setZipcode(?string $Zipcode = null): static`
`556`	`556`	`{`
`557`	`557`	`if (is_null(value: $Zipcode)) {`
`558`	`558`	`$this->Zipcode = null;`