Fix Psalm issues

brick · Dec 16, 2020 · 4f2b120 · 4f2b120
1 parent 5125249
commit 4f2b120
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="4.2.0@ccf6e2805f4c38655110f425c10ca79511f0bb0e">
-  <file src="src/Internal/Calculator/BcMathCalculator.php">
-    <InvalidNullableReturnType occurrences="3">
-      <code>string</code>
-      <code>string</code>
-      <code>string</code>
-    </InvalidNullableReturnType>
-    <InvalidReturnStatement occurrences="1">
-      <code>[$q, $r]</code>
-    </InvalidReturnStatement>
-    <InvalidReturnType occurrences="1">
-      <code>array</code>
-    </InvalidReturnType>
-    <NullableReturnStatement occurrences="3">
-      <code>\bcdiv($a, $b, 0)</code>
-      <code>\bcmod($a, $b)</code>
-      <code>\bcpowmod($base, $exp, $mod, 0)</code>
-    </NullableReturnStatement>
-  </file>
   <file src="src/Internal/Calculator/NativeCalculator.php">
     <InvalidOperand occurrences="6">
       <code>$a</code>

diff --git a/src/BigNumber.php b/src/BigNumber.php
@@ -185,10 +185,11 @@ private static function floatToString(float $float) : string
      * @return static
      *
      * @psalm-pure
+     * @psalm-suppress TooManyArguments
+     * @psalm-suppress UnsafeInstantiation
      */
     protected static function create(... $args) : BigNumber
     {
-        /** @psalm-suppress TooManyArguments */
         return new static(... $args);
     }
 

diff --git a/src/Internal/Calculator/BcMathCalculator.php b/src/Internal/Calculator/BcMathCalculator.php
@@ -41,6 +41,9 @@ public function mul(string $a, string $b) : string
 
     /**
      * {@inheritdoc}
+     *
+     * @psalm-suppress InvalidNullableReturnType
+     * @psalm-suppress NullableReturnStatement
      */
     public function divQ(string $a, string $b) : string
     {
@@ -49,6 +52,9 @@ public function divQ(string $a, string $b) : string
 
     /**
      * {@inheritdoc}
+     *
+     * @psalm-suppress InvalidNullableReturnType
+     * @psalm-suppress NullableReturnStatement
      */
     public function divR(string $a, string $b) : string
     {
@@ -63,6 +69,9 @@ public function divQR(string $a, string $b) : array
         $q = \bcdiv($a, $b, 0);
         $r = \bcmod($a, $b);
 
+        assert($q !== null);
+        assert($r !== null);
+
         return [$q, $r];
     }
 
@@ -76,6 +85,9 @@ public function pow(string $a, int $e) : string
 
     /**
      * {@inheritdoc}
+     *
+     * @psalm-suppress InvalidNullableReturnType
+     * @psalm-suppress NullableReturnStatement
      */
     public function modPow(string $base, string $exp, string $mod) : string
     {