From 879fe3cfe2350d35bd2e03eeba53359a5a5912a2 Mon Sep 17 00:00:00 2001 From: Anton Vasetskiy Date: Thu, 28 Jul 2016 16:44:26 +0300 Subject: [PATCH 1/2] Fix RandomNodeProvider: change the max value in mt_rand() call to prevent invalid node generation --- src/Provider/Node/RandomNodeProvider.php | 2 +- tests/src/Provider/Node/RandomNodeProviderTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Provider/Node/RandomNodeProvider.php b/src/Provider/Node/RandomNodeProvider.php index 1437bb6..6c81fdf 100644 --- a/src/Provider/Node/RandomNodeProvider.php +++ b/src/Provider/Node/RandomNodeProvider.php @@ -31,6 +31,6 @@ class RandomNodeProvider implements NodeProviderInterface */ public function getNode() { - return sprintf('%06x%06x', mt_rand(0, 1 << 24), mt_rand(0, 1 << 24)); + return sprintf('%06x%06x', mt_rand(0, 0xffffff), mt_rand(0, 0xffffff)); } } diff --git a/tests/src/Provider/Node/RandomNodeProviderTest.php b/tests/src/Provider/Node/RandomNodeProviderTest.php index d739d29..6295087 100644 --- a/tests/src/Provider/Node/RandomNodeProviderTest.php +++ b/tests/src/Provider/Node/RandomNodeProviderTest.php @@ -32,7 +32,7 @@ class RandomNodeProviderTest extends TestCase $mtRand = AspectMock::func('Ramsey\Uuid\Provider\Node', 'mt_rand', $this->num); $provider = new RandomNodeProvider(); $provider->getNode(); - $mtRand->verifyInvokedMultipleTimes(2, [0, 1 << 24]); + $mtRand->verifyInvokedMultipleTimes(2, [0, 0xffffff]); } /** From 4872dac7237f25524b5a3513fb3df46f769d687e Mon Sep 17 00:00:00 2001 From: Anton Vasetskiy Date: Thu, 28 Jul 2016 17:49:27 +0300 Subject: [PATCH 2/2] Fix code style --- tests/src/Provider/Time/SystemTimeProviderTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/src/Provider/Time/SystemTimeProviderTest.php b/tests/src/Provider/Time/SystemTimeProviderTest.php index 6d3aa2d..3263e2f 100644 --- a/tests/src/Provider/Time/SystemTimeProviderTest.php +++ b/tests/src/Provider/Time/SystemTimeProviderTest.php @@ -29,6 +29,5 @@ class SystemTimeProviderTest extends TestCase $provider = new SystemTimeProvider(); $provider->currentTime(); $func->verifyInvokedOnce(); - } }