Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make nullable parameter type hint explicitly nullable #186

Merged
merged 1 commit into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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