Merge branch '1.0' into 2.0

Author: terrafrost

.travis.yml

@@ -1,16 +1,25 @@
 language: php
 
-php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-  - 7.4
-  - 8.0
-  - nightly
-
 matrix:
+  include:
+    - php: 5.6
+      dist: xenial
+    - php: 7.0
+      dist: xenial
+    - php: 7.1
+      dist: xenial
+    - php: 7.2
+      dist: xenial
+    - php: 7.3
+      dist: xenial
+    - php: 7.4
+      dist: xenial
+    - php: 8.0
+      dist: bionic
+    - php: 8.1.0
+      dist: bionic
+    - php: nightly
+      dist: bionic
   fast_finish: true
   allow_failures:
     - php: nightly

composer.json

@@ -1,6 +1,6 @@
 {
     "name":         "phpseclib/bcmath_compat",
-    "description":  "PHP 5.x/7.x polyfill for bcmath extension",
+    "description":  "PHP 5.x-8.x polyfill for bcmath extension",
     "keywords": [
             "bcmath",
             "math",
@@ -44,6 +44,6 @@
         "fix-style": "phpcbf src tests"
     },
     "provide": {
-      "ext-bcmath": "8.0.0"
+      "ext-bcmath": "8.1.0"
     }
 }

src/BCMath.php

@@ -71,7 +71,11 @@ private static function format($x, $scale, $pad)
         } elseif ($scale) {
             $temp[1] = str_repeat('0', $scale);
         }
-        return $sign . rtrim(implode('.', $temp), '.');
+        $result = rtrim(implode('.', $temp), '.');
+        if ($sign == '-' && preg_match('#^0\.?0*$#', $result)) {
+            $sign = '';
+        }
+        return $sign . $result;
     }
 
     /**
@@ -133,9 +137,11 @@ private static function mul($x, $y, $scale, $pad)
         }
 
         $z = $x->abs()->multiply($y->abs());
-        $sign = (self::isNegative($x) ^ self::isNegative($y)) ? '-' : '';
+        $result = self::format($z, $scale, 2 * $pad);
+
+        $sign = (self::isNegative($x) ^ self::isNegative($y)) && !preg_match('#^0\.?0*$#', $result) ? '-' : '';
 
-        return $sign . self::format($z, $scale, 2 * $pad);
+        return $sign . $result;
     }
 
     /**
@@ -402,19 +408,25 @@ public static function __callStatic($name, $arguments)
             }
         }
         foreach ($numbers as $i => $arg) {
+            $num = $i + 1;
             switch (true) {
                 case is_bool($arg):
                 case is_numeric($arg):
                 case is_string($arg):
                 case is_object($arg) && method_exists($arg, '__toString'):
-                case is_null($arg):
-                    if (!is_bool($arg) && !is_null($arg) && !is_numeric("$arg")) {
-                        trigger_error("bc$name: bcmath function argument is not well-formed", E_USER_WARNING);
+                    if (!is_bool($arg) && !is_numeric("$arg")) {
+                        throw new \ValueError("bc$name: bcmath function argument is not well-formed");
                     }
                     break;
+                // PHP >= 8.1 has deprecated the passing of nulls to string parameters
+                case is_null($arg):
+                    $error = "bc$name(): Passing null to parameter #$num (\$$names[$i]) of type string is deprecated";
+                    trigger_error($error, E_USER_DEPRECATED);
+                    break;
                 default:
                     $type = is_object($arg) ? get_class($arg) : gettype($arg);
-                    throw new \TypeError("bc$name(): Argument #$i (\$$names[$i]) must be of type string, $type given");
+                    $error = "bc$name(): Argument #$num (\$$names[$i]) must be of type string, $type given";
+                    throw new \TypeError($error);
             }
         }
         if (!isset(self::$scale)) {

tests/BCMathTest.php

@@ -35,15 +35,10 @@ public function generateTwoParams()
             ['2', '190', 3],
             ['9', '0'],
             ['0', '9'],
-            [null, '9'],
+            // this became deprecated in PHP 8.1
+            //[null, '9'],
             ['-0.0000005', '0', 3],
-            /*
-               there is some wonkyness with bcmul() in PHP 7.3 that this shim doesn't emulate:
-               https://bugs.php.net/78071
-               ie. instead of 0.000 you get -0.000 or vice versa. once a non-zero digit appears
-                   the outputs become consistent
-            */
-            //['-0.0000005', '0.0000001', 3],
+            ['-0.0000005', '0.0000001', 3],
             ['-0', '0'],
             ['-0', '-0', 4]
         ];
@@ -57,6 +52,11 @@ public function testAdd(...$params)
     {
         $a = bcadd(...$params);
         $b = BCMath::add(...$params);
+
+        if (version_compare(PHP_VERSION, '8.0.10') < 0 && preg_match('#^-0\.?0*$#', $a)) {
+            $this->markTestSkipped('< PHP 8.0.10 made it so that you can\'t have -0 per http://bugs.php.net/78238');
+        }
+
         $this->assertSame($a, $b);
     }
 
@@ -67,6 +67,11 @@ public function testSub(...$params)
     {
         $a = bcsub(...$params);
         $b = BCMath::sub(...$params);
+
+        if (version_compare(PHP_VERSION, '8.0.10') < 0 && preg_match('#^-0\.?0*$#', $a)) {
+            $this->markTestSkipped('< PHP 8.0.10 made it so that you can\'t have -0 per http://bugs.php.net/78238');
+        }
+
         $this->assertSame($a, $b);
     }
 
@@ -78,6 +83,11 @@ public function testMul(...$params)
     {
         $a = bcmul(...$params);
         $b = BCMath::mul(...$params);
+
+        if (version_compare(PHP_VERSION, '8.0.10') < 0 && preg_match('#^-0\.?0*$#', $a)) {
+            $this->markTestSkipped('< PHP 8.0.10 made it so that you can\'t have -0 per http://bugs.php.net/78238');
+        }
+
         $this->assertSame($a, $b);
     }