From db27dc16804a5d701b3a3ec39cc73e0aaf7fc2bc Mon Sep 17 00:00:00 2001 From: Ben Ramsey Date: Thu, 16 Jul 2015 10:06:16 -0500 Subject: [PATCH] Rename UuidBuilder to Builder\UuidBuilderInterface --- src/Builder/DefaultUuidBuilder.php | 3 +-- src/Builder/DegradedUuidBuilder.php | 3 +-- src/{UuidBuilder.php => Builder/UuidBuilderInterface.php} | 4 ++-- src/Codec/StringCodec.php | 4 ++-- src/UuidFactory.php | 5 +++-- 5 files changed, 9 insertions(+), 10 deletions(-) rename src/{UuidBuilder.php => Builder/UuidBuilderInterface.php} (91%) diff --git a/src/Builder/DefaultUuidBuilder.php b/src/Builder/DefaultUuidBuilder.php index 29dc1bd..22eece3 100644 --- a/src/Builder/DefaultUuidBuilder.php +++ b/src/Builder/DefaultUuidBuilder.php @@ -17,9 +17,8 @@ namespace Ramsey\Uuid\Builder; use Ramsey\Uuid\Converter\NumberConverterInterface; use Ramsey\Uuid\Codec\CodecInterface; use Ramsey\Uuid\Uuid; -use Ramsey\Uuid\UuidBuilder; -class DefaultUuidBuilder implements UuidBuilder +class DefaultUuidBuilder implements UuidBuilderInterface { private $converter; diff --git a/src/Builder/DegradedUuidBuilder.php b/src/Builder/DegradedUuidBuilder.php index c1a0797..e28d8da 100644 --- a/src/Builder/DegradedUuidBuilder.php +++ b/src/Builder/DegradedUuidBuilder.php @@ -14,12 +14,11 @@ namespace Ramsey\Uuid\Builder; -use Ramsey\Uuid\UuidBuilder; use Ramsey\Uuid\Codec\CodecInterface; use Ramsey\Uuid\DegradedUuid; use Ramsey\Uuid\Converter\NumberConverterInterface; -class DegradedUuidBuilder implements UuidBuilder +class DegradedUuidBuilder implements UuidBuilderInterface { private $converter; diff --git a/src/UuidBuilder.php b/src/Builder/UuidBuilderInterface.php similarity index 91% rename from src/UuidBuilder.php rename to src/Builder/UuidBuilderInterface.php index 1954516..3bfc715 100644 --- a/src/UuidBuilder.php +++ b/src/Builder/UuidBuilderInterface.php @@ -12,11 +12,11 @@ * @link https://github.com/ramsey/uuid GitHub */ -namespace Ramsey\Uuid; +namespace Ramsey\Uuid\Builder; use Ramsey\Uuid\Codec\CodecInterface; -interface UuidBuilder +interface UuidBuilderInterface { /** * @return Uuid diff --git a/src/Codec/StringCodec.php b/src/Codec/StringCodec.php index 80313a4..22da747 100644 --- a/src/Codec/StringCodec.php +++ b/src/Codec/StringCodec.php @@ -16,7 +16,7 @@ namespace Ramsey\Uuid\Codec; use InvalidArgumentException; use Ramsey\Uuid\Uuid; -use Ramsey\Uuid\UuidBuilder; +use Ramsey\Uuid\Builder\UuidBuilderInterface; use Ramsey\Uuid\UuidInterface; class StringCodec implements CodecInterface @@ -24,7 +24,7 @@ class StringCodec implements CodecInterface private $builder; - public function __construct(UuidBuilder $builder) + public function __construct(UuidBuilderInterface $builder) { $this->builder = $builder; } diff --git a/src/UuidFactory.php b/src/UuidFactory.php index c9b2a13..b7de729 100644 --- a/src/UuidFactory.php +++ b/src/UuidFactory.php @@ -21,6 +21,7 @@ use Ramsey\Uuid\Provider\NodeProviderInterface; use Ramsey\Uuid\Provider\TimeProviderInterface; use Ramsey\Uuid\Generator\RandomGeneratorInterface; use Ramsey\Uuid\Codec\CodecInterface; +use Ramsey\Uuid\Builder\UuidBuilderInterface; class UuidFactory implements UuidFactoryInterface { @@ -62,7 +63,7 @@ class UuidFactory implements UuidFactoryInterface /** * - * @var UuidBuilder + * @var UuidBuilderInterface */ private $uuidBuilder = null; @@ -128,7 +129,7 @@ class UuidFactory implements UuidFactoryInterface $this->numberConverter = $converter; } - public function setUuidBuilder(UuidBuilder $builder) + public function setUuidBuilder(UuidBuilderInterface $builder) { $this->uuidBuilder = $builder; }