Skip to content

feat(validation): add protocol support to Url attribute #1068

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(validation): add protocol support to Url attribute #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion src/Attributes/Validation/Url.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,27 @@
namespace Spatie\LaravelData\Attributes\Validation;

use Attribute;
use Illuminate\Support\Arr;
use Spatie\LaravelData\Support\Validation\References\ExternalReference;

#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
class Url extends StringValidationAttribute
{
protected array $protocols;

public function __construct(
string|array|ExternalReference ...$protocols
) {
$this->protocols = Arr::flatten($protocols);
}

public static function keyword(): string
{
return 'url';
}

public function parameters(): array
{
return [];
return $this->protocols;
}
}
28 changes: 24 additions & 4 deletions tests/Datasets/RulesDataset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,10 +442,7 @@ function fixature(
expected: 'uppercase',
);

yield fixature(
attribute: new Url(),
expected: 'url',
);
yield from urlAttributes();

yield fixature(
attribute: new Ulid(),
Expand Down Expand Up @@ -492,6 +489,29 @@ function acceptedIfAttributes(): Generator
);
}

function urlAttributes(): Generator
{
yield fixature(
attribute: new Url(),
expected: 'url',
);

yield fixature(
attribute: new Url('http'),
expected: 'url:http',
);

yield fixature(
attribute: new Url(['http', 'https']),
expected: 'url:http,https',
);

yield fixature(
attribute: new Url('http', 'https'),
expected: 'url:http,https',
);
}

function afterAttributes(): Generator
{
yield fixature(
Expand Down