Merge v1.x into v2.x

.evergreen/config/templates/build/build-extension.yml

@@ -5,6 +5,9 @@
         vars:
           PHP_VERSION: "%phpVersion%"
       - func: "compile extension"
+        # TODO: remove once 1.21.0 is released
+        vars:
+          EXTENSION_BRANCH: "v1.x"
       - func: "upload extension"
   - name: "build-php-%phpVersion%-lowest"
     tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"]
@@ -14,7 +17,9 @@
           PHP_VERSION: "%phpVersion%"
       - func: "compile extension"
         vars:
-          EXTENSION_VERSION: "1.20.0"
+          # TODO: change to "EXTENSION_VERSION: 1.21.0" once 1.21.0 is released
+          # EXTENSION_VERSION: "1.21.0"
+          EXTENSION_BRANCH: "v1.x"
       - func: "upload extension"
   - name: "build-php-%phpVersion%-next-stable"
     tags: ["build", "php%phpVersion%", "next-stable", "pr", "tag"]
@@ -24,7 +29,9 @@
           PHP_VERSION: "%phpVersion%"
       - func: "compile extension"
         vars:
-          EXTENSION_BRANCH: "v1.20"
+          # TODO: change to "v1.21" once 1.21.0 is released
+          # EXTENSION_BRANCH: "v1.21"
+          EXTENSION_BRANCH: "v1.x"
       - func: "upload extension"
   - name: "build-php-%phpVersion%-next-minor"
     tags: ["build", "php%phpVersion%", "next-minor"]

.github/workflows/coding-standards.yml

@@ -13,7 +13,9 @@ on:
 
 env:
   PHP_VERSION: "8.2"
-  DRIVER_VERSION: "stable"
+  # TODO: change to "stable" once 1.21.0 is released
+  # DRIVER_VERSION: "stable"
+  DRIVER_VERSION: "mongodb/[email protected]"
 
 jobs:
   phpcs:

.github/workflows/generator.yml

@@ -13,9 +13,9 @@ on:
 
 env:
   PHP_VERSION: "8.2"
-  # TODO: change to "stable" once 1.20.0 is released
+  # TODO: change to "stable" once 1.21.0 is released
   # DRIVER_VERSION: "stable"
-  DRIVER_VERSION: "mongodb/mongo-php-driver@v1.20"
+  DRIVER_VERSION: "mongodb/mongo-php-driver@v1.x"
 
 jobs:
   psalm:

.github/workflows/static-analysis.yml

@@ -19,7 +19,9 @@ on:
 
 env:
   PHP_VERSION: "8.2"
-  DRIVER_VERSION: "stable"
+  # TODO: change to "stable" once 1.21.0 is released
+  # DRIVER_VERSION: "stable"
+  DRIVER_VERSION: "mongodb/[email protected]"
 
 jobs:
   psalm:

.github/workflows/tests.yml

@@ -12,7 +12,9 @@ on:
       - "feature/*"
 
 env:
-  DRIVER_VERSION: "stable"
+  # TODO: change to "stable" once 1.21.0 is released
+  # DRIVER_VERSION: "stable"
+  DRIVER_VERSION: "mongodb/[email protected]"
 
 jobs:
   phpunit:

composer.json

@@ -13,7 +13,7 @@
         "php": "^8.1",
         "ext-hash": "*",
         "ext-json": "*",
-        "ext-mongodb": "^1.20.0",
+        "ext-mongodb": "^1.21.0",
         "composer-runtime-api": "^2.0",
         "psr/log": "^1.1.4|^2|^3",
         "symfony/polyfill-php80": "^1.27",

generator/config/expressions.php

@@ -6,6 +6,7 @@
 
 namespace MongoDB\Builder\Expression;
 
+use DateTimeInterface;
 use MongoDB\BSON;
 use MongoDB\Builder\Pipeline;
 use MongoDB\Builder\Type;
@@ -26,7 +27,7 @@
     'binData' => ['string', BSON\Binary::class],
     'objectId' => [BSON\ObjectId::class],
     'bool' => ['bool'],
-    'date' => [BSON\UTCDateTime::class],
+    'date' => [BSON\UTCDateTime::class, DateTimeInterface::class],
     'null' => ['null'],
     'regex' => [BSON\Regex::class],
     'javascript' => ['string', BSON\Javascript::class],
@@ -37,7 +38,7 @@
 ];
 
 // "any" accepts all the BSON types. No generic "object" or "mixed"
-$bsonTypes['any'] = ['bool', 'int', 'float', 'string', 'array', 'null', stdClass::class, BSON\Type::class];
+$bsonTypes['any'] = ['bool', 'int', 'float', 'string', 'array', 'null', stdClass::class, BSON\Type::class, DateTimeInterface::class];
 
 // "number" accepts all the numeric types
 $bsonTypes['number'] = ['int', 'float', BSON\Int64::class, BSON\Decimal128::class];

psalm-baseline.xml

@@ -248,6 +248,8 @@
       <code><![CDATA[($value is NativeType ? BSONType : $value)]]></code>
       <code><![CDATA[($value is NativeType ? BSONType : $value)]]></code>
       <code><![CDATA[($value is NativeType ? BSONType : $value)]]></code>
+      <code><![CDATA[($value is NativeType ? BSONType : $value)]]></code>
+      <code><![CDATA[($value is NativeType ? BSONType : $value)]]></code>
     </InvalidReturnType>
     <MixedArgumentTypeCoercion>
       <code><![CDATA[$value]]></code>