From 5d1f106882dd1cc4faafb7bb829bbbf50b3fe5d6 Mon Sep 17 00:00:00 2001 From: Ben Ramsey Date: Mon, 13 Jan 2020 16:08:29 -0600 Subject: [PATCH] Rename Validator\Validator to Validator\GenericValidator --- src/FeatureSet.php | 4 ++-- src/Validator/{Validator.php => GenericValidator.php} | 4 ++-- tests/UuidTest.php | 4 ++-- tests/Validator/ValidatorTest.php | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) rename src/Validator/{Validator.php => GenericValidator.php} (88%) diff --git a/src/FeatureSet.php b/src/FeatureSet.php index e9d18ba..648ba72 100644 --- a/src/FeatureSet.php +++ b/src/FeatureSet.php @@ -40,7 +40,7 @@ use Ramsey\Uuid\Provider\Node\SystemNodeProvider; use Ramsey\Uuid\Provider\NodeProviderInterface; use Ramsey\Uuid\Provider\Time\SystemTimeProvider; use Ramsey\Uuid\Provider\TimeProviderInterface; -use Ramsey\Uuid\Validator\Validator; +use Ramsey\Uuid\Validator\GenericValidator; use Ramsey\Uuid\Validator\ValidatorInterface; /** @@ -147,7 +147,7 @@ class FeatureSet $this->nodeProvider = $this->buildNodeProvider(); $this->randomGenerator = $this->buildRandomGenerator(); $this->setTimeProvider(new SystemTimeProvider()); - $this->validator = new Validator(); + $this->validator = new GenericValidator(); } /** diff --git a/src/Validator/Validator.php b/src/Validator/GenericValidator.php similarity index 88% rename from src/Validator/Validator.php rename to src/Validator/GenericValidator.php index d1830e6..87054f7 100644 --- a/src/Validator/Validator.php +++ b/src/Validator/GenericValidator.php @@ -17,9 +17,9 @@ namespace Ramsey\Uuid\Validator; use Ramsey\Uuid\Uuid; /** - * Validator validates strings as UUIDs of any variant + * GenericValidator validates strings as UUIDs of any variant */ -class Validator implements ValidatorInterface +class GenericValidator implements ValidatorInterface { /** * Regular expression pattern for matching a UUID of any variant. diff --git a/tests/UuidTest.php b/tests/UuidTest.php index 594e9f1..8bfa115 100644 --- a/tests/UuidTest.php +++ b/tests/UuidTest.php @@ -30,7 +30,7 @@ use Ramsey\Uuid\Type\Time; use Ramsey\Uuid\Uuid; use Ramsey\Uuid\UuidFactory; use Ramsey\Uuid\UuidInterface; -use Ramsey\Uuid\Validator\Validator; +use Ramsey\Uuid\Validator\GenericValidator; use Ramsey\Uuid\Validator\ValidatorInterface; use stdClass; @@ -874,7 +874,7 @@ class UuidTest extends TestCase $this->assertTrue(Uuid::isValid($argument)); // reset the static validator - $factory->setValidator(new Validator()); + $factory->setValidator(new GenericValidator()); } public function testUsingNilAsValidUuid(): void diff --git a/tests/Validator/ValidatorTest.php b/tests/Validator/ValidatorTest.php index fb0914a..53030b9 100644 --- a/tests/Validator/ValidatorTest.php +++ b/tests/Validator/ValidatorTest.php @@ -6,19 +6,19 @@ namespace Ramsey\Uuid\Test\Validator; use PHPUnit\Framework\MockObject\MockObject; use Ramsey\Uuid\Test\TestCase; -use Ramsey\Uuid\Validator\Validator; +use Ramsey\Uuid\Validator\GenericValidator; class ValidatorTest extends TestCase { /** - * @var MockObject & Validator + * @var MockObject & GenericValidator */ private $validator = null; public function setUp(): void { // Disable calls to the constructor, but do not override any methods. - $this->validator = $this->getMockBuilder(Validator::class) + $this->validator = $this->getMockBuilder(GenericValidator::class) ->disableOriginalConstructor() ->onlyMethods([]) ->getMock();