fix(deps): Update PhpCSFixer with null type changes (#23)

PhpCsFixer 3.49 introduced `nullable_type_declaration_for_default_null_value`
which enforces implicit null types are defined in the declaration.

For us this introduced a `?` fix.

This change explicitly forces null types as unions and orders them last

.php-cs-fixer.php

@@ -37,6 +37,11 @@
         'spacing' => 'one',
     ],
     'self_accessor' => true,
+    'nullable_type_declaration' => ['syntax' => 'union'],
+    'ordered_types' => [
+        'null_adjustment' => 'always_last',
+        'sort_algorithm' => 'none',
+    ],
 ])
     ->setRiskyAllowed(true)
     ->setFinder($finder);

composer.json

@@ -29,7 +29,7 @@
     "symfony/serializer": "^5.4 || ^6.3 || ^7.0"
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "3.48",
+    "friendsofphp/php-cs-fixer": "^3.49",
     "guzzlehttp/psr7": "^2.6",
     "monolog/monolog": "^3.5",
     "php-http/curl-client": "^2.3",

src/Client.php

@@ -81,12 +81,12 @@ class Client
 
     public function __construct(
         #[\SensitiveParameter] private readonly string $apiKey,
-        Options $options = null,
-        HttpAsyncClient $httpClient = null,
-        LoggerInterface $logger = null,
-        RequestFactoryInterface $requestFactory = null,
-        StreamFactoryInterface $streamFactory = null,
-        UriFactoryInterface $uriFactory = null,
+        Options|null $options = null,
+        HttpAsyncClient|null $httpClient = null,
+        LoggerInterface|null $logger = null,
+        RequestFactoryInterface|null $requestFactory = null,
+        StreamFactoryInterface|null $streamFactory = null,
+        UriFactoryInterface|null $uriFactory = null,
     ) {
         $this->options = $options ?: new Options();
         $this->logger = $logger ?: new NullLogger();
@@ -159,7 +159,7 @@ public function deleteRaw(string|UriInterface $uri): ResponseInterface
         return $this->requestRaw('DELETE', $uri);
     }
 
-    private function requestRaw(string $method, string|UriInterface $uri, array|\JsonSerializable $payload = null): ResponseInterface
+    private function requestRaw(string $method, string|UriInterface $uri, array|\JsonSerializable|null $payload = null): ResponseInterface
     {
         if (\is_string($uri)) {
             $components = \parse_url($this->options->environment->baseUrl());

src/Entities/Collections/AddressCollection.php

@@ -15,7 +15,7 @@
 
 class AddressCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): Address => Address::from($item), $itemsData),

src/Entities/Collections/AdjustmentCollection.php

@@ -15,7 +15,7 @@
 
 class AdjustmentCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): Adjustment => Adjustment::from($item), $itemsData),

src/Entities/Collections/BusinessCollection.php

@@ -15,7 +15,7 @@
 
 class BusinessCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): Business => Business::from($item), $itemsData),

src/Entities/Collections/Collection.php

@@ -12,11 +12,11 @@ abstract class Collection implements \Iterator
 
     public function __construct(
         protected array $items,
-        protected ?Paginator $paginator = null,
+        protected Paginator|null $paginator = null,
     ) {
     }
 
-    abstract public static function from(array $data, ?Paginator $paginator): self;
+    abstract public static function from(array $data, Paginator|null $paginator): self;
 
     public function current(): Entity
     {

src/Entities/Collections/CreditBalanceCollection.php

@@ -15,7 +15,7 @@
 
 class CreditBalanceCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): CreditBalance => CreditBalance::from($item), $itemsData),

src/Entities/Collections/CustomerCollection.php

@@ -15,7 +15,7 @@
 
 class CustomerCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): Customer => Customer::from($item), $itemsData),

src/Entities/Collections/DiscountCollection.php

@@ -15,7 +15,7 @@
 
 class DiscountCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): Discount => Discount::from($item), $itemsData),

src/Entities/Collections/EventCollection.php

@@ -15,7 +15,7 @@
 
 class EventCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): Event => Event::from($item), $itemsData),

src/Entities/Collections/EventTypeCollection.php

@@ -15,7 +15,7 @@
 
 class EventTypeCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): EventType => EventType::from($item), $itemsData),

src/Entities/Collections/NotificationCollection.php

@@ -15,7 +15,7 @@
 
 class NotificationCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): Notification => Notification::from($item), $itemsData),

src/Entities/Collections/NotificationLogCollection.php

@@ -15,7 +15,7 @@
 
 class NotificationLogCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): NotificationLog => NotificationLog::from($item), $itemsData),

src/Entities/Collections/NotificationSettingCollection.php

@@ -15,7 +15,7 @@
 
 class NotificationSettingCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): NotificationSetting => NotificationSetting::from($item), $itemsData),

src/Entities/Collections/PriceCollection.php

@@ -15,7 +15,7 @@
 
 class PriceCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): Price => Price::from($item), $itemsData),

src/Entities/Collections/ProductCollection.php

@@ -15,7 +15,7 @@
 
 class ProductCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): Product => Product::from($item), $itemsData),

src/Entities/Collections/ReportCollection.php

@@ -15,7 +15,7 @@
 
 class ReportCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): Report => Report::from($item), $itemsData),

src/Entities/Collections/SubscriptionCollection.php

@@ -15,7 +15,7 @@
 
 class SubscriptionCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): Subscription => Subscription::from($item), $itemsData),

src/Entities/Collections/SubscriptionPreviewCollection.php

@@ -15,7 +15,7 @@
 
 class SubscriptionPreviewCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): SubscriptionPreview => SubscriptionPreview::from($item), $itemsData),

src/Entities/Collections/SubscriptionsTransactionCollection.php

@@ -15,7 +15,7 @@
 
 class SubscriptionsTransactionCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): SubscriptionTransaction => SubscriptionTransaction::from($item), $itemsData),

src/Entities/Collections/TransactionCollection.php

@@ -15,7 +15,7 @@
 
 class TransactionCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): Transaction => Transaction::from($item), $itemsData),

src/Entities/Collections/TransactionPreviewCollection.php

@@ -15,7 +15,7 @@
 
 class TransactionPreviewCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): TransactionPreview => TransactionPreview::from($item), $itemsData),

src/Entities/Collections/TransactionsDataCollection.php

@@ -15,7 +15,7 @@
 
 class TransactionsDataCollection extends Collection
 {
-    public static function from(array $itemsData, Paginator $paginator = null): self
+    public static function from(array $itemsData, Paginator|null $paginator = null): self
     {
         return new self(
             array_map(fn (array $item): TransactionData => TransactionData::from($item), $itemsData),

src/Entities/DateTime.php

@@ -14,7 +14,7 @@ public function __construct(string $datetime = 'now')
         parent::__construct(datetime: $datetime, timezone: new \DateTimeZone('UTC'));
     }
 
-    public function format(string $format = null): string
+    public function format(string|null $format = null): string
     {
         return parent::format($format ?? self::PADDLE_RFC3339);
     }

src/Entities/Product.php

@@ -26,7 +26,7 @@ public function __construct(
         public string|null $description,
         public CatalogType|null $type,
         public TaxCategory $taxCategory,
-        public null|string $imageUrl,
+        public string|null $imageUrl,
         public CustomData|null $customData,
         public Status $status,
         public \DateTimeInterface|null $createdAt,

src/Entities/Subscription/SubscriptionNonCatalogProduct.php

@@ -22,7 +22,7 @@ public function __construct(
         public string|null $description,
         public CatalogType|null $type,
         public TaxCategory $taxCategory,
-        public null|string $imageUrl,
+        public string|null $imageUrl,
         public CustomData|null $customData,
     ) {
     }

src/Entities/Transaction/TransactionNonCatalogProduct.php

@@ -20,7 +20,7 @@ public function __construct(
         public string $name,
         public string|null $description,
         public TaxCategory $taxCategory,
-        public null|string $imageUrl,
+        public string|null $imageUrl,
         public CustomData|null $customData,
     ) {
     }

src/Notifications/Verifier.php

@@ -9,7 +9,7 @@
 final class Verifier
 {
     public function __construct(
-        private readonly ?int $maximumVariance = 5,
+        private readonly int|null $maximumVariance = 5,
     ) {
     }
 

src/Resources/Addresses/Operations/CreateAddress.php

@@ -15,13 +15,13 @@ class CreateAddress implements \JsonSerializable
 
     public function __construct(
         public readonly CountryCode $countryCode,
-        public readonly string|null|Undefined $description = new Undefined(),
-        public readonly string|null|Undefined $firstLine = new Undefined(),
-        public readonly string|null|Undefined $secondLine = new Undefined(),
-        public readonly string|null|Undefined $city = new Undefined(),
-        public readonly string|null|Undefined $postalCode = new Undefined(),
-        public readonly string|null|Undefined $region = new Undefined(),
-        public readonly CustomData|null|Undefined $customData = new Undefined(),
+        public readonly string|Undefined|null $description = new Undefined(),
+        public readonly string|Undefined|null $firstLine = new Undefined(),
+        public readonly string|Undefined|null $secondLine = new Undefined(),
+        public readonly string|Undefined|null $city = new Undefined(),
+        public readonly string|Undefined|null $postalCode = new Undefined(),
+        public readonly string|Undefined|null $region = new Undefined(),
+        public readonly CustomData|Undefined|null $customData = new Undefined(),
     ) {
     }
 

src/Resources/Addresses/Operations/ListAddresses.php

@@ -12,10 +12,10 @@
 class ListAddresses implements HasParameters
 {
     public function __construct(
-        private readonly ?Pager $pager = null,
+        private readonly Pager|null $pager = null,
         private readonly array $ids = [],
         private readonly array $statuses = [],
-        private readonly ?string $search = null,
+        private readonly string|null $search = null,
     ) {
         if ($invalid = array_filter($this->ids, fn ($value): bool => ! is_string($value))) {
             throw InvalidArgumentException::arrayContainsInvalidTypes('ids', 'string', implode(', ', $invalid));

src/Resources/Addresses/Operations/UpdateAddress.php

@@ -16,13 +16,13 @@ class UpdateAddress implements \JsonSerializable
 
     public function __construct(
         public readonly CountryCode|Undefined $countryCode = new Undefined(),
-        public readonly string|null|Undefined $description = new Undefined(),
-        public readonly string|null|Undefined $firstLine = new Undefined(),
-        public readonly string|null|Undefined $secondLine = new Undefined(),
-        public readonly string|null|Undefined $city = new Undefined(),
-        public readonly string|null|Undefined $postalCode = new Undefined(),
-        public readonly string|null|Undefined $region = new Undefined(),
-        public readonly CustomData|null|Undefined $customData = new Undefined(),
+        public readonly string|Undefined|null $description = new Undefined(),
+        public readonly string|Undefined|null $firstLine = new Undefined(),
+        public readonly string|Undefined|null $secondLine = new Undefined(),
+        public readonly string|Undefined|null $city = new Undefined(),
+        public readonly string|Undefined|null $postalCode = new Undefined(),
+        public readonly string|Undefined|null $region = new Undefined(),
+        public readonly CustomData|Undefined|null $customData = new Undefined(),
         public readonly Status|Undefined $status = new Undefined(),
     ) {
     }

src/Resources/Adjustments/Operations/ListAdjustments.php

@@ -22,13 +22,13 @@ class ListAdjustments implements HasParameters
      * @throws InvalidArgumentException On invalid array arguments
      */
     public function __construct(
-        private readonly ?Pager $pager = null,
+        private readonly Pager|null $pager = null,
         private readonly array $ids = [],
         private readonly array $statuses = [],
         private readonly array $customerIds = [],
         private readonly array $transactionIds = [],
         private readonly array $subscriptionIds = [],
-        private readonly ?Action $action = null,
+        private readonly Action|null $action = null,
     ) {
         if ($invalid = array_filter($this->ids, fn ($value): bool => ! is_string($value))) {
             throw InvalidArgumentException::arrayContainsInvalidTypes('ids', 'string', implode(', ', $invalid));

src/Resources/Businesses/Operations/CreateBusiness.php

@@ -18,10 +18,10 @@ class CreateBusiness implements \JsonSerializable
      */
     public function __construct(
         public readonly string $name,
-        public readonly string|null|Undefined $companyNumber = new Undefined(),
-        public readonly string|null|Undefined $taxIdentifier = new Undefined(),
+        public readonly string|Undefined|null $companyNumber = new Undefined(),
+        public readonly string|Undefined|null $taxIdentifier = new Undefined(),
         public readonly array|Undefined $contacts = new Undefined(),
-        public readonly CustomData|null|Undefined $customData = new Undefined(),
+        public readonly CustomData|Undefined|null $customData = new Undefined(),
     ) {
     }
 

src/Resources/Businesses/Operations/ListBusinesses.php

@@ -18,10 +18,10 @@ class ListBusinesses implements HasParameters
      * @throws InvalidArgumentException On invalid array contents
      */
     public function __construct(
-        private readonly ?Pager $pager = null,
+        private readonly Pager|null $pager = null,
         private readonly array $ids = [],
         private readonly array $statuses = [],
-        private readonly ?string $search = null,
+        private readonly string|null $search = null,
     ) {
         if ($invalid = array_filter($this->ids, fn ($value): bool => ! is_string($value))) {
             throw InvalidArgumentException::arrayContainsInvalidTypes('ids', 'string', implode(', ', $invalid));

src/Resources/Businesses/Operations/UpdateBusiness.php

@@ -19,10 +19,10 @@ class UpdateBusiness implements \JsonSerializable
      */
     public function __construct(
         public readonly string|Undefined $name = new Undefined(),
-        public readonly string|null|Undefined $companyNumber = new Undefined(),
-        public readonly string|null|Undefined $taxIdentifier = new Undefined(),
+        public readonly string|Undefined|null $companyNumber = new Undefined(),
+        public readonly string|Undefined|null $taxIdentifier = new Undefined(),
         public readonly array|Undefined $contacts = new Undefined(),
-        public readonly CustomData|null|Undefined $customData = new Undefined(),
+        public readonly CustomData|Undefined|null $customData = new Undefined(),
         public readonly Status|Undefined $status = new Undefined(),
     ) {
     }