Remove currentTime() method

This commit is contained in:
Ben Ramsey
2020-02-23 16:11:50 -06:00
parent d0b512a597
commit 84a2e76c7e
3 changed files with 3 additions and 57 deletions
-13
View File
@@ -56,19 +56,6 @@ class FixedTimeProvider implements TimeProviderInterface
$this->fixedTime = new Time($value, $this->fixedTime->getMicroSeconds());
}
/**
* @deprecated Transition to {@see FixedTimeProvider::getTime()}
*
* @inheritDoc
*/
public function currentTime(): array
{
return [
'sec' => $this->fixedTime->getSeconds()->toString(),
'usec' => $this->fixedTime->getMicroSeconds()->toString(),
];
}
public function getTime(): Time
{
return $this->fixedTime;
+2 -10
View File
@@ -17,21 +17,13 @@ namespace Ramsey\Uuid\Provider\Time;
use Ramsey\Uuid\Provider\TimeProviderInterface;
use Ramsey\Uuid\Type\Time;
use function gettimeofday;
/**
* SystemTimeProvider retrieves the current time using built-in PHP functions
*/
class SystemTimeProvider implements TimeProviderInterface
{
/**
* @deprecated Transition to {@see SystemTimeProvider::getTime()}
*
* @inheritDoc
*/
public function currentTime(): array
{
return gettimeofday();
}
public function getTime(): Time
{
$time = gettimeofday();
+1 -34
View File
@@ -4,50 +4,17 @@ declare(strict_types=1);
namespace Ramsey\Uuid\Test\Provider\Time;
use AspectMock\Test as AspectMock;
use Ramsey\Uuid\Provider\Time\SystemTimeProvider;
use Ramsey\Uuid\Test\TestCase;
use Ramsey\Uuid\Type\Time;
class SystemTimeProviderTest extends TestCase
{
public function testCurrentTimeReturnsTimestampArray(): void
public function testGetTimeUses(): void
{
$provider = new SystemTimeProvider();
$time = $provider->currentTime();
$this->assertArrayHasKey('sec', $time);
$this->assertArrayHasKey('usec', $time);
}
/**
* @runInSeparateProcess
* @preserveGlobalState disabled
*/
public function testCurrentTimeUsesGettimeofday(): void
{
$timestamp = ['sec' => 1458844556, 'usec' => 200997];
$func = AspectMock::func('Ramsey\Uuid\Provider\Time', 'gettimeofday', $timestamp);
$provider = new SystemTimeProvider();
$this->assertSame($timestamp, $provider->currentTime());
$func->verifyInvokedOnce();
}
/**
* @runInSeparateProcess
* @preserveGlobalState disabled
*/
public function testGetTimeUsesGettimeofday(): void
{
$timestamp = ['sec' => 1458844556, 'usec' => 200997];
$func = AspectMock::func('Ramsey\Uuid\Provider\Time', 'gettimeofday', $timestamp);
$provider = new SystemTimeProvider();
$time = $provider->getTime();
$this->assertInstanceOf(Time::class, $time);
$this->assertSame('1458844556', $time->getSeconds()->toString());
$this->assertSame('200997', $time->getMicroSeconds()->toString());
$func->verifyInvokedOnce();
}
}