Merge remote-tracking branch 'origin/main' into main

Morning-Train · Dec 13, 2023 · 6a99cb7 · 6a99cb7
2 parents 1ba3be9 + 09d8ca6
commit 6a99cb7
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 63 deletions.
diff --git a/src/Abstracts/Resource.php b/src/Abstracts/Resource.php
@@ -16,7 +16,7 @@ abstract class Resource
 {
     public string $self;
 
-    public function __construct(array|string|int|float $properties = null)
+    public function __construct(array|string|int|float|null $properties = null)
     {
         if (is_array($properties)) {
             $this->populate($properties);

diff --git a/src/Classes/EconomicQueryBuilder.php b/src/Classes/EconomicQueryBuilder.php
@@ -42,7 +42,7 @@ protected function getEndpoint(): string
         return $this->endpoint;
     }
 
-    public function where(int|string|Closure $propertyName, string $operatorOrValue = null, mixed $value = null): static
+    public function where(int|string|Closure $propertyName, ?string $operatorOrValue = null, mixed $value = null): static
     {
         if (! isset($this->filter)) {
             $this->filter = new EconomicQueryFilterBuilder(EconomicQueryFilterBuilder::FILTER_RELATION_AND);
@@ -53,7 +53,7 @@ public function where(int|string|Closure $propertyName, string $operatorOrValue
         return $this;
     }
 
-    public function orWhere(int|string|Closure $propertyName, string $operatorOrValue = null, mixed $value = null): static
+    public function orWhere(int|string|Closure $propertyName, ?string $operatorOrValue = null, mixed $value = null): static
     {
         if (! isset($this->filter)) {
             $this->filter = new EconomicQueryFilterBuilder(EconomicQueryFilterBuilder::FILTER_RELATION_OR);

diff --git a/src/Classes/EconomicQueryFilterBuilder.php b/src/Classes/EconomicQueryFilterBuilder.php
@@ -73,7 +73,7 @@ protected function whereNested(Closure $closure)
         return $this;
     }
 
-    public function where(int|string|Closure $propertyName, string $operatorOrValue = null, mixed $value = null): static
+    public function where(int|string|Closure $propertyName, ?string $operatorOrValue = null, mixed $value = null): static
     {
         if ($propertyName instanceof Closure) {
             return $this->whereNested($propertyName);
@@ -91,7 +91,7 @@ public function where(int|string|Closure $propertyName, string $operatorOrValue
         return $this;
     }
 
-    public function orWhere(int|string|Closure $propertyName, string $operatorOrValue = null, mixed $value = null): static
+    public function orWhere(int|string|Closure $propertyName, ?string $operatorOrValue = null, mixed $value = null): static
     {
         $instance = new static(static::FILTER_RELATION_OR);
 

diff --git a/src/DTOs/Attention.php b/src/DTOs/Attention.php
@@ -9,7 +9,7 @@ class Attention extends Resource
     public ?int $customerContactNumber = null;
 
     public static function new(
-        int $customerContactNumber = null,
+        ?int $customerContactNumber = null,
     ): static {
         return new static([
             'customerContactNumber' => $customerContactNumber,

diff --git a/src/DTOs/Recipient.php b/src/DTOs/Recipient.php
@@ -28,13 +28,13 @@ class Recipient extends Resource
     public static function new(
         string $name,
         VatZone $vatZone,
-        string $address = null,
-        string $zip = null,
-        string $city = null,
-        string $country = null,
-        string $ean = null,
-        string $publicEntryNumber = null,
-        Attention $attention = null,
+        ?string $address = null,
+        ?string $zip = null,
+        ?string $city = null,
+        ?string $country = null,
+        ?string $ean = null,
+        ?string $publicEntryNumber = null,
+        ?Attention $attention = null,
     ): static {
         return new static([
             'name' => $name,

diff --git a/src/Resources/Customer.php b/src/Resources/Customer.php
@@ -108,25 +108,25 @@ public static function create(
         string $currency,
         VatZone|int $vatZone,
         PaymentTerm|int $paymentTerms,
-        string $email = null,
-        string $address = null,
-        string $zip = null,
-        string $city = null,
-        string $country = null,
-        string $corporateIdentificationNumber = null,
-        string $pNumber = null,
-        string $vatNumber = null,
-        string $ean = null,
-        string $publicEntryNumber = null,
-        string $website = null,
-        string $mobilePhone = null,
-        string $telephoneAndFaxNumber = null,
-        bool $barred = null,
-        bool $eInvoicingDisabledByDefault = null,
-        float $creditLimit = null,
-        int $customerNumber = null,
-        Layout|int $layout = null,
-        Employee|int $salesPerson = null,
+        ?string $email = null,
+        ?string $address = null,
+        ?string $zip = null,
+        ?string $city = null,
+        ?string $country = null,
+        ?string $corporateIdentificationNumber = null,
+        ?string $pNumber = null,
+        ?string $vatNumber = null,
+        ?string $ean = null,
+        ?string $publicEntryNumber = null,
+        ?string $website = null,
+        ?string $mobilePhone = null,
+        ?string $telephoneAndFaxNumber = null,
+        ?bool $barred = null,
+        ?bool $eInvoicingDisabledByDefault = null,
+        ?float $creditLimit = null,
+        ?int $customerNumber = null,
+        Layout|int|null $layout = null,
+        Employee|int|null $salesPerson = null,
     ): static {
         $creationParameters = static::resolveArguments(static::getMethodArgs(__METHOD__, func_get_args()));
 

diff --git a/src/Resources/Customer/Contact.php b/src/Resources/Customer/Contact.php
@@ -55,11 +55,11 @@ public static function fromCustomer(Customer|int $customer)
     public static function create(
         Customer $customer,
         string $name,
-        string $email = null,
-        string $phone = null,
-        string $notes = null,
-        string $eInvoiceId = null,
-        array $emailNotifications = null
+        ?string $email = null,
+        ?string $phone = null,
+        ?string $notes = null,
+        ?string $eInvoiceId = null,
+        ?array $emailNotifications = null
     ) {
         return static::createRequest(array_filter(compact(
             'customer',

diff --git a/src/Resources/Invoice/ProductLine.php b/src/Resources/Invoice/ProductLine.php
@@ -29,12 +29,12 @@ public static function new(
         Product|int $product,
         float $quantity,
         float $unitNetPrice,
-        string $description = null,
-        float $discountPercentage = null,
-        float $marginInBaseCurrency = null,
-        float $marginPercentage = null,
-        int $sortKey = null,
-        float $unitCostPrice = null,
+        ?string $description = null,
+        ?float $discountPercentage = null,
+        ?float $marginInBaseCurrency = null,
+        ?float $marginPercentage = null,
+        ?int $sortKey = null,
+        ?float $unitCostPrice = null,
     ): static {
         return new static([
             'product' => $product,

diff --git a/src/Resources/PaymentTerm.php b/src/Resources/PaymentTerm.php
@@ -46,14 +46,14 @@ class PaymentTerm extends Resource
 
     public static function new(
         int $paymentTermsNumber,
-        string $name = null,
-        string $description = null,
-        int $daysOfCredit = null,
-        PaymentTermsType $paymentTermsType = null,
-        Account $contraAccountForPrepaidAmount = null,
-        float $percentageForPrepaidAmount = null,
-        float $percentageForRemainderAmount = null,
-        Customer $creditCardCompany = null,
+        ?string $name = null,
+        ?string $description = null,
+        ?int $daysOfCredit = null,
+        ?PaymentTermsType $paymentTermsType = null,
+        ?Account $contraAccountForPrepaidAmount = null,
+        ?float $percentageForPrepaidAmount = null,
+        ?float $percentageForRemainderAmount = null,
+        ?Customer $creditCardCompany = null,
     ): static {
         return new static([
             'paymentTermsNumber' => $paymentTermsNumber,

diff --git a/src/Resources/Product.php b/src/Resources/Product.php
@@ -87,17 +87,17 @@ public static function create(DateTime $fromDate, DateTime $toDate): static
 
     public static function new(
         string $productNumber,
-        string $name = null,
-        string $barCode = null,
-        bool $barred = null,
-        float $costPrice = null,
-        EconomicCollection $entries = null,
-        DateTime|string $fromDate = null,
-        EconomicCollection $periods = null,
-        DateTime|string $toDate = null,
-        EconomicCollection $totals = null,
-        EconomicCollection $vouchers = null,
-        string $year = null,
+        ?string $name = null,
+        ?string $barCode = null,
+        ?bool $barred = null,
+        ?float $costPrice = null,
+        ?EconomicCollection $entries = null,
+        DateTime|string|null $fromDate = null,
+        ?EconomicCollection $periods = null,
+        DateTime|string|null $toDate = null,
+        ?EconomicCollection $totals = null,
+        ?EconomicCollection $vouchers = null,
+        ?string $year = null,
     ): static {
         return new static([
             'productNumber' => $productNumber,

diff --git a/src/Services/EconomicLoggerService.php b/src/Services/EconomicLoggerService.php
@@ -9,7 +9,7 @@ class EconomicLoggerService
 {
     protected static array $loggers = [];
 
-    public static function registerLogger(LoggerInterface $logger, string|array $logLevels = null): void
+    public static function registerLogger(LoggerInterface $logger, string|array|null $logLevels = null): void
     {
         if ($logLevels === null) {
             static::$loggers['all'][] = $logger;