diff --git a/CHANGELOG.md b/CHANGELOG.md index 342961e..9ce057a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. * Remove the following deprecated classes: * `Ramsey\Uuid\Builder\BuilderCollection` + * `Ramsey\Uuid\Builder\DefaultUuidBuilder` * `Ramsey\Uuid\Builder\DegradedUuidBuilder` * `Ramsey\Uuid\Converter\Number\BigNumberConverter` * `Ramsey\Uuid\Converter\Number\DegradedNumberConverter` diff --git a/src/Builder/DefaultUuidBuilder.php b/src/Builder/DefaultUuidBuilder.php deleted file mode 100644 index 7c4a6f8..0000000 --- a/src/Builder/DefaultUuidBuilder.php +++ /dev/null @@ -1,26 +0,0 @@ - - * @license http://opensource.org/licenses/MIT MIT - */ - -declare(strict_types=1); - -namespace Ramsey\Uuid\Builder; - -use Ramsey\Uuid\Rfc4122\UuidBuilder as Rfc4122UuidBuilder; - -/** - * @deprecated Transition to {@see Rfc4122UuidBuilder}. - * - * @psalm-immutable - */ -class DefaultUuidBuilder extends Rfc4122UuidBuilder -{ -} diff --git a/src/Rfc4122/UuidBuilder.php b/src/Rfc4122/UuidBuilder.php index 736931a..919804e 100644 --- a/src/Rfc4122/UuidBuilder.php +++ b/src/Rfc4122/UuidBuilder.php @@ -43,7 +43,7 @@ class UuidBuilder implements UuidBuilderInterface private $timeConverter; /** - * Constructs the DefaultUuidBuilder + * Constructs the UUID builder * * @param NumberConverterInterface $numberConverter The number converter to * use when constructing the Uuid diff --git a/tests/Builder/DefaultUuidBuilderTest.php b/tests/Builder/DefaultUuidBuilderTest.php deleted file mode 100644 index f64d7cb..0000000 --- a/tests/Builder/DefaultUuidBuilderTest.php +++ /dev/null @@ -1,42 +0,0 @@ - '754cd475', - 'time_mid' => '7e58', - 'time_hi_and_version' => '4411', - 'clock_seq_hi_and_reserved' => '93', - 'clock_seq_low' => '22', - 'node' => 'be0725c8ce01', - ]; - - $bytes = (string) hex2bin(implode('', $fields)); - - $result = $builder->build($codec, $bytes); - $this->assertInstanceOf(Uuid::class, $result); - } -} diff --git a/tests/Codec/OrderedTimeCodecTest.php b/tests/Codec/OrderedTimeCodecTest.php index 7a690eb..c13ddf0 100644 --- a/tests/Codec/OrderedTimeCodecTest.php +++ b/tests/Codec/OrderedTimeCodecTest.php @@ -6,7 +6,6 @@ namespace Ramsey\Uuid\Test\Codec; use Mockery; use PHPUnit\Framework\MockObject\MockObject; -use Ramsey\Uuid\Builder\DefaultUuidBuilder; use Ramsey\Uuid\Builder\UuidBuilderInterface; use Ramsey\Uuid\Codec\OrderedTimeCodec; use Ramsey\Uuid\Converter\Number\GenericNumberConverter; @@ -19,6 +18,7 @@ use Ramsey\Uuid\Math\BrickMathCalculator; use Ramsey\Uuid\Nonstandard\Fields as NonstandardFields; use Ramsey\Uuid\Nonstandard\UuidBuilder; use Ramsey\Uuid\Rfc4122\Fields; +use Ramsey\Uuid\Rfc4122\UuidBuilder as Rfc4122UuidBuilder; use Ramsey\Uuid\Test\TestCase; use Ramsey\Uuid\Uuid; use Ramsey\Uuid\UuidFactory; @@ -95,7 +95,7 @@ class OrderedTimeCodecTest extends TestCase $numberConverter = Mockery::mock(NumberConverterInterface::class); $timeConverter = Mockery::mock(TimeConverterInterface::class); - $builder = new DefaultUuidBuilder($numberConverter, $timeConverter); + $builder = new Rfc4122UuidBuilder($numberConverter, $timeConverter); $codec = new OrderedTimeCodec($builder); $factory = new UuidFactory(); @@ -134,7 +134,7 @@ class OrderedTimeCodecTest extends TestCase $calculator = new BrickMathCalculator(); $numberConverter = new GenericNumberConverter($calculator); $timeConverter = Mockery::mock(TimeConverterInterface::class); - $builder = new DefaultUuidBuilder($numberConverter, $timeConverter); + $builder = new Rfc4122UuidBuilder($numberConverter, $timeConverter); $codec = new OrderedTimeCodec($builder); $factory = new UuidFactory(); @@ -153,7 +153,7 @@ class OrderedTimeCodecTest extends TestCase $fields = new NonstandardFields((string) hex2bin(str_replace('-', '', $nonRfc4122Uuid))); $numberConverter = Mockery::mock(NumberConverterInterface::class); $timeConverter = Mockery::mock(TimeConverterInterface::class); - $builder = new DefaultUuidBuilder($numberConverter, $timeConverter); + $builder = new Rfc4122UuidBuilder($numberConverter, $timeConverter); $codec = new OrderedTimeCodec($builder); $uuid = Mockery::mock(UuidInterface::class, [ @@ -176,7 +176,7 @@ class OrderedTimeCodecTest extends TestCase $numberConverter = Mockery::mock(NumberConverterInterface::class); $timeConverter = Mockery::mock(TimeConverterInterface::class); - $builder = new DefaultUuidBuilder($numberConverter, $timeConverter); + $builder = new Rfc4122UuidBuilder($numberConverter, $timeConverter); $codec = new OrderedTimeCodec($builder); $factory = new UuidFactory(); @@ -219,7 +219,7 @@ class OrderedTimeCodecTest extends TestCase $numberConverter = Mockery::mock(NumberConverterInterface::class); $timeConverter = Mockery::mock(TimeConverterInterface::class); - $builder = new DefaultUuidBuilder($numberConverter, $timeConverter); + $builder = new Rfc4122UuidBuilder($numberConverter, $timeConverter); $codec = new OrderedTimeCodec($builder); $factory = new UuidFactory();