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

Adds assertion for URLs #199

Closed
wants to merge 2 commits into from
Closed
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ Method | Description
`ip($value, $message = '')` | Check that a string is a valid IP (either IPv4 or IPv6)
`ipv4($value, $message = '')` | Check that a string is a valid IPv4
`ipv6($value, $message = '')` | Check that a string is a valid IPv6
`url($value, $message = '')` | Check that a string is a valid URL
`email($value, $message = '')` | Check that a string is a valid e-mail address
`notWhitespaceOnly($value, $message = '')` | Check that a string contains at least one non-whitespace character

Expand Down
18 changes: 18 additions & 0 deletions src/Assert.php
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,24 @@ public static function ipv6($value, $message = '')
}
}

/**
* @psalm-pure
*
* @param mixed $value
* @param string $message
*
* @throws InvalidArgumentException
*/
public static function url($value, $message = '')
{
if (false === \filter_var($value, FILTER_VALIDATE_URL)) {
static::reportInvalidArgument(\sprintf(
$message ?: 'Expected a value to be a valid URL. Got %s',
static::valueToString($value)
));
}
}

/**
* @param mixed $value
* @param string $message
Expand Down
20 changes: 20 additions & 0 deletions src/Mixin.php
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,26 @@ public static function nullOrIpv6($value, $message = '');
*/
public static function allIpv6($value, $message = '');

/**
* @psalm-pure
*
* @param mixed $value
* @param string $message
*
* @throws InvalidArgumentException
*/
public static function nullOrUrl($value, $message = '');

/**
* @psalm-pure
*
* @param mixed $value
* @param string $message
*
* @throws InvalidArgumentException
*/
public static function allUrl($value, $message = '');

/**
* @param mixed $value
* @param string $message
Expand Down
15 changes: 15 additions & 0 deletions tests/AssertTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,21 @@ public function getTests()
array('ipv6', array(array()), false),
array('ipv6', array(null), false),
array('ipv6', array(false), false),
array('url', array('example.com'), false),
array('url', array('://example.com'), false),
array('url', array('http ://example.com'), false),
array('url', array('http:/example.com'), false),
array('url', array('http://example.com::aa'), false),
array('url', array('http://example.com:aa'), false),
array('url', array('http://'), false),
array('url', array('http://localhost/'), true),
array('url', array('http://example.com/'), true),
array('url', array('https://example.com/'), true),
array('url', array('https://username:[email protected]'), true),
array('url', array('https://example.com?'), true),
array('url', array('https://exemple.com?query=1&order[0]=name'), true),
array('url', array('ftp://example.com'), true),
array('url', array('faked://example.com'), true),
array('email', array('foo'), false),
array('email', array(123), false),
array('email', array('foo.com'), false),
Expand Down
41 changes: 41 additions & 0 deletions tests/static-analysis/assert-url.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php

namespace Webmozart\Assert\Tests\StaticAnalysis;

use Webmozart\Assert\Assert;

/**
* @param mixed $value
*
* @return mixed
*/
function url($value)
{
Assert::url($value);

return $value;
}

/**
* @param mixed $value
*
* @return mixed
*/
function nullOrUrl($value)
{
Assert::nullOrUrl($value);

return $value;
}

/**
* @param mixed $value
*
* @return mixed
*/
function allUrl($value)
{
Assert::allUrl($value);

return $value;
}