-
Notifications
You must be signed in to change notification settings - Fork 823
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11116 from creative-commoners/pulls/5/url-field
NEW Add UrlField
- Loading branch information
Showing
2 changed files
with
125 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
<?php | ||
|
||
namespace SilverStripe\Forms; | ||
|
||
use SilverStripe\Core\Validation\ConstraintValidator; | ||
use Symfony\Component\Validator\Constraints\Url; | ||
|
||
/** | ||
* Text input field with validation for a url | ||
* Url must include a scheme, either http:// or https:// | ||
*/ | ||
class UrlField extends TextField | ||
{ | ||
public function Type() | ||
{ | ||
return 'text url'; | ||
} | ||
|
||
public function validate($validator) | ||
{ | ||
$result = true; | ||
if ($this->value && !ConstraintValidator::validate($this->value, new Url())->isValid()) { | ||
$validator->validationError( | ||
$this->name, | ||
_t(__CLASS__ . '.INVALID', 'Please enter a valid URL'), | ||
'validation' | ||
); | ||
$result = false; | ||
} | ||
return $this->extendValidationResult($result, $validator); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
<?php | ||
|
||
namespace SilverStripe\Forms\Tests; | ||
|
||
use SilverStripe\Dev\SapphireTest; | ||
use SilverStripe\Forms\UrlField; | ||
use SilverStripe\Forms\RequiredFields; | ||
|
||
class UrlFieldTest extends SapphireTest | ||
{ | ||
public function provideValidate(): array | ||
{ | ||
return [ | ||
[ | ||
'url' => '', | ||
'valid' => true, | ||
], | ||
[ | ||
'url' => '', | ||
'valid' => true, | ||
], | ||
[ | ||
'url' => 'http://example-123.com', | ||
'valid' => true, | ||
], | ||
[ | ||
'url' => 'https://example-123.com', | ||
'valid' => true, | ||
], | ||
[ | ||
'url' => 'ftp://example-123.com', | ||
'valid' => false, | ||
], | ||
[ | ||
'url' => 'http://example-123.com:8080', | ||
'valid' => true, | ||
], | ||
[ | ||
'url' => 'http://example_with_underscore_in_host.com', | ||
'valid' => true, | ||
], | ||
[ | ||
'url' => 'http://subdomain.example-123.com', | ||
'valid' => true, | ||
], | ||
[ | ||
'url' => 'http://subdomain_with_underscores.example-123.com', | ||
'valid' => true, | ||
], | ||
[ | ||
'url' => 'http://subdomain-with-dashes.example-123.com', | ||
'valid' => true, | ||
], | ||
[ | ||
'url' => 'http://example-123.com:8080/path_with_underscores_(and)_parens-and-dashes', | ||
'valid' => true, | ||
], | ||
[ | ||
'url' => 'http://example-123.com:8080/path/?query=string&some=1#fragment', | ||
'valid' => true, | ||
], | ||
[ | ||
'url' => 'http://a/b/c/g;x?y#s', | ||
'valid' => true, | ||
], | ||
[ | ||
'url' => 'http://a:123/b/c/g;x?y#s', | ||
'valid' => true, | ||
], | ||
[ | ||
'url' => 'example-123.com', | ||
'valid' => false, | ||
], | ||
[ | ||
'url' => 'nope', | ||
'valid' => false, | ||
], | ||
]; | ||
} | ||
|
||
/** | ||
* @dataProvider provideValidate | ||
*/ | ||
public function testValidate(string $email, bool $valid) | ||
{ | ||
$field = new UrlField('MyUrl'); | ||
$field->setValue($email); | ||
$validator = new RequiredFields(); | ||
$field->validate($validator); | ||
$expectedCount = $valid ? 0 : 1; | ||
$this->assertEquals($expectedCount, count($validator->getErrors())); | ||
} | ||
} |