Merge pull request #24 from srjlewis/master

Compatability with php 8.4

composer.json

@@ -10,8 +10,8 @@
         }
     ],
     "require": {
-        "php": ">=7",
-        "nesbot/carbon": "^2.16|^1.22"
+        "php": ">=7.1",
+        "nesbot/carbon": "^2.16|^1.22|^3.0"
     },
     "autoload": {
         "psr-4": {

src/Date.php

@@ -239,7 +239,7 @@ public function __construct(int $day,
         int $month,
         int $year,
         float $julianDay = 0,
-        Carbon $date = null,
+        ?Carbon $date = null,
         int $adjustment = 0)
     {
         $this->day = $day;
@@ -330,12 +330,12 @@ public static function setToStringFormat($format)
     /**
      * get date string
      *
-     * @param string $format
-     * @param int    $numbers
+     * @param string|null $format
+     * @param int|null    $numbers
      *
      * @return string
      */
-    public function format(string $format = null, int $numbers = null)
+    public function format(?string $format = null, ?int $numbers = null)
     {
         $numbers = $numbers === null ? static::getDefaultNumbers() : $numbers;
         $format = $format === null ? static::getToStringFormat() : $format;

src/Hijri.php

@@ -28,7 +28,7 @@ class Hijri
      *
      * @return \GeniusTS\HijriDate\Date
      */
-    public static function convertToHijri($date, int $adjustment = null)
+    public static function convertToHijri($date, ?int $adjustment = null)
     {
         if (! $date instanceof Carbon)
         {
@@ -48,7 +48,7 @@ public static function convertToHijri($date, int $adjustment = null)
      *
      * @return \Carbon\Carbon
      */
-    public static function convertToGregorian(int $day, int $month, int $year, int $adjustment = null)
+    public static function convertToGregorian(int $day, int $month, int $year, ?int $adjustment = null)
     {
         return static::toGregorian($day, $month, $year, static::getAdjustment($adjustment));
     }
@@ -117,7 +117,7 @@ public static function setDefaultAdjustment(int $adjustment)
      *
      * @return int
      */
-    protected static function getAdjustment(int $adjustment = null)
+    protected static function getAdjustment(?int $adjustment = null)
     {
         return $adjustment === null ? static::getDefaultAdjustment() : $adjustment;
     }