Fix microtime multiply micro instead of nano (fixed #1)

Signed-off-by: Charlotte Dunois <[email protected]>
ObsidianPHP · Apr 1, 2020 · 9536311 · 9536311
1 parent adaed6a
commit 9536311
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/src/functions.php b/src/functions.php
@@ -59,15 +59,15 @@ function hrtime_fallback(bool $get_as_number = false) {
     static $timer;
 
     if(!$timer) {
-        $timer = (int) (\microtime(true) * 1e6);
+        $timer = (int) (\microtime(true) * 1e9);
     }
 
-    $now = (int) (\microtime(true) * 1e6);
+    $now = (int) (\microtime(true) * 1e9);
     $nanoseconds = (int) ($now - $timer);
 
     if($get_as_number) {
         return $nanoseconds;
     }
 
     return internal_conversion_nanoseconds_to_seconds($nanoseconds);
-}
+}
diff --git a/tests/HrtimeTest.php b/tests/HrtimeTest.php
@@ -17,25 +17,20 @@
 class HrtimeTest extends TestCase {
     function providerTestFunctions() {
         return array(
-            array('\\Obsidian\\Polyfill\\Hrtime\\hrtime_ext_uv', false),
-            array('\\Obsidian\\Polyfill\\Hrtime\\hrtime_ext_hrtime', false),
-            array('\\Obsidian\\Polyfill\\Hrtime\\hrtime_fallback', true)
+            array('\\Obsidian\\Polyfill\\Hrtime\\hrtime_ext_uv'),
+            array('\\Obsidian\\Polyfill\\Hrtime\\hrtime_ext_hrtime'),
+            array('\\Obsidian\\Polyfill\\Hrtime\\hrtime_fallback')
         );
     }
 
     /**
      * @dataProvider providerTestFunctions
      * @param callable  $function
-     * @param bool     $sleep
      */
-    function testHrtimeAsNumber(callable $function, bool $sleep) {
+    function testHrtimeAsNumber(callable $function) {
         $number = $function(true);
         $this->assertIsInt($number);
 
-        if($sleep) {
-            \sleep(1);
-        }
-
         $number2 = $function(true);
         $this->assertIsInt($number2);
 
@@ -45,17 +40,12 @@ function testHrtimeAsNumber(callable $function, bool $sleep) {
     /**
      * @dataProvider providerTestFunctions
      * @param callable  $function
-     * @param bool     $sleep
      */
-    function testHrtimeAsArray(callable $function, bool $sleep) {
+    function testHrtimeAsArray(callable $function) {
         $arr = $function(false);
         $this->assertIsArray($arr);
         $this->assertCount(2, $arr);
 
-        if($sleep) {
-            \sleep(1);
-        }
-
         $arr2 = $function(false);
         $this->assertIsArray($arr2);
         $this->assertCount(2, $arr2);