Fix PHP 8.0 compatibility

xp-framework · Apr 10, 2020 · c619eff · c619eff
1 parent 10f3232
commit c619eff
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 42 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -5,6 +5,7 @@ XP Math changelog
 
 ## 9.0.0 / 2020-04-10
 
+* Fixed PHP 8.0 compatibility when dividing by zero - @thekid
 * Implemented xp-framework/rfc#334: Drop PHP 5.6:
   . **Heads up:** Minimum required PHP version now is PHP 7.0.0
   . Rewrote code base, grouping use statements

diff --git a/src/main/php/math/BigFloat.class.php b/src/main/php/math/BigFloat.class.php
@@ -57,12 +57,16 @@ public function multiply($other) {
    * @return  math.BigNum
    */
   public function divide($other) {
-    if (null === ($r= bcdiv($this->num, $other instanceof self ? $other->num : $other))) {
-      $e= key(\xp::$errors[__FILE__][__LINE__- 1]);
-      \xp::gc(__FILE__);
-      throw new IllegalArgumentException($e);
+    try {
+      if (null === ($r= bcdiv($this->num, $other instanceof self ? $other->num : $other))) {
+        $e= key(\xp::$errors[__FILE__][__LINE__- 1]);
+        \xp::gc(__FILE__);
+        throw new IllegalArgumentException($e);
+      }
+      return new self($r);
+    } catch (\Error $e) {  // PHP 8.0
+      throw new IllegalArgumentException($e->getMessage());
     }
-    return new self($r);
   }
 
   /**

diff --git a/src/main/php/math/BigInt.class.php b/src/main/php/math/BigInt.class.php
@@ -81,34 +81,38 @@ public function multiply($other) {
    * @return  math.BigNum
    */
   public function divide($other) {
-    if ($other instanceof self) {
-      if (null === ($r= bcdiv($this->num, $other->num, 0))) {     // inlined
-        $e= key(\xp::$errors[__FILE__][__LINE__- 1]);
-        \xp::gc(__FILE__);
-        throw new IllegalArgumentException($e);
-      }
-      return new self($r);
-    } else if (is_int($other)) {
-      if (null === ($r= bcdiv($this->num, $other, 0))) {          // inlined
-        $e= key(\xp::$errors[__FILE__][__LINE__- 1]);
-        \xp::gc(__FILE__);
-        throw new IllegalArgumentException($e);
-      }
-      return new self($r);
-    } else if ($other instanceof BigFloat) {
-      if (null === ($r= bcdiv($this->num, $other->num))) {        // inlined
-        $e= key(\xp::$errors[__FILE__][__LINE__- 1]);
-        \xp::gc(__FILE__);
-        throw new IllegalArgumentException($e);
-      }
-      return new BigFloat($r);
-    } else {
-      if (null === ($r= bcdiv($this->num, $other))) {             // inlined
-        $e= key(\xp::$errors[__FILE__][__LINE__- 1]);
-        \xp::gc(__FILE__);
-        throw new IllegalArgumentException($e);
+    try {
+      if ($other instanceof self) {
+        if (null === ($r= bcdiv($this->num, $other->num, 0))) {     // inlined
+          $e= key(\xp::$errors[__FILE__][__LINE__- 1]);
+          \xp::gc(__FILE__);
+          throw new IllegalArgumentException($e);
+        }
+        return new self($r);
+      } else if (is_int($other)) {
+        if (null === ($r= bcdiv($this->num, $other, 0))) {          // inlined
+          $e= key(\xp::$errors[__FILE__][__LINE__- 1]);
+          \xp::gc(__FILE__);
+          throw new IllegalArgumentException($e);
+        }
+        return new self($r);
+      } else if ($other instanceof BigFloat) {
+        if (null === ($r= bcdiv($this->num, $other->num))) {        // inlined
+          $e= key(\xp::$errors[__FILE__][__LINE__- 1]);
+          \xp::gc(__FILE__);
+          throw new IllegalArgumentException($e);
+        }
+        return new BigFloat($r);
+      } else {
+        if (null === ($r= bcdiv($this->num, $other))) {             // inlined
+          $e= key(\xp::$errors[__FILE__][__LINE__- 1]);
+          \xp::gc(__FILE__);
+          throw new IllegalArgumentException($e);
+        }
+        return new BigFloat($r);
       }
-      return new BigFloat($r);
+    } catch (\Error $e) {  // PHP 8.0
+      throw new IllegalArgumentException($e->getMessage());
     }
   }
 
@@ -149,12 +153,16 @@ public function multiply0($other) {
    * @return  math.BigNum
    */
   public function divide0($other) {
-    if (null === ($r= bcdiv($this->num, $other instanceof self ? $other->num : $other, 0))) {
-      $e= key(\xp::$errors[__FILE__][__LINE__- 1]);
-      \xp::gc(__FILE__);
-      throw new IllegalArgumentException($e);
+    try {
+      if (null === ($r= bcdiv($this->num, $other instanceof self ? $other->num : $other, 0))) {
+        $e= key(\xp::$errors[__FILE__][__LINE__- 1]);
+        \xp::gc(__FILE__);
+        throw new IllegalArgumentException($e);
+      }
+      return new self($r);
+    } catch (\Error $e) {  // PHP 8.0
+      throw new IllegalArgumentException($e->getMessage());
     }
-    return new self($r);
   }
 
   /**
@@ -189,12 +197,16 @@ public function power($other) {
    * @return  math.BigNum
    */
   public function modulo($other) {
-    if (null === ($r= bcmod($this->num, $other instanceof self ? $other->num : $other))) {
-      $e= key(\xp::$errors[__FILE__][__LINE__- 1]);
-      \xp::gc(__FILE__);
-      throw new IllegalArgumentException($e);
+    try {
+      if (null === ($r= bcmod($this->num, $other instanceof self ? $other->num : $other))) {
+        $e= key(\xp::$errors[__FILE__][__LINE__- 1]);
+        \xp::gc(__FILE__);
+        throw new IllegalArgumentException($e);
+      }
+      return new $this($r);
+    } catch (\Error $e) {  // PHP 8.0
+      throw new IllegalArgumentException($e->getMessage());
     }
-    return new $this($r);
   }
 
   /**