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.

Sign up for GitHub

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

[10.x] Added parameters to timezone validation rule #47171

Merged
merged 5 commits into from
May 23, 2023
Merged

[10.x] Added parameters to timezone validation rule #47171

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07f3a1c
adding parameters to timezone validation rule
Artyomushko May 22, 2023
fdf5567
adding tests
Artyomushko May 22, 2023
84aec14
revert style changes that are not relevant to the task
Artyomushko May 23, 2023
b4aedfb
added the default value for the $parameters parameter
Artyomushko May 23, 2023
f832e80
formatting
taylorotwell May 23, 2023
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
21 changes: 15 additions & 6 deletions src/Illuminate/Validation/Concerns/ValidatesAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Brick\Math\Exception\MathException as BrickMathException;
use DateTime;
use DateTimeInterface;
use DateTimeZone;
use Egulias\EmailValidator\EmailValidator;
use Egulias\EmailValidator\Validation\DNSCheckValidation;
use Egulias\EmailValidator\Validation\Extra\SpoofCheckValidation;
Expand Down Expand Up @@ -312,7 +313,8 @@ protected function checkDateTimeOrder($format, $first, $second, $operator)
*
* @param string $format
* @param string $value
* @return \DateTime|null
*
* @return DateTime|null
Artyomushko marked this conversation as resolved.
Show resolved Hide resolved
*/
protected function getDateTimeWithOptionalFormat($format, $value)
{
Expand All @@ -327,7 +329,8 @@ protected function getDateTimeWithOptionalFormat($format, $value)
* Get a DateTime instance from a string with no format.
*
* @param string $value
* @return \DateTime|null
*
* @return DateTime|null
*/
protected function getDateTime($value)
{
Expand Down Expand Up @@ -2285,11 +2288,15 @@ public function validateString($attribute, $value)
*
* @param string $attribute
* @param mixed $value
* @param array<string, null|string> $parameters
* @return bool
*/
public function validateTimezone($attribute, $value)
public function validateTimezone($attribute, $value, $parameters)
driesvints marked this conversation as resolved.
Show resolved Hide resolved
{
return in_array($value, timezone_identifiers_list(), true);
return in_array($value, timezone_identifiers_list(
constant(DateTimeZone::class . '::' . Str::upper($parameters[0] ?? 'all')),
Str::upper($parameters[1] ?? '')
), true);
}

/**
Expand Down Expand Up @@ -2402,9 +2409,10 @@ public function isValidFileInstance($value)
* @param mixed $first
* @param mixed $second
* @param string $operator
*
* @return bool
*
* @throws \InvalidArgumentException
* @throws InvalidArgumentException
*/
protected function compare($first, $second, $operator)
{
Expand Down Expand Up @@ -2441,9 +2449,10 @@ public function parseNamedParameters($parameters)
* @param int $count
* @param array<int, int|string> $parameters
* @param string $rule
*
* @return void
*
* @throws \InvalidArgumentException
* @throws InvalidArgumentException
*/
public function requireParameterCount($count, $parameters, $rule)
{
Expand Down
Loading