PHPLIB-1010: Relax acceptance of Int64 for $$type operators

Author: jmikola

tests/SpecTests/DocumentsMatchConstraint.php

@@ -246,11 +246,10 @@ private function assertBSONType(string $expectedType, $actualValue): void
                 return;
 
             case 'long':
-                if (PHP_INT_SIZE == 4) {
-                    (new IsInstanceOf(Int64::class))->evaluate($actualValue);
-                } else {
-                    (new IsType('int'))->evaluate($actualValue);
-                }
+                LogicalOr::fromConstraints(
+                    new IsType('int'),
+                    new IsInstanceOf(Int64::class)
+                )->evaluate($actualValue);
 
                 return;
 

tests/SpecTests/DocumentsMatchConstraintTest.php

@@ -84,28 +84,31 @@ public function testBSONTypeAssertions($type, $value): void
 
     public function provideBSONTypes()
     {
-        $undefined = toPHP(fromJSON('{ "undefined": {"$undefined": true} }'));
-        $symbol = toPHP(fromJSON('{ "symbol": {"$symbol": "test"} }'));
-        $dbPointer = toPHP(fromJSON('{ "dbPointer": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b405ac12" }  }} }'));
+        $undefined = toPHP(fromJSON('{ "x": {"$undefined": true} }'))->x;
+        $symbol = toPHP(fromJSON('{ "x": {"$symbol": "test"} }'))->x;
+        $dbPointer = toPHP(fromJSON('{ "x": {"$dbPointer": {"$ref": "db.coll", "$id" : { "$oid" : "5a2e78accd485d55b405ac12" }  }} }'))->x;
+        $int64 = unserialize('C:18:"MongoDB\BSON\Int64":28:{a:1:{s:7:"integer";s:1:"1";}}');
+        $long = PHP_INT_SIZE == 4 ? unserialize('C:18:"MongoDB\BSON\Int64":38:{a:1:{s:7:"integer";s:10:"4294967296";}}') : 4294967296;
 
         return [
             'double' => ['double', 1.4],
             'string' => ['string', 'foo'],
             'object' => ['object', new BSONDocument()],
             'array' => ['array', ['foo']],
             'binData' => ['binData', new Binary('', 0)],
-            'undefined' => ['undefined', $undefined->undefined],
+            'undefined' => ['undefined', $undefined],
             'objectId' => ['objectId', new ObjectId()],
             'boolean' => ['boolean', true],
             'date' => ['date', new UTCDateTime()],
             'null' => ['null', null],
             'regex' => ['regex', new Regex('.*')],
-            'dbPointer' => ['dbPointer', $dbPointer->dbPointer],
+            'dbPointer' => ['dbPointer', $dbPointer],
             'javascript' => ['javascript', new Javascript('foo = 1;')],
-            'symbol' => ['symbol', $symbol->symbol],
+            'symbol' => ['symbol', $symbol],
             'int' => ['int', 1],
             'timestamp' => ['timestamp', new Timestamp(0, 0)],
-            'long' => ['long', PHP_INT_SIZE == 4 ? unserialize('C:18:"MongoDB\BSON\Int64":38:{a:1:{s:7:"integer";s:10:"4294967296";}}') : 4294967296],
+            'long(int64)' => ['long', $int64],
+            'long(long)' => ['long', $long],
             'decimal' => ['decimal', new Decimal128('18446744073709551616')],
             'minKey' => ['minKey', new MinKey()],
             'maxKey' => ['maxKey', new MaxKey()],

tests/UnifiedSpecTests/Constraint/IsBsonType.php

@@ -38,8 +38,6 @@
 use function range;
 use function sprintf;
 
-use const PHP_INT_SIZE;
-
 final class IsBsonType extends Constraint
 {
     use ConstraintTrait;
@@ -153,11 +151,7 @@ private function doMatches($other): bool
                 return $other instanceof TimestampInterface;
 
             case 'long':
-                if (PHP_INT_SIZE == 4) {
-                    return $other instanceof Int64;
-                }
-
-                return is_int($other);
+                return is_int($other) || $other instanceof Int64;
 
             case 'decimal':
                 return $other instanceof Decimal128Interface;
@@ -169,7 +163,7 @@ private function doMatches($other): bool
                 return $other instanceof MaxKeyInterface;
 
             case 'number':
-                return is_int($other) || (PHP_INT_SIZE == 4 && $other instanceof Int64) || is_float($other) || $other instanceof Decimal128Interface;
+                return is_int($other) || $other instanceof Int64 || is_float($other) || $other instanceof Decimal128Interface;
 
             default:
                 // This should already have been caught in the constructor

tests/UnifiedSpecTests/Constraint/IsBsonTypeTest.php

@@ -41,6 +41,7 @@ public function provideTypes()
         $undefined = toPHP(fromJSON('{ "x": {"$undefined": true} }'))->x;
         $symbol = toPHP(fromJSON('{ "x": {"$symbol": "test"} }'))->x;
         $dbPointer = toPHP(fromJSON('{ "x": {"$dbPointer": {"$ref": "db.coll", "$id" : { "$oid" : "5a2e78accd485d55b405ac12" }  }} }'))->x;
+        $int64 = unserialize('C:18:"MongoDB\BSON\Int64":28:{a:1:{s:7:"integer";s:1:"1";}}');
         $long = PHP_INT_SIZE == 4 ? unserialize('C:18:"MongoDB\BSON\Int64":38:{a:1:{s:7:"integer";s:10:"4294967296";}}') : 4294967296;
 
         return [
@@ -65,13 +66,15 @@ public function provideTypes()
             'javascriptWithScope' => ['javascriptWithScope', new Javascript('foo = 1;', ['x' => 1])],
             'int' => ['int', 1],
             'timestamp' => ['timestamp', new Timestamp(0, 0)],
-            'long' => ['long', $long],
+            'long(int64)' => ['long', $int64],
+            'long(long)' => ['long', $long],
             'decimal' => ['decimal', new Decimal128('18446744073709551616')],
             'minKey' => ['minKey', new MinKey()],
             'maxKey' => ['maxKey', new MaxKey()],
             'number(double)' => ['number', 1.4],
             'number(decimal)' => ['number', new Decimal128('18446744073709551616')],
             'number(int)' => ['number', 1],
+            'number(int64)' => ['number', $int64],
             'number(long)' => ['number', $long],
         ];
     }