Skip to content

Commit

Permalink
Merge pull request #266 from gsteel/v3/remove-i18n-validators
Browse files Browse the repository at this point in the history 
Remove i18n Validator aliases and factories
  • Loading branch information
@gsteel
gsteel authored Jun 17, 2024
2 parents 7d86670 + 67f2e94 commit b50325e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 36 deletions.
31 changes: 0 additions & 31 deletions src/ValidatorPluginManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
namespace Laminas\Validator;

use Laminas\I18n\Translator\TranslatorInterface;
use Laminas\I18n\Validator as I18nValidator;
use Laminas\ServiceManager\AbstractPluginManager;
use Laminas\ServiceManager\Exception\InvalidServiceException;
use Laminas\ServiceManager\Factory\InvokableFactory;
Expand All @@ -28,10 +27,6 @@ final class ValidatorPluginManager extends AbstractPluginManager
* @inheritDoc
*/
protected $aliases = [
'alnum' => I18nValidator\Alnum::class,
'Alnum' => I18nValidator\Alnum::class,
'alpha' => I18nValidator\Alpha::class,
'Alpha' => I18nValidator\Alpha::class,
'barcode' => Barcode::class,
'Barcode' => Barcode::class,
'between' => Between::class,
Expand All @@ -54,9 +49,6 @@ final class ValidatorPluginManager extends AbstractPluginManager
'datestep' => DateStep::class,
'dateStep' => DateStep::class,
'DateStep' => DateStep::class,
'datetime' => I18nValidator\DateTime::class,
'dateTime' => I18nValidator\DateTime::class,
'DateTime' => I18nValidator\DateTime::class,
'digits' => Digits::class,
'Digits' => Digits::class,
'emailaddress' => EmailAddress::class,
Expand Down Expand Up @@ -121,8 +113,6 @@ final class ValidatorPluginManager extends AbstractPluginManager
'filewordcount' => File\WordCount::class,
'fileWordCount' => File\WordCount::class,
'FileWordCount' => File\WordCount::class,
'float' => I18nValidator\IsFloat::class,
'Float' => I18nValidator\IsFloat::class,
'gpspoint' => GpsPoint::class,
'gpsPoint' => GpsPoint::class,
'GpsPoint' => GpsPoint::class,
Expand All @@ -140,8 +130,6 @@ final class ValidatorPluginManager extends AbstractPluginManager
'inarray' => InArray::class,
'inArray' => InArray::class,
'InArray' => InArray::class,
'int' => I18nValidator\IsInt::class,
'Int' => I18nValidator\IsInt::class,
'ip' => Ip::class,
'Ip' => Ip::class,
'IsArray' => IsArray::class,
Expand All @@ -150,27 +138,15 @@ final class ValidatorPluginManager extends AbstractPluginManager
'isCountable' => IsCountable::class,
'IsCountable' => IsCountable::class,
'iscountable' => IsCountable::class,
'isfloat' => I18nValidator\IsFloat::class,
'isFloat' => I18nValidator\IsFloat::class,
'IsFloat' => I18nValidator\IsFloat::class,
'isinstanceof' => IsInstanceOf::class,
'isInstanceOf' => IsInstanceOf::class,
'IsInstanceOf' => IsInstanceOf::class,
'isint' => I18nValidator\IsInt::class,
'isInt' => I18nValidator\IsInt::class,
'IsInt' => I18nValidator\IsInt::class,
'lessthan' => LessThan::class,
'lessThan' => LessThan::class,
'LessThan' => LessThan::class,
'notempty' => NotEmpty::class,
'notEmpty' => NotEmpty::class,
'NotEmpty' => NotEmpty::class,
'phonenumber' => I18nValidator\PhoneNumber::class,
'phoneNumber' => I18nValidator\PhoneNumber::class,
'PhoneNumber' => I18nValidator\PhoneNumber::class,
'postcode' => I18nValidator\PostCode::class,
'postCode' => I18nValidator\PostCode::class,
'PostCode' => I18nValidator\PostCode::class,
'regex' => Regex::class,
'Regex' => Regex::class,
'sitemapchangefreq' => Sitemap\Changefreq::class,
Expand Down Expand Up @@ -204,8 +180,6 @@ final class ValidatorPluginManager extends AbstractPluginManager
* @inheritDoc
*/
protected $factories = [
I18nValidator\Alnum::class => InvokableFactory::class,
I18nValidator\Alpha::class => InvokableFactory::class,
Barcode::class => InvokableFactory::class,
Between::class => InvokableFactory::class,
Bitwise::class => InvokableFactory::class,
Expand All @@ -215,7 +189,6 @@ final class ValidatorPluginManager extends AbstractPluginManager
Csrf::class => InvokableFactory::class,
DateStep::class => InvokableFactory::class,
Date::class => InvokableFactory::class,
I18nValidator\DateTime::class => InvokableFactory::class,
Digits::class => InvokableFactory::class,
EmailAddress::class => InvokableFactory::class,
Explode::class => InvokableFactory::class,
Expand All @@ -238,7 +211,6 @@ final class ValidatorPluginManager extends AbstractPluginManager
File\Upload::class => InvokableFactory::class,
File\UploadFile::class => InvokableFactory::class,
File\WordCount::class => InvokableFactory::class,
I18nValidator\IsFloat::class => InvokableFactory::class,
GpsPoint::class => InvokableFactory::class,
GreaterThan::class => InvokableFactory::class,
Hex::class => InvokableFactory::class,
Expand All @@ -247,7 +219,6 @@ final class ValidatorPluginManager extends AbstractPluginManager
Iban::class => InvokableFactory::class,
Identical::class => InvokableFactory::class,
InArray::class => InvokableFactory::class,
I18nValidator\IsInt::class => InvokableFactory::class,
Ip::class => InvokableFactory::class,
IsArray::class => InvokableFactory::class,
Isbn::class => InvokableFactory::class,
Expand All @@ -256,8 +227,6 @@ final class ValidatorPluginManager extends AbstractPluginManager
IsJsonString::class => InvokableFactory::class,
LessThan::class => InvokableFactory::class,
NotEmpty::class => InvokableFactory::class,
I18nValidator\PhoneNumber::class => InvokableFactory::class,
I18nValidator\PostCode::class => InvokableFactory::class,
Regex::class => InvokableFactory::class,
Sitemap\Changefreq::class => InvokableFactory::class,
Sitemap\Lastmod::class => InvokableFactory::class,
Expand Down
11 changes: 6 additions & 5 deletions test/StaticValidatorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
namespace LaminasTest\Validator;

use InvalidArgumentException;
use Laminas\I18n\Validator\Alpha;
use Laminas\ServiceManager\Exception\ServiceNotFoundException;
use Laminas\ServiceManager\ServiceManager;
use Laminas\Validator\AbstractValidator;
use Laminas\Validator\Between;
use Laminas\Validator\StaticValidator;
use Laminas\Validator\StringLength;
use Laminas\Validator\ValidatorInterface;
use Laminas\Validator\ValidatorPluginManager;
use LaminasTest\Validator\TestAsset\ArrayTranslator;
Expand All @@ -25,7 +25,7 @@

final class StaticValidatorTest extends TestCase
{
private Alpha $validator;
private StringLength $validator;

/**
* Creates a new validation object for each test method
Expand All @@ -36,7 +36,7 @@ protected function setUp(): void

AbstractValidator::setDefaultTranslator(null);
StaticValidator::setPluginManager(null);
$this->validator = new Alpha();
$this->validator = new StringLength();
}

protected function tearDown(): void
Expand Down Expand Up @@ -93,12 +93,13 @@ public function testMaximumErrorMessageLength(): void

$this->validator->setTranslator($translator);

/** @psalm-suppress InvalidArgument */
self::assertFalse($this->validator->isValid(123));

$messages = $this->validator->getMessages();

self::assertArrayHasKey(Alpha::INVALID, $messages);
self::assertSame('This is...', $messages[Alpha::INVALID]);
self::assertArrayHasKey(StringLength::INVALID, $messages);
self::assertSame('This is...', $messages[StringLength::INVALID]);
}

public function testSetGetMessageLengthLimitation(): void
Expand Down

0 comments on commit b50325e

Please sign in to comment.