Merge branch '2.3.x' into support-expr-in-queries

# Conflicts:
#	composer.json
#	lib/Doctrine/ODM/MongoDB/Persisters/PersistenceBuilder.php
#	lib/Doctrine/ODM/MongoDB/Query/Expr.php
#	phpstan-baseline.neon

Author: Vincent Le Henaff

.github/workflows/coding-standards.yml

@@ -10,52 +10,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    runs-on: "ubuntu-20.04"
-
-    strategy:
-      matrix:
-        php-version:
-          - "8.0"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-
-      - name: Setup cache environment
-        id: extcache
-        uses: shivammathur/cache-extensions@v1
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: "mongodb-${{ matrix.driver-version }}, bcmath"
-          key: "extcache-v1"
-
-      - name: Cache extensions
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.extcache.outputs.dir }}
-          key: ${{ steps.extcache.outputs.key }}
-          restore-keys: ${{ steps.extcache.outputs.key }}
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          extensions: "mongodb, bcmath"
-          php-version: "${{ matrix.php-version }}"
-          tools: "cs2pr"
-
-      - name: "Show driver information"
-        run: "php --ri mongodb"
-
-      - 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/phpcs -q --no-colors --report=checkstyle | cs2pr"
+    uses: "doctrine/.github/.github/workflows/[email protected]"

.github/workflows/continuous-integration.yml

@@ -21,7 +21,9 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
         mongodb-version:
+          - "5.0"
           - "4.4"
           - "4.2"
           - "4.0"
@@ -32,7 +34,7 @@ jobs:
         dependencies:
           - "highest"
         include:
-          - deps: "lowest"
+          - dependencies: "lowest"
             php-version: "7.2"
             mongodb-version: "3.6"
             driver-version: "1.5.0"
@@ -41,7 +43,7 @@ jobs:
             php-version: "8.0"
             mongodb-version: "4.4"
             driver-version: "stable"
-            deps: "highest"
+            dependencies: "highest"
 
     steps:
       - name: "Checkout"
@@ -76,6 +78,15 @@ jobs:
       - name: "Show driver information"
         run: "php --ri mongodb"
 
+      # Remove this when laminas/laminas-code 4.5 is released
+      - name: "Use dev stability"
+        if: "${{ matrix.php-version == '8.1' }}"
+        run: composer config minimum-stability dev
+
+      # This allows installing symfony/console 3.4 and 6
+      - name: "Remove phpbench/phpbench"
+        run: composer remove --no-update --dev phpbench/phpbench
+
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
         with:

.github/workflows/release-on-milestone-closed.yml

@@ -8,51 +8,9 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    runs-on: "ubuntu-20.04"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-
-      - name: "Release"
-        uses: "laminas/automatic-releases@v1"
-        with:
-          command-name: "laminas:automatic-releases:release"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
-
-      - name: "Create Merge-Up Pull Request"
-        uses: "laminas/automatic-releases@v1"
-        with:
-          command-name: "laminas:automatic-releases:create-merge-up-pull-request"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
-
-      # Uncomment this step if the repository uses a "next minor as default
-      # branch" policy.
-      #
-      # - name: "Create and/or Switch to new Release Branch"
-      #   uses: "laminas/automatic-releases@v1"
-      #   with:
-      #     command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
-      #   env:
-      #     "GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
-      #     "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-      #     "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-      #     "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
-
-      - name: "Create new milestones"
-        uses: "laminas/automatic-releases@v1"
-        with:
-          command-name: "laminas:automatic-releases:create-milestones"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
+    uses: "doctrine/.github/.github/workflows/[email protected]"
+    secrets:
+      GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
+      GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
+      ORGANIZATION_ADMIN_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
+      SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }}

.github/workflows/static-analysis.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
     steps:
       - name: "Checkout code"
@@ -65,7 +65,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
     steps:
       - name: "Checkout code"

UPGRADE-2.3.md

@@ -12,3 +12,23 @@ fetch metadata for the class and read the class using `$metadata->getName()`.
 The metadata layer is aware of these proxy namespace changes and how to resolve
 them, so users should always go through the metadata layer to retrieve mapped
 class names.
+
+## Annotation Mapping
+
+In order to make annotations usable as PHP 8 attributes, their classes no 
+longer extend `Doctrine\Common\Annotations\Annotation` class and are now using 
+`@NamedArgumentConstructor` which provides more type safety. 
+This does not apply to `@Indexes` which is deprecated and can't be used as 
+Attribute. Use `@Index` and `@UniqueIndex` instead.
+
+`@Inheritance` annotation has been removed as it was never used.
+
+## Deprecated: Document Namespace Aliases
+
+Document namespace aliases are deprecated, use the magic ::class constant to abbreviate full class names
+in DocumentManager and DocumentRepository.
+
+```diff
+-  $documentManager->find('MyBundle:User', $id);
++  $documentManager->find(User::class, $id);
+```

benchmark/BaseBench.php

@@ -28,15 +28,12 @@ abstract class BaseBench
     /** @var DocumentManager */
     protected static $documentManager;
 
-    /**
-     * @return DocumentManager
-     */
-    protected function getDocumentManager()
+    protected function getDocumentManager(): DocumentManager
     {
         return self::$documentManager;
     }
 
-    public function initDocumentManager()
+    public function initDocumentManager(): void
     {
         $config = new Configuration();
 
@@ -59,7 +56,7 @@ public function initDocumentManager()
         self::$documentManager = DocumentManager::create($client, $config);
     }
 
-    public function clearDatabase()
+    public function clearDatabase(): void
     {
         // Check if the database exists. Calling listCollections on a non-existing
         // database in a sharded setup will cause an invalid command cursor to be
@@ -85,7 +82,7 @@ public function clearDatabase()
         }
     }
 
-    protected static function createMetadataDriverImpl()
+    protected static function createMetadataDriverImpl(): AnnotationDriver
     {
         return AnnotationDriver::create(__DIR__ . '/../tests/Documents');
     }

benchmark/Document/HydrateDocumentBench.php

@@ -35,7 +35,7 @@ final class HydrateDocumentBench extends BaseBench
     /** @var HydratorInterface */
     private static $hydrator;
 
-    public function init()
+    public function init(): void
     {
         self::$data = [
             '_id' => new ObjectId(),
@@ -83,39 +83,39 @@ public function init()
     /**
      * @Warmup(2)
      */
-    public function benchHydrateDocument()
+    public function benchHydrateDocument(): void
     {
         self::$hydrator->hydrate(new User(), self::$data);
     }
 
     /**
      * @Warmup(2)
      */
-    public function benchHydrateDocumentWithEmbedOne()
+    public function benchHydrateDocumentWithEmbedOne(): void
     {
         self::$hydrator->hydrate(new User(), self::$data + self::$embedOneData);
     }
 
     /**
      * @Warmup(2)
      */
-    public function benchHydrateDocumentWithEmbedMany()
+    public function benchHydrateDocumentWithEmbedMany(): void
     {
         self::$hydrator->hydrate(new User(), self::$data + self::$embedManyData);
     }
 
     /**
      * @Warmup(2)
      */
-    public function benchHydrateDocumentWithReferenceOne()
+    public function benchHydrateDocumentWithReferenceOne(): void
     {
         self::$hydrator->hydrate(new User(), self::$data + self::$referenceOneData);
     }
 
     /**
      * @Warmup(2)
      */
-    public function benchHydrateDocumentWithReferenceMany()
+    public function benchHydrateDocumentWithReferenceMany(): void
     {
         self::$hydrator->hydrate(new User(), self::$data + self::$referenceManyData);
     }

benchmark/Document/LoadDocumentBench.php

@@ -25,7 +25,7 @@ final class LoadDocumentBench extends BaseBench
     /** @var ObjectId */
     private static $userId;
 
-    public function init()
+    public function init(): void
     {
         self::$userId = new ObjectId();
 
@@ -58,44 +58,44 @@ public function init()
     /**
      * @Warmup(2)
      */
-    public function benchLoadDocument()
+    public function benchLoadDocument(): void
     {
         $this->loadDocument();
     }
 
     /**
      * @Warmup(2)
      */
-    public function benchLoadEmbedOne()
+    public function benchLoadEmbedOne(): void
     {
         $this->loadDocument()->getAddress()->getCity();
     }
 
     /**
      * @Warmup(2)
      */
-    public function benchLoadEmbedMany()
+    public function benchLoadEmbedMany(): void
     {
-        $this->loadDocument()->getPhonenumbers()->forAll(static function ($key, Phonenumber $element) {
-            return $element->getPhoneNumber();
+        $this->loadDocument()->getPhonenumbers()->forAll(static function (int $key, Phonenumber $element) {
+            return $element->getPhoneNumber() !== null;
         });
     }
 
     /**
      * @Warmup(2)
      */
-    public function benchLoadReferenceOne()
+    public function benchLoadReferenceOne(): void
     {
         $this->loadDocument()->getAccount()->getName();
     }
 
     /**
      * @Warmup(2)
      */
-    public function benchLoadReferenceMany()
+    public function benchLoadReferenceMany(): void
     {
-        $this->loadDocument()->getGroups()->forAll(static function ($key, Group $group) {
-            return $group->getName();
+        $this->loadDocument()->getGroups()->forAll(static function (int $key, Group $group) {
+            return $group->getName() !== null;
         });
     }
 

benchmark/Document/StoreDocumentBench.php

@@ -18,7 +18,7 @@ final class StoreDocumentBench extends BaseBench
     /**
      * @Warmup(2)
      */
-    public function benchStoreDocument()
+    public function benchStoreDocument(): void
     {
         $user = new User();
         $user->setUsername('alcaeus');
@@ -32,7 +32,7 @@ public function benchStoreDocument()
     /**
      * @Warmup(2)
      */
-    public function benchStoreDocumentWithEmbedOne()
+    public function benchStoreDocumentWithEmbedOne(): void
     {
         $address = new Address();
         $address->setAddress('Redacted');
@@ -51,7 +51,7 @@ public function benchStoreDocumentWithEmbedOne()
     /**
      * @Warmup(2)
      */
-    public function benchStoreDocumentWithEmbedMany()
+    public function benchStoreDocumentWithEmbedMany(): void
     {
         $user = new User();
         $user->setUsername('alcaeus');
@@ -67,7 +67,7 @@ public function benchStoreDocumentWithEmbedMany()
     /**
      * @Warmup(2)
      */
-    public function benchStoreDocumentWithReferenceOne()
+    public function benchStoreDocumentWithReferenceOne(): void
     {
         $account = new Account();
         $account->setName('alcaeus');
@@ -85,7 +85,7 @@ public function benchStoreDocumentWithReferenceOne()
     /**
      * @Warmup(2)
      */
-    public function benchStoreDocumentWithReferenceMany()
+    public function benchStoreDocumentWithReferenceMany(): void
     {
         $group1 = new Group('One');
         $group2 = new Group('Two');