replaced bcmath functions with different logic

Author: stefanak-michal

composer.json

@@ -9,8 +9,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=7.1.0",
-        "ext-mbstring": "*",
-        "ext-bcmath": "*"
+        "ext-mbstring": "*"
     },
     "require-dev": {
         "phpunit/phpunit": ">=7.5.0"

src/structures/Date.php

@@ -40,6 +40,6 @@ public function days(): int
 
     public function __toString(): string
     {
-        return gmdate('Y-m-d', strtotime('+' . $this->days . ' days +0000', 0));
+        return gmdate('Y-m-d', strtotime(sprintf("%+d", $this->days) . ' days +0000', 0));
     }
 }

src/structures/DateTime.php

@@ -76,8 +76,9 @@ public function tz_offset_seconds(): int
 
     public function __toString(): string
     {
-        $ts = bcadd($this->seconds - $this->tz_offset_seconds, bcdiv($this->nanoseconds, 1e9, 6), 6);
-        return \DateTime::createFromFormat('U.u', $ts, new \DateTimeZone('UTC'))
+        $datetime = sprintf("%d", $this->seconds - $this->tz_offset_seconds)
+            . '.' . substr(sprintf("%09d", $this->nanoseconds), 0, 6);
+        return \DateTime::createFromFormat('U.u', $datetime, new \DateTimeZone('UTC'))
             ->setTimezone(new \DateTimeZone(sprintf("%+'05d", $this->tz_offset_seconds / 3600 * 100)))
             ->format('Y-m-d\TH:i:s.uP');
     }

src/structures/DateTimeZoneId.php

@@ -76,8 +76,9 @@ public function tz_id(): string
 
     public function __toString(): string
     {
-        $timestamp = bcadd($this->seconds, bcdiv($this->nanoseconds, 1e9, 6), 6);
-        return \DateTime::createFromFormat('U.u', $timestamp, new \DateTimeZone($this->tz_id))
+        $datetime = sprintf("%d", $this->seconds)
+            . '.' . substr(sprintf("%09d", $this->nanoseconds), 0, 6);
+        return \DateTime::createFromFormat('U.u', $datetime, new \DateTimeZone($this->tz_id))
                 ->format('Y-m-d\TH:i:s.u') . '[' . $this->tz_id . ']';
     }
 }

src/structures/Duration.php

@@ -102,7 +102,8 @@ public function __toString(): string
         if (!empty($minutes))
             $time .= $minutes . 'M';
 
-        $seconds = rtrim(bcadd($this->seconds % 3600 % 60, bcdiv($this->nanoseconds, 1e9, 6), 6), '0.');
+        $seconds = rtrim(sprintf("%d", $this->seconds % 3600 % 60)
+            . '.' . substr(sprintf("%09d", $this->nanoseconds), 0, 6), '0.');
         if (!empty($seconds))
             $time .= $seconds . 'S';
 

src/structures/LocalDateTime.php

@@ -56,7 +56,9 @@ public function nanoseconds(): int
 
     public function __toString(): string
     {
-        return \DateTime::createFromFormat('U.u', bcadd($this->seconds, bcdiv($this->nanoseconds, 1e9, 6), 6))
+        $datetime = sprintf("%d", $this->seconds)
+            . '.' . substr(sprintf("%09d", $this->nanoseconds), 0, 6);
+        return \DateTime::createFromFormat('U.u', $datetime)
             ->format('Y-m-d\TH:i:s.u');
     }
 

src/structures/LocalTime.php

@@ -40,7 +40,13 @@ public function nanoseconds(): int
 
     public function __toString(): string
     {
-        return \DateTime::createFromFormat('U.u', bcdiv($this->nanoseconds, 1e9, 6))
+        $value = sprintf("%09d", $this->nanoseconds);
+        $seconds = substr($value, 0, -9);
+        if (empty($seconds))
+            $seconds = '0';
+        $fraction = substr($value, -9, 6);
+
+        return \DateTime::createFromFormat('U.u', $seconds . '.' . $fraction)
             ->format('H:i:s.u');
     }
 }

src/structures/Time.php

@@ -59,8 +59,13 @@ public function tz_offset_seconds(): int
 
     public function __toString(): string
     {
-        $ts = bcsub(bcdiv($this->nanoseconds, 1e9, 6), $this->tz_offset_seconds, 6);
-        return \DateTime::createFromFormat('U.u', $ts, new \DateTimeZone('UTC'))
+        $value = sprintf("%09d", $this->nanoseconds - $this->tz_offset_seconds * 1e9);
+        $seconds = substr($value, 0, -9);
+        if (empty($seconds))
+            $seconds = '0';
+        $fraction = substr($value, -9, 6);
+
+        return \DateTime::createFromFormat('U.u', $seconds . '.' . $fraction, new \DateTimeZone('UTC'))
             ->setTimezone(new \DateTimeZone(sprintf("%+'05d", $this->tz_offset_seconds / 3600 * 100)))
             ->format('H:i:s.uP');
     }

tests/StructuresTest.php

@@ -54,7 +54,7 @@ class StructuresTest extends TestCase
      * How many iterations do for each date/time test
      * @var int
      */
-    public static $iterations = 10;
+    public static $iterations = 50;
 
     public function testInit(): AProtocol
     {
@@ -111,7 +111,7 @@ public function testDate(int $timestamp, AProtocol $protocol)
     public function testDateTime(int $timestamp, string $timezone, AProtocol $protocol)
     {
         try {
-            $timestamp = bcadd($timestamp, sprintf('%.6f', fmod(microtime(true), 1)), 6);
+            $timestamp .= '.' . rand(0, 9e5);
             $datetime = \DateTime::createFromFormat('U.u', $timestamp, new \DateTimeZone($timezone))
                 ->format('Y-m-d\TH:i:s.uP');
 
@@ -143,7 +143,7 @@ public function testDateTime(int $timestamp, string $timezone, AProtocol $protoc
     public function testDateTimeZoneId(int $timestamp, string $timezone, AProtocol $protocol)
     {
         try {
-            $timestamp = bcadd($timestamp, sprintf('%.6f', fmod(microtime(true), 1)), 6);
+            $timestamp .= '.' . rand(0, 9e5);
             $datetime = \DateTime::createFromFormat('U.u', $timestamp, new \DateTimeZone($timezone))
                     ->format('Y-m-d\TH:i:s.u') . '[' . $timezone . ']';
 
@@ -214,7 +214,7 @@ public function testDuration(AProtocol $protocol)
     public function testLocalDateTime(int $timestamp, AProtocol $protocol)
     {
         try {
-            $timestamp = bcadd($timestamp, sprintf('%.6f', fmod(microtime(true), 1)), 6);
+            $timestamp .= '.' . rand(0, 9e5);
             $datetime = \DateTime::createFromFormat('U.u', $timestamp)
                 ->format('Y-m-d\TH:i:s.u');
 
@@ -245,7 +245,7 @@ public function testLocalDateTime(int $timestamp, AProtocol $protocol)
     public function testLocalTime(int $timestamp, AProtocol $protocol)
     {
         try {
-            $timestamp = bcadd($timestamp, sprintf('%.6f', fmod(microtime(true), 1)), 6);
+            $timestamp .= '.' . rand(0, 9e5);
             $time = \DateTime::createFromFormat('U.u', $timestamp)
                 ->format('H:i:s.u');
 
@@ -386,7 +386,7 @@ public function testRelationship(AProtocol $protocol)
     public function testTime(int $timestamp, string $timezone, AProtocol $protocol)
     {
         try {
-            $timestamp = bcadd($timestamp, sprintf('%.6f', fmod(microtime(true), 1)), 6);
+            $timestamp .= '.' . rand(0, 9e5);
             $time = \DateTime::createFromFormat('U.u', $timestamp, new \DateTimeZone($timezone))
                 ->format('H:i:s.uP');
 
@@ -436,8 +436,8 @@ private function randomTimestamp(string $timezone = '+0000'): int
     {
         try {
             $zone = new \DateTimeZone($timezone);
-            $start = new \DateTime('-3 years', $zone);
-            $end = new \DateTime('+3 years', $zone);
+            $start = new \DateTime(date('Y-m-d H:i:s', strtotime('-10 years', 0)), $zone);
+            $end = new \DateTime(date('Y-m-d H:i:s', strtotime('+10 years', 0)), $zone);
             return rand($start->getTimestamp(), $end->getTimestamp());
         } catch (Exception $e) {
             return strtotime('now ' . $timezone);