Skip to content

Commit

Permalink
Merge pull request #186 from nimah79/master
Browse files Browse the repository at this point in the history
Make nullable parameter type hint explicitly nullable
  • Loading branch information
morilog authored Jan 21, 2025
2 parents 2945551 + 3f34ec7 commit 61cfb87
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ $date = Jalalian::forge('now - 10 minutes')->ago() // 10 دقیقه پیش


```php
public static function now(\DateTimeZone $timeZone = null): Jalalian
public static function now(?\DateTimeZone $timeZone = null): Jalalian

$jDate = Jalalian::now();
```
Expand All @@ -77,22 +77,22 @@ $jDate = Jalalian::fromCarbon(Carbon::now());

---
```php
public static function fromFormat(string $format, string $timestamp, \DateTimeZone$timeZone = null): Jalalian
public static function fromFormat(string $format, string $timestamp, ?\DateTimeZone$timeZone = null): Jalalian

$jDate = Jalalian::fromFormat('Y-m-d H:i:s', '1397-01-18 12:00:40');
```


---
```php
public static function forge($timestamp, \DateTimeZone $timeZone = null): Jalalian
public static function forge($timestamp, ?\DateTimeZone $timeZone = null): Jalalian

// Alias fo fromDatetime
```

---
```php
public static function fromDateTime($dateTime, \DateTimeZone $timeZone = null): Jalalian
public static function fromDateTime($dateTime, ?\DateTimeZone $timeZone = null): Jalalian

$jDate = Jalalian::fromDateTime(Carbon::now())
// OR
Expand Down
8 changes: 4 additions & 4 deletions src/Jalalian.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function __construct(
$this->timezone = $timezone;
}

public static function now(\DateTimeZone $timeZone = null): Jalalian
public static function now(?\DateTimeZone $timeZone = null): Jalalian
{
return static::fromCarbon(Carbon::now($timeZone));
}
Expand All @@ -102,12 +102,12 @@ public static function fromCarbon(Carbon $carbon): Jalalian
);
}

public static function fromFormat(string $format, string $timestamp, \DateTimeZone $timeZone = null): Jalalian
public static function fromFormat(string $format, string $timestamp, ?\DateTimeZone $timeZone = null): Jalalian
{
return static::fromCarbon(CalendarUtils::createCarbonFromFormat($format, $timestamp, $timeZone));
}

public static function forge($timestamp, \DateTimeZone $timeZone = null): Jalalian
public static function forge($timestamp, ?\DateTimeZone $timeZone = null): Jalalian
{
return static::fromDateTime($timestamp, $timeZone);
}
Expand All @@ -117,7 +117,7 @@ public static function forge($timestamp, \DateTimeZone $timeZone = null): Jalali
* @param \DateTimeZone|null $timeZone
* @return Jalalian
*/
public static function fromDateTime($dateTime, \DateTimeZone $timeZone = null): Jalalian
public static function fromDateTime($dateTime, ?\DateTimeZone $timeZone = null): Jalalian
{
if (is_numeric($dateTime)) {
return static::fromCarbon(Carbon::createFromTimestamp($dateTime, $timeZone));
Expand Down

0 comments on commit 61cfb87

Please sign in to comment.