Merge branch '2.2.x' into 2.3.x

* 2.2.x:
  Fix handling of upserts during scheduling for deletion (doctrine#2334)
  Fix wrong handling for nullable fields in upsert and update (doctrine#2318)
  [2.2] Fix builds (doctrine#2319)
  Allow mixed value in $not operator (doctrine#2307)
  Fix errors with nullable typed associations (doctrine#2302)
  Fix using null values in partial filter expressions (doctrine#2300)
  Fix preparation of $elemMatch operators in queries (doctrine#2298)
  Fix query preparation when in elemMatch (doctrine#2299)
  Fix mapping of the nullable option for XML driver
  Fix documentation for uploadFromFile
  Correctly handle write concern specified in defaultCommitOptions (doctrine#2294)
  Fix invalid strict comparison when validating mappings
  Update storage-strategies.rst
  Update working-with-objects.rst
  Test serialization of lock/version fields
  Fix locking when ClassMetadata is unserialized

.github/workflows/coding-standards.yml

@@ -50,6 +50,11 @@ jobs:
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
 
+      - name: "Upload composer.lock as build artifact"
+        uses: actions/upload-artifact@v2
+        with:
+          name: composer.lock
+          path: composer.lock
 
       # https://github.com/doctrine/.github/issues/3
       - name: "Run PHP_CodeSniffer"

.github/workflows/continuous-integration.yml

@@ -12,12 +12,10 @@ env:
 jobs:
   phpunit:
     name: "PHPUnit"
-    runs-on: "${{ matrix.os }}"
+    runs-on: "ubuntu-18.04"
 
     strategy:
       matrix:
-        os:
-          - "ubuntu-18.04"
         php-version:
           - "7.2"
           - "7.3"
@@ -35,13 +33,11 @@ jobs:
           - "highest"
         include:
           - deps: "lowest"
-            os: "ubuntu-16.04"
             php-version: "7.2"
             mongodb-version: "3.6"
             driver-version: "1.5.0"
             topology: "server"
           - topology: "sharded_cluster"
-            os: "ubuntu-18.04"
             php-version: "8.0"
             mongodb-version: "4.4"
             driver-version: "stable"
@@ -86,6 +82,12 @@ jobs:
           dependency-versions: "${{ matrix.dependencies }}"
           composer-options: "--prefer-dist"
 
+      - name: "Upload composer.lock as build artifact"
+        uses: actions/upload-artifact@v2
+        with:
+          name: composer.lock
+          path: composer.lock
+
       - id: setup-mongodb
         uses: mongodb-labs/drivers-evergreen-tools@master
         with:

.github/workflows/performance.yml

@@ -54,6 +54,12 @@ jobs:
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
 
+      - name: "Upload composer.lock as build artifact"
+        uses: actions/upload-artifact@v2
+        with:
+          name: composer.lock
+          path: composer.lock
+
       # https://github.com/doctrine/.github/issues/3
       - name: "Run PHP_CodeSniffer"
         run: "vendor/bin/phpbench run --report=default --revs=100 --iterations=5 --report=aggregate"

.github/workflows/static-analysis.yml

@@ -49,6 +49,12 @@ jobs:
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
 
+      - name: "Upload composer.lock as build artifact"
+        uses: actions/upload-artifact@v2
+        with:
+          name: composer.lock
+          path: composer.lock
+
       - name: "Run a static analysis with phpstan/phpstan"
         run: "vendor/bin/phpstan analyse --error-format=github"
 
@@ -75,5 +81,11 @@ jobs:
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
 
+      - name: "Upload composer.lock as build artifact"
+        uses: actions/upload-artifact@v2
+        with:
+          name: composer.lock
+          path: composer.lock
+
       - name: "Run a static analysis with vimeo/psalm"
         run: "vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --php-version=${{ matrix.php-version }}"

lib/Doctrine/ODM/MongoDB/Persisters/PersistenceBuilder.php

@@ -68,14 +68,11 @@ public function prepareInsertData($document)
         foreach ($class->fieldMappings as $mapping) {
             $new = $changeset[$mapping['fieldName']][1] ?? null;
 
-            if ($new === null && $mapping['nullable']) {
-                $insertData[$mapping['name']] = null;
-            }
-
-            /* Nothing more to do for null values, since we're either storing
-             * them (if nullable was true) or not.
-             */
             if ($new === null) {
+                if ($mapping['nullable']) {
+                    $insertData[$mapping['name']] = null;
+                }
+
                 continue;
             }
 
@@ -143,34 +140,36 @@ public function prepareUpdateData($document)
 
             [$old, $new] = $change;
 
+            if ($new === null) {
+                if ($mapping['nullable'] === true) {
+                    $updateData['$set'][$mapping['name']] = null;
+                } else {
+                    $updateData['$unset'][$mapping['name']] = true;
+                }
+
+                continue;
+            }
+
             // Scalar fields
             if (! isset($mapping['association'])) {
-                if ($new === null && $mapping['nullable'] !== true) {
-                    $updateData['$unset'][$mapping['name']] = true;
+                if (isset($mapping['strategy']) && $mapping['strategy'] === ClassMetadata::STORAGE_STRATEGY_INCREMENT) {
+                    $operator = '$inc';
+                    $type     = Type::getType($mapping['type']);
+                    assert($type instanceof Incrementable);
+                    $value = $type->convertToDatabaseValue($type->diff($old, $new));
                 } else {
-                    if ($new !== null && isset($mapping['strategy']) && $mapping['strategy'] === ClassMetadata::STORAGE_STRATEGY_INCREMENT) {
-                        $operator = '$inc';
-                        $type     = Type::getType($mapping['type']);
-                        assert($type instanceof Incrementable);
-                        $value = $type->convertToDatabaseValue($type->diff($old, $new));
-                    } else {
-                        $operator = '$set';
-                        $value    = $new === null ? null : Type::getType($mapping['type'])->convertToDatabaseValue($new);
-                    }
-
-                    $updateData[$operator][$mapping['name']] = $value;
+                    $operator = '$set';
+                    $value    = Type::getType($mapping['type'])->convertToDatabaseValue($new);
                 }
 
+                $updateData[$operator][$mapping['name']] = $value;
+
             // @EmbedOne
             } elseif (isset($mapping['association']) && $mapping['association'] === ClassMetadata::EMBED_ONE) {
                 // If we have a new embedded document then lets set the whole thing
-                if ($new && $this->uow->isScheduledForInsert($new)) {
+                if ($this->uow->isScheduledForInsert($new)) {
                     $updateData['$set'][$mapping['name']] = $this->prepareEmbeddedDocumentValue($mapping, $new);
 
-                // If we don't have a new value then lets unset the embedded document
-                } elseif (! $new) {
-                    $updateData['$unset'][$mapping['name']] = true;
-
                 // Update existing embedded document
                 } else {
                     $update = $this->prepareUpdateData($new);
@@ -182,7 +181,7 @@ public function prepareUpdateData($document)
                 }
 
             // @ReferenceMany, @EmbedMany
-            } elseif (isset($mapping['association']) && $mapping['type'] === 'many' && $new) {
+            } elseif (isset($mapping['association']) && $mapping['type'] === 'many') {
                 if (CollectionHelper::isAtomic($mapping['strategy']) && $this->uow->isCollectionScheduledForUpdate($new)) {
                     $updateData['$set'][$mapping['name']] = $this->prepareAssociatedCollectionValue($new, true);
                 } elseif (CollectionHelper::isAtomic($mapping['strategy']) && $this->uow->isCollectionScheduledForDeletion($new)) {
@@ -208,11 +207,7 @@ public function prepareUpdateData($document)
 
             // @ReferenceOne
             } elseif (isset($mapping['association']) && $mapping['association'] === ClassMetadata::REFERENCE_ONE) {
-                if (isset($new) || $mapping['nullable'] === true) {
-                    $updateData['$set'][$mapping['name']] = $new === null ? null : $this->prepareReferencedDocumentValue($mapping, $new);
-                } else {
-                    $updateData['$unset'][$mapping['name']] = true;
-                }
+                $updateData['$set'][$mapping['name']] = $this->prepareReferencedDocumentValue($mapping, $new);
             }
         }
 
@@ -250,31 +245,36 @@ public function prepareUpsertData($document)
 
             [$old, $new] = $change;
 
+            // Fields with a null value should only be written for inserts
+            if ($new === null) {
+                if ($mapping['nullable'] === true) {
+                    $updateData['$setOnInsert'][$mapping['name']] = null;
+                }
+
+                continue;
+            }
+
             // Scalar fields
             if (! isset($mapping['association'])) {
-                if ($new !== null) {
-                    if (empty($mapping['id']) && isset($mapping['strategy']) && $mapping['strategy'] === ClassMetadata::STORAGE_STRATEGY_INCREMENT) {
-                        $operator = '$inc';
-                        $type     = Type::getType($mapping['type']);
-                        assert($type instanceof Incrementable);
-                        $value = $type->convertToDatabaseValue($type->diff($old, $new));
-                    } else {
-                        $operator = '$set';
-                        $value    = Type::getType($mapping['type'])->convertToDatabaseValue($new);
-                    }
-
-                    $updateData[$operator][$mapping['name']] = $value;
-                } elseif ($mapping['nullable'] === true) {
-                    $updateData['$setOnInsert'][$mapping['name']] = null;
+                if (empty($mapping['id']) && isset($mapping['strategy']) && $mapping['strategy'] === ClassMetadata::STORAGE_STRATEGY_INCREMENT) {
+                    $operator = '$inc';
+                    $type     = Type::getType($mapping['type']);
+                    assert($type instanceof Incrementable);
+                    $value = $type->convertToDatabaseValue($type->diff($old, $new));
+                } else {
+                    $operator = '$set';
+                    $value    = Type::getType($mapping['type'])->convertToDatabaseValue($new);
                 }
 
+                $updateData[$operator][$mapping['name']] = $value;
+
             // @EmbedOne
             } elseif (isset($mapping['association']) && $mapping['association'] === ClassMetadata::EMBED_ONE) {
                 // If we don't have a new value then do nothing on upsert
                 // If we have a new embedded document then lets set the whole thing
-                if ($new && $this->uow->isScheduledForInsert($new)) {
+                if ($this->uow->isScheduledForInsert($new)) {
                     $updateData['$set'][$mapping['name']] = $this->prepareEmbeddedDocumentValue($mapping, $new);
-                } elseif ($new) {
+                } else {
                     // Update existing embedded document
                     $update = $this->prepareUpsertData($new);
                     foreach ($update as $cmd => $values) {
@@ -286,9 +286,7 @@ public function prepareUpsertData($document)
 
             // @ReferenceOne
             } elseif (isset($mapping['association']) && $mapping['association'] === ClassMetadata::REFERENCE_ONE) {
-                if (isset($new) || $mapping['nullable'] === true) {
-                    $updateData['$set'][$mapping['name']] = $new === null ? null : $this->prepareReferencedDocumentValue($mapping, $new);
-                }
+                $updateData['$set'][$mapping['name']] = $this->prepareReferencedDocumentValue($mapping, $new);
 
             // @ReferenceMany, @EmbedMany
             } elseif (

lib/Doctrine/ODM/MongoDB/Query/Builder.php

@@ -1028,11 +1028,11 @@ public function nearSphere($x, $y = null): self
      * @see Expr::not()
      * @see https://docs.mongodb.com/manual/reference/operator/not/
      *
-     * @param array|Expr $expression
+     * @param array|Expr|mixed $valueOrExpression
      */
-    public function not($expression): self
+    public function not($valueOrExpression): self
     {
-        $this->expr->not($expression);
+        $this->expr->not($valueOrExpression);
 
         return $this;
     }

lib/Doctrine/ODM/MongoDB/Query/Expr.php

@@ -861,11 +861,11 @@ public function nearSphere($x, $y = null): self
      * @see Builder::not()
      * @see https://docs.mongodb.com/manual/reference/operator/not/
      *
-     * @param array|Expr $expression
+     * @param array|Expr|mixed $valueOrExpression
      */
-    public function not($expression): self
+    public function not($valueOrExpression): self
     {
-        return $this->operator('$not', $expression);
+        return $this->operator('$not', $valueOrExpression);
     }
 
     /**

lib/Doctrine/ODM/MongoDB/UnitOfWork.php

@@ -1459,6 +1459,10 @@ public function scheduleForDelete(object $document, bool $isView = false): void
             unset($this->documentUpdates[$oid]);
         }
 
+        if (isset($this->documentUpserts[$oid])) {
+            unset($this->documentUpserts[$oid]);
+        }
+
         if (isset($this->documentDeletions[$oid])) {
             return;
         }