PHPLIB-1001: Support "number" alias in IsBsonType constraint

Also revises instantiation of deprecated BSON types and fixes an assertion message.

Author: jmikola

tests/UnifiedSpecTests/Constraint/IsBsonType.php

@@ -67,6 +67,7 @@ final class IsBsonType extends Constraint
         'decimal',
         'minKey',
         'maxKey',
+        'number',
     ];
 
     /** @var string */
@@ -167,6 +168,9 @@ private function doMatches($other): bool
             case 'maxKey':
                 return $other instanceof MaxKeyInterface;
 
+            case 'number':
+                return is_int($other) || (PHP_INT_SIZE == 4 && $other instanceof Int64) || is_float($other) || $other instanceof Decimal128Interface;
+
             default:
                 // This should already have been caught in the constructor
                 throw new LogicException('Unsupported type: ' . $this->type);

tests/UnifiedSpecTests/Constraint/IsBsonTypeTest.php

@@ -38,9 +38,10 @@ public function testConstraint($type, $value): void
 
     public function provideTypes()
     {
-        $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;
+        $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],
@@ -52,22 +53,26 @@ public function provideTypes()
             'array(indexed array)' => ['array', ['foo']],
             'array(BSONArray)' => ['array', new BSONArray()],
             'binData' => ['binData', new Binary('', 0)],
-            'undefined' => ['undefined', $undefined->undefined],
+            'undefined' => ['undefined', $undefined],
             'objectId' => ['objectId', new ObjectId()],
             'bool' => ['bool', 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],
             'javascriptWithScope' => ['javascriptWithScope', new Javascript('foo = 1;', ['x' => 1])],
             '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' => ['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(long)' => ['number', $long],
         ];
     }
 
@@ -89,10 +94,20 @@ public function testAnyOf(): void
         $c = IsBsonType::anyOf('double', 'int');
 
         $this->assertResult(true, $c, 1, 'int is double or int');
-        $this->assertResult(true, $c, 1.4, 'int is double or int');
+        $this->assertResult(true, $c, 1.4, 'double is double or int');
         $this->assertResult(false, $c, 'foo', 'string is not double or int');
     }
 
+    public function testAnyOfWithNumberAlias(): void
+    {
+        $c = IsBsonType::anyOf('number', 'string');
+
+        $this->assertResult(true, $c, 1, 'int is number or string');
+        $this->assertResult(true, $c, 1.4, 'double is number or string');
+        $this->assertResult(true, $c, 'foo', 'string is number or string');
+        $this->assertResult(false, $c, true, 'bool is not number or string');
+    }
+
     public function testErrorMessage(): void
     {
         $c = new IsBsonType('string');