Commaaa2

vendor/brick/math/src/Internal/Calculator.php

@@ -25,7 +25,7 @@ abstract class Calculator
     /**
      * The maximum exponent value allowed for the pow() method.
      */
-    public const MAX_POWER = 1000000;
+    public const MAX_POWER = 1_000_000;
 
     /**
      * The alphabet for converting from and to base 2 to 36, lowercase.
@@ -128,7 +128,9 @@ abstract class Calculator
     /**
      * Compares two numbers.
      *
-     * @return int [-1, 0, 1] If the first number is less than, equal to, or greater than the second number.
+     * @psalm-return -1|0|1
+     *
+     * @return int -1 if the first number is less than, 0 if equal to, 1 if greater than the second number.
      */
     final public function cmp(string $a, string $b) : int
     {
@@ -428,16 +430,16 @@ abstract class Calculator
      *
      * Rounding is performed when the remainder of the division is not zero.
      *
-     * @param string $a            The dividend.
-     * @param string $b            The divisor, must not be zero.
-     * @param int    $roundingMode The rounding mode.
+     * @param string       $a            The dividend.
+     * @param string       $b            The divisor, must not be zero.
+     * @param RoundingMode $roundingMode The rounding mode.
      *
      * @throws \InvalidArgumentException  If the rounding mode is invalid.
      * @throws RoundingNecessaryException If RoundingMode::UNNECESSARY is provided but rounding is necessary.
      *
      * @psalm-suppress ImpureFunctionCall
      */
-    final public function divRound(string $a, string $b, int $roundingMode) : string
+    final public function divRound(string $a, string $b, RoundingMode $roundingMode) : string
     {
         [$quotient, $remainder] = $this->divQR($a, $b);
 
@@ -571,27 +573,17 @@ abstract class Calculator
             $bBin = $this->twosComplement($bBin);
         }
 
-        switch ($operator) {
-            case 'and':
-                $value = $aBin & $bBin;
-                $negative = ($aNeg and $bNeg);
-                break;
+        $value = match ($operator) {
+            'and' => $aBin & $bBin,
+            'or' => $aBin | $bBin,
+            'xor' => $aBin ^ $bBin,
+        };
 
-            case 'or':
-                $value = $aBin | $bBin;
-                $negative = ($aNeg or $bNeg);
-                break;
-
-            case 'xor':
-                $value = $aBin ^ $bBin;
-                $negative = ($aNeg xor $bNeg);
-                break;
-
-            // @codeCoverageIgnoreStart
-            default:
-                throw new \InvalidArgumentException('Invalid bitwise operator.');
-            // @codeCoverageIgnoreEnd
-        }
+        $negative = match ($operator) {
+            'and' => $aNeg and $bNeg,
+            'or' => $aNeg or $bNeg,
+            'xor' => $aNeg xor $bNeg,
+        };
 
         if ($negative) {
             $value = $this->twosComplement($value);

vendor/brick/math/src/Internal/Calculator/BcMathCalculator.php

@@ -35,10 +35,6 @@ class BcMathCalculator extends Calculator
         return \bcdiv($a, $b, 0);
     }
 
-    /**
-     * @psalm-suppress InvalidNullableReturnType
-     * @psalm-suppress NullableReturnStatement
-     */
     public function divR(string $a, string $b) : string
     {
         return \bcmod($a, $b, 0);
@@ -49,8 +45,6 @@ class BcMathCalculator extends Calculator
         $q = \bcdiv($a, $b, 0);
         $r = \bcmod($a, $b, 0);
 
-        assert($r !== null);
-
         return [$q, $r];
     }
 
@@ -64,10 +58,6 @@ class BcMathCalculator extends Calculator
         return \bcpowmod($base, $exp, $mod, 0);
     }
 
-    /**
-     * @psalm-suppress InvalidNullableReturnType
-     * @psalm-suppress NullableReturnStatement
-     */
     public function sqrt(string $n) : string
     {
         return \bcsqrt($n, 0);

vendor/brick/math/src/Internal/Calculator/NativeCalculator.php

@@ -23,25 +23,18 @@ class NativeCalculator extends Calculator
      * Example: 32-bit: max number 1,999,999,999 (9 digits + carry)
      *          64-bit: max number 1,999,999,999,999,999,999 (18 digits + carry)
      */
-    private int $maxDigits;
+    private readonly int $maxDigits;
 
     /**
      * @codeCoverageIgnore
      */
     public function __construct()
     {
-        switch (PHP_INT_SIZE) {
-            case 4:
-                $this->maxDigits = 9;
-                break;
-
-            case 8:
-                $this->maxDigits = 18;
-                break;
-
-            default:
-                throw new \RuntimeException('The platform is not 32-bit or 64-bit as expected.');
-        }
+        $this->maxDigits = match (PHP_INT_SIZE) {
+            4 => 9,
+            8 => 18,
+            default => throw new \RuntimeException('The platform is not 32-bit or 64-bit as expected.')
+        };
     }
 
     public function add(string $a, string $b) : string
@@ -161,10 +154,8 @@ class NativeCalculator extends Calculator
             if (is_int($nb)) {
                 // the only division that may overflow is PHP_INT_MIN / -1,
                 // which cannot happen here as we've already handled a divisor of -1 above.
+                $q = intdiv($na, $nb);
                 $r = $na % $nb;
-                $q = ($na - $r) / $nb;
-
-                assert(is_int($q));
 
                 return [
                     (string) $q,
@@ -536,7 +527,7 @@ class NativeCalculator extends Calculator
     /**
      * Compares two non-signed large numbers.
      *
-     * @return int [-1, 0, 1]
+     * @psalm-return -1|0|1
      */
     private function doCmp(string $a, string $b) : int
     {
@@ -549,7 +540,7 @@ class NativeCalculator extends Calculator
             return $cmp;
         }
 
-        return \strcmp($a, $b) <=> 0; // enforce [-1, 0, 1]
+        return \strcmp($a, $b) <=> 0; // enforce -1|0|1
     }
 
     /**