Remove deprecated Ramsey\Uuid\Builder\DefaultUuidBuilder

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`

src/Builder/DefaultUuidBuilder.php

@@ -1,26 +0,0 @@
-<?php
-
-/**
- * This file is part of the ramsey/uuid library
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com>
- * @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
-{
-}

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

tests/Builder/DefaultUuidBuilderTest.php

@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Ramsey\Uuid\Test\Builder;
-
-use Mockery;
-use Ramsey\Uuid\Builder\DefaultUuidBuilder;
-use Ramsey\Uuid\Codec\CodecInterface;
-use Ramsey\Uuid\Converter\NumberConverterInterface;
-use Ramsey\Uuid\Converter\TimeConverterInterface;
-use Ramsey\Uuid\Test\TestCase;
-use Ramsey\Uuid\Uuid;
-
-use function hex2bin;
-use function implode;
-
-class DefaultUuidBuilderTest extends TestCase
-{
-    public function testBuildCreatesUuid(): void
-    {
-        $numberConverter = Mockery::mock(NumberConverterInterface::class);
-        $timeConverter = Mockery::mock(TimeConverterInterface::class);
-        $codec = Mockery::mock(CodecInterface::class);
-
-        $builder = new DefaultUuidBuilder($numberConverter, $timeConverter);
-
-        $fields = [
-            'time_low' => '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);
-    }
-}

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();