From 84a2e76c7e2c05b87b815ceddc6d47a7e5b06e9f Mon Sep 17 00:00:00 2001 From: Ben Ramsey Date: Sun, 23 Feb 2020 16:11:50 -0600 Subject: [PATCH] Remove currentTime() method --- src/Provider/Time/FixedTimeProvider.php | 13 ------- src/Provider/Time/SystemTimeProvider.php | 12 ++----- .../Provider/Time/SystemTimeProviderTest.php | 35 +------------------ 3 files changed, 3 insertions(+), 57 deletions(-) diff --git a/src/Provider/Time/FixedTimeProvider.php b/src/Provider/Time/FixedTimeProvider.php index 1e42ae2..b017ee8 100644 --- a/src/Provider/Time/FixedTimeProvider.php +++ b/src/Provider/Time/FixedTimeProvider.php @@ -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; diff --git a/src/Provider/Time/SystemTimeProvider.php b/src/Provider/Time/SystemTimeProvider.php index 93ff01f..3a1e09c 100644 --- a/src/Provider/Time/SystemTimeProvider.php +++ b/src/Provider/Time/SystemTimeProvider.php @@ -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(); diff --git a/tests/Provider/Time/SystemTimeProviderTest.php b/tests/Provider/Time/SystemTimeProviderTest.php index f98d9af..4655aea 100644 --- a/tests/Provider/Time/SystemTimeProviderTest.php +++ b/tests/Provider/Time/SystemTimeProviderTest.php @@ -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(); } }