Merge pull request #2 from jstoone/feature/#1-big-int-calculations

Change how big integers are calculated
Rackbeat · Aug 10, 2018 · 350fa2f · 350fa2f
2 parents 20f0088 + 9006595
commit 350fa2f
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 36 deletions.
diff --git a/composer.json b/composer.json
@@ -27,6 +27,7 @@
 	],
 	"require": {
 		"php": ">=7.1",
+		"ext-bcmath": "*",
 		"illuminate/contracts": "^5.5|^5.6",
 		"illuminate/support": "^5.5|^5.6",
 		"illuminate/validation": "^5.5|^5.6"

diff --git a/src/BigInteger.php b/src/BigInteger.php
@@ -2,25 +2,41 @@
 
 class BigInteger extends BaseMysqlIntegerRule
 {
-	/**
-	 * @return int
-	 */
-	protected function min() {
-		if ( $this->unsigned ) {
-			return 0;
-		}
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param  string $attribute
+     * @param  mixed  $value
+     *
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        return bccomp($value, $this->min) >= 0
+            && bccomp($value, $this->max) <= 0;
+    }
 
-		return -2 ^ 63;
-	}
+    /**
+     * @return int
+     */
+    protected function min()
+    {
+        if ($this->unsigned) {
+            return 0;
+        }
 
-	/**
-	 * @return int
-	 */
-	protected function max() {
-		if ( $this->unsigned ) {
-			return 2 ^ 64 - 1;
-		}
+        return bcpow(-2, 63);
+    }
 
-		return 2 ^ 63 - 1;
-	}
+    /**
+     * @return int
+     */
+    protected function max()
+    {
+        if ($this->unsigned) {
+            return bcsub(bcpow(2, 64), 1);
+        }
+
+        return bcsub(bcpow(2, 63), 1);
+    }
 }
diff --git a/tests/BigIntegerValidationTest.php b/tests/BigIntegerValidationTest.php
@@ -4,27 +4,32 @@
 
 class BigIntegerValidationTest extends TestCase
 {
-	/** @test */
-	public function can_validate_signed_big_integers() {
-		$rule = new \Rackbeat\Rules\BigInteger( false );
+    /** @test */
+    public function can_validate_signed_big_integers()
+    {
+        $rule = new \Rackbeat\Rules\BigInteger(false);
+        $min = '-9223372036854775808';
+        $max = '9223372036854775807';
 
-		$this->assertTrue( $rule->passes( 'number', 0 ) );
-		$this->assertTrue( $rule->passes( 'number', -2 ^ 63 ) );
-		$this->assertTrue( $rule->passes( 'number', 2 ^ 63 - 1 ) );
+        $this->assertTrue($rule->passes('number', 0));
+        $this->assertTrue($rule->passes('number', $min));
+        $this->assertTrue($rule->passes('number', $max));
 
-		$this->assertFalse( $rule->passes( 'number', -5000000000000000000 ) );
-		$this->assertFalse( $rule->passes( 'number', 50000000000000000000 ) );
-	}
+        $this->assertFalse($rule->passes('number', bcsub($min, 1)));
+        $this->assertFalse($rule->passes('number', bcadd($max, 1)));
+    }
 
-	/** @test */
-	public function can_validate_unsigned_big_integers() {
-		$rule = new \Rackbeat\Rules\BigInteger( true );
+    /** @test */
+    public function can_validate_unsigned_big_integers()
+    {
+        $rule = new \Rackbeat\Rules\BigInteger(true);
+        $min = 0;
+        $max = '18446744073709551615';
 
-		$this->assertTrue( $rule->passes( 'number', 0 ) );
-		$this->assertTrue( $rule->passes( 'number', 2 ^ 64 - 1 ) );
+        $this->assertTrue($rule->passes('number', $min));
+        $this->assertTrue($rule->passes('number', $max));
 
-		$this->assertFalse( $rule->passes( 'number', -2147483648 ) );
-		$this->assertFalse( $rule->passes( 'number', -50000000000000000000 ) );
-		$this->assertFalse( $rule->passes( 'number', 50000000000000000000 ) );
-	}
+        $this->assertFalse($rule->passes('number', $min - 1));
+        $this->assertFalse($rule->passes('number', bcadd($max, 1)));
+    }
 }