Fix for php 8.4

yakamara · Dec 6, 2024 · 0a22e15 · 0a22e15
1 parent 4787e85
commit 0a22e15
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/AbstractDateTime.php b/src/AbstractDateTime.php
@@ -50,7 +50,7 @@ public static function createFromDateTime(\DateTimeInterface $dateTime): self
     /**
      * @return static
      */
-    public static function createFromTimestamp(int $timestamp): self
+    public static function createFromTimestamp(int|float $timestamp): static
     {
         $class = static::getClass();
 
@@ -96,7 +96,7 @@ public function formatLocalized(string $format): string
         return strftime($format, $this->getTimestamp());
     }
 
-    public function formatIntl(int $format = null, int $timeFormat = null): string
+    public function formatIntl(?int $format = null, ?int $timeFormat = null): string
     {
         if (!class_exists(\IntlDateFormatter::class)) {
             throw new \Exception(sprintf('%s can not be used without the intl extension.', __METHOD__));
@@ -167,21 +167,21 @@ public function addDays(int $days): DateTimeInterface
         return $this->modify($days.' days');
     }
 
-    public function isWorkday(HolidaysInterface $holidays = null): bool
+    public function isWorkday(?HolidaysInterface $holidays = null): bool
     {
         $holidays = $holidays ?: self::getDefaultHolidays();
 
         return $holidays->isWorkday($this);
     }
 
-    public function isHoliday(HolidaysInterface $holidays = null): bool
+    public function isHoliday(?HolidaysInterface $holidays = null): bool
     {
         $holidays = $holidays ?: self::getDefaultHolidays();
 
         return $holidays->isHoliday($this);
     }
 
-    public function addWorkdays(int $days, HolidaysInterface $holidays = null): DateTimeInterface
+    public function addWorkdays(int $days, ?HolidaysInterface $holidays = null): DateTimeInterface
     {
         $holidays = $holidays ?: self::getDefaultHolidays();
 
@@ -198,7 +198,7 @@ public function addWorkdays(int $days, HolidaysInterface $holidays = null): Date
         return $date;
     }
 
-    public function diffWorkdays(DateTimeInterface $date2, HolidaysInterface $holidays = null): int
+    public function diffWorkdays(DateTimeInterface $date2, ?HolidaysInterface $holidays = null): int
     {
         $holidays = $holidays ?: self::getDefaultHolidays();
 

diff --git a/src/Date.php b/src/Date.php
@@ -15,7 +15,7 @@
 
 class Date extends AbstractDateTime
 {
-    public function __construct(string $date = 'today', \DateTimeZone $timezone = null)
+    public function __construct(string $date = 'today', ?\DateTimeZone $timezone = null)
     {
         parent::__construct(self::stripTime($date), $timezone);
     }
@@ -51,7 +51,7 @@ public function formatIso(): string
         return $this->format('Y-m-d');
     }
 
-    public function formatIntl(int $format = null, int $timeFormat = null): string
+    public function formatIntl(?int $format = null, ?int $timeFormat = null): string
     {
         if (!class_exists(\IntlDateFormatter::class)) {
             throw new \Exception(sprintf('%s can not be used without the intl extension.', __METHOD__));
@@ -109,7 +109,7 @@ public function sub(\DateInterval $interval): \DateTimeImmutable
         return parent::sub($interval)->setTime(0, 0, 0);
     }
 
-    public function modify(string $modify): \DateTimeImmutable|false
+    public function modify(string $modify): \DateTimeImmutable
     {
         return parent::modify($modify)->setTime(0, 0, 0);
     }

diff --git a/src/DateTime.php b/src/DateTime.php
@@ -51,7 +51,7 @@ public function formatIsoTime(): string
         return $this->format('H:i:s');
     }
 
-    public function formatIntlDate(int $format = null): string
+    public function formatIntlDate(?int $format = null): string
     {
         if (!class_exists(\IntlDateFormatter::class)) {
             throw new \Exception(sprintf('%s can not be used without the intl extension.', __METHOD__));
@@ -60,7 +60,7 @@ public function formatIntlDate(int $format = null): string
         return static::formatIntl($format, \IntlDateFormatter::NONE);
     }
 
-    public function formatIntlTime(int $format = null): string
+    public function formatIntlTime(?int $format = null): string
     {
         if (!class_exists(\IntlDateFormatter::class)) {
             throw new \Exception(sprintf('%s can not be used without the intl extension.', __METHOD__));

diff --git a/src/DateTimeInterface.php b/src/DateTimeInterface.php
@@ -21,7 +21,7 @@ public function formatIso(): string;
 
     public function formatLocalized(string $format): string;
 
-    public function formatIntl(int $format = null, int $timeFormat = null): string;
+    public function formatIntl(?int $format = null, ?int $timeFormat = null): string;
 
     public function toMutable(): \DateTime;
 
@@ -58,30 +58,30 @@ public function addDays(int $days): self;
      *
      * @return bool
      */
-    public function isWorkday(HolidaysInterface $holidays = null): bool;
+    public function isWorkday(?HolidaysInterface $holidays = null): bool;
 
     /**
      * @param null|HolidaysInterface $holidays
      *
      * @return bool
      */
-    public function isHoliday(HolidaysInterface $holidays = null): bool;
+    public function isHoliday(?HolidaysInterface $holidays = null): bool;
 
     /**
      * @param int                    $days
      * @param null|HolidaysInterface $holidays
      *
      * @return static
      */
-    public function addWorkdays(int $days, HolidaysInterface $holidays = null): self;
+    public function addWorkdays(int $days, ?HolidaysInterface $holidays = null): self;
 
     /**
      * @param self                   $date
      * @param null|HolidaysInterface $holidays
      *
      * @return int
      */
-    public function diffWorkdays(self $date, HolidaysInterface $holidays = null): int;
+    public function diffWorkdays(self $date, ?HolidaysInterface $holidays = null): int;
 
     /**
      * @param string $modify