Enable use of custom TimeGenerator implementations

- Removes now unnecessary `timeConverter` and `timeProvider`
  properties, setters, and getters in both FeatureSet and
  UuidFactory as those are now exclusively used by the default
  TimeGenerator
- Adds a `setTimeGenerator` method on UuidFactory to override the
  default time generator
This commit is contained in:
Aztech
2015-07-28 22:15:45 +02:00
parent b5e431e7f1
commit 0cd74639cf
3 changed files with 44 additions and 55 deletions
+5 -26
View File
@@ -16,9 +16,7 @@ namespace Ramsey\Uuid;
use InvalidArgumentException;
use Ramsey\Uuid\Converter\NumberConverterInterface;
use Ramsey\Uuid\Converter\TimeConverterInterface;
use Ramsey\Uuid\Provider\NodeProviderInterface;
use Ramsey\Uuid\Provider\TimeProviderInterface;
use Ramsey\Uuid\Generator\RandomGeneratorInterface;
use Ramsey\Uuid\Generator\TimeGeneratorInterface;
use Ramsey\Uuid\Codec\CodecInterface;
@@ -55,18 +53,6 @@ class UuidFactory implements UuidFactoryInterface
*/
private $timeGenerator = null;
/**
*
* @var TimeConverterInterface
*/
private $timeConverter = null;
/**
*
* @var TimeProviderInterface
*/
private $timeProvider = null;
/**
*
* @var UuidBuilderInterface
@@ -86,8 +72,6 @@ class UuidFactory implements UuidFactoryInterface
$this->numberConverter = $features->getNumberConverter();
$this->randomGenerator = $features->getRandomGenerator();
$this->timeGenerator = $features->getTimeGenerator();
$this->timeConverter = $features->getTimeConverter();
$this->timeProvider = $features->getTimeProvider();
$this->uuidBuilder = $features->getBuilder();
}
@@ -111,21 +95,16 @@ class UuidFactory implements UuidFactoryInterface
return $this->timeGenerator;
}
public function setTimeGenerator(TimeGeneratorInterface $generator)
{
$this->timeGenerator = $generator;
}
public function getNumberConverter()
{
return $this->numberConverter;
}
public function getTimeConverter()
{
return $this->timeConverter;
}
public function getTimeProvider()
{
return $this->timeProvider;
}
public function setRandomGenerator(RandomGeneratorInterface $generator)
{
$this->randomGenerator = $generator;