From 7cace1eaea0bcd2794401ecf39c78f5f7be792ce Mon Sep 17 00:00:00 2001 From: Ali Khosrojerdi Date: Thu, 2 Oct 2025 23:24:10 +0330 Subject: [PATCH 1/2] refactor: add |null in docblock --- src/Illuminate/Validation/Concerns/ValidatesAttributes.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php index 86ee12f07f8a..bdd4f2c3fbbf 100644 --- a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php +++ b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php @@ -271,19 +271,21 @@ protected function getDateFormat($attribute) if ($result = $this->getRule($attribute, 'DateFormat')) { return $result[1][0]; } + + return null; } /** * Get the date timestamp. * * @param mixed $value - * @return int + * @return int|null */ protected function getDateTimestamp($value) { $date = is_null($value) ? null : $this->getDateTime($value); - return $date ? $date->getTimestamp() : null; + return $date?->getTimestamp(); } /** From b79b7d2be524e73347d0fee081f94e3f9e8961c2 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 3 Oct 2025 10:12:48 +0100 Subject: [PATCH 2/2] Update ValidatesAttributes.php --- src/Illuminate/Validation/Concerns/ValidatesAttributes.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php index bdd4f2c3fbbf..a33a3c17c84d 100644 --- a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php +++ b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php @@ -271,8 +271,6 @@ protected function getDateFormat($attribute) if ($result = $this->getRule($attribute, 'DateFormat')) { return $result[1][0]; } - - return null; } /**