Merge branch '2.16.x' of github.com:doctrine/mongodb-odm into 2.16.x-merge-up-to-3.0.x

Author: IonBazan

.github/workflows/atlas-ci.yml

@@ -48,7 +48,7 @@ jobs:
           key: "extcache-v1"
 
       - name: Cache extensions
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.extcache.outputs.dir }}
           key: ${{ steps.extcache.outputs.key }}

.github/workflows/continuous-integration.yml

@@ -86,7 +86,7 @@ jobs:
           key: "extcache-v1"
 
       - name: Cache extensions
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.extcache.outputs.dir }}
           key: ${{ steps.extcache.outputs.key }}

.github/workflows/performance.yml

@@ -37,7 +37,7 @@ jobs:
           key: "extcache-v1"
 
       - name: Cache extensions
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.extcache.outputs.dir }}
           key: ${{ steps.extcache.outputs.key }}
@@ -57,7 +57,7 @@ jobs:
         uses: "ramsey/composer-install@v3"
 
       - name: "Upload composer.lock as build artifact"
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: composer.lock-${{ matrix.php-version }}
           path: composer.lock

.github/workflows/static-analysis.yml

@@ -31,7 +31,7 @@ jobs:
           key: "extcache-v1"
 
       - name: Cache extensions
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.extcache.outputs.dir }}
           key: ${{ steps.extcache.outputs.key }}
@@ -51,7 +51,7 @@ jobs:
         uses: "ramsey/composer-install@v3"
 
       - name: "Upload composer.lock as build artifact"
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: "composer-lock-static-analysis-phpstan"
           path: composer.lock

UPGRADE-2.16.md

@@ -1,5 +1,37 @@
 # UPGRADE FROM 2.15 to 2.16
 
+## Attribute namespaces
+
+Doctrine annotations are already deprecated in favor of PHP attributes.
+As of MongoDB ODM 2.16, the namespace of attribute classes has been changed from
+`Doctrine\ODM\MongoDB\Mapping\Annotations` to `Doctrine\ODM\MongoDB\Mapping\Attribute`.
+The old classes continue to work, but they are deprecated and will be removed in 3.0.
+
+```diff
+- use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
++ use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM;
+
+  #[ODM\Document]
+  class User
+  {
+      #[ODM\Id]
+      private string $id;
+
+      #[ODM\Field]
+      public string $name;
+  }
+```
+
+The enum `Doctrine\ODM\MongoDB\Mapping\Annotations\EncryptQuery` has been moved to
+`Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery`.
+
+[BC break] The classes `Doctrine\ODM\MongoDB\Mapping\Annotations\AbstractDocument`,
+`AbstractField` and `AbstractIndex` does not implement
+`Doctrine\ODM\MongoDB\Mapping\Annotations\Annotation` anymore;
+they must not be used outside the `doctrine/mongodb-odm` package.
+The new abstract classes in the `Doctrine\ODM\MongoDB\Mapping\Attribute`
+are marked as `@internal`.
+
 ## Package `doctrine/cache` no longer required
 
 If you use `Doctrine\ODM\MongoDB\Configuration::getMetadataCacheImpl()`,

docs/en/cookbook/mapping-classes-to-orm-and-odm.rst

@@ -113,7 +113,7 @@ Now map the same class to the Doctrine MongoDB ODM:
         namespace Documents\Blog;
 
         use Documents\Blog\Repository\ODM\BlogPostRepository;
-        use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+        use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM;
 
         #[ODM\Document(repositoryClass: BlogPostRepository::class)]
         class BlogPost

docs/en/cookbook/queryable-encryption.rst

@@ -47,9 +47,8 @@ fields that require encryption.
 
     namespace Documents;
 
-    use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
-    use Doctrine\ODM\MongoDB\Mapping\Annotations\Encrypt;
-    use Doctrine\ODM\MongoDB\Mapping\Annotations\EncryptQuery;
+    use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM;
+    use Doctrine\ODM\MongoDB\Mapping\EncryptQuery;
 
     #[ODM\Document]
     class Patient
@@ -69,15 +68,15 @@ fields that require encryption.
          * This allows us to find a patient by their exact SSN.
          */
         #[ODM\Field(type: 'string')]
-        #[Encrypt(queryType: EncryptQuery::Equality)]
+        #[ODM\Encrypt(queryType: EncryptQuery::Equality)]
         public string $ssn;
 
         /**
          * The entire embedded document is encrypted as an object.
          * By not specifying a queryType, we make it non-queryable.
          */
         #[ODM\EmbedOne(targetDocument: Billing::class)]
-        #[Encrypt]
+        #[ODM\Encrypt]
         public Billing $billing;
 
         /**

docs/en/cookbook/time-series-data.rst

@@ -47,7 +47,7 @@ First, we define the model for our data:
     <?php
 
     use DateTimeImmutable;
-    use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+    use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM;
     use MongoDB\BSON\ObjectId;
 
     #[ODM\Document]

docs/en/cookbook/validation-of-documents.rst

@@ -175,7 +175,7 @@ the ``odm:schema:create`` or ``odm:schema:update`` command.
 
         namespace Documents;
 
-        use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+        use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM;
         use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 
         #[ODM\Document]

docs/en/cookbook/vector-search.rst

@@ -36,7 +36,7 @@ return the same result because Voyage AI uses normalized vectors to length 1.
 
 .. code-block:: php
 
-    use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+    use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM;
     use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
     use Doctrine\ODM\MongoDB\Types\Type;
     use Symfony\AI\Platform\Vector\Vector;