Merge pull request #2964 from GromNaN/merge-2.16-into-3.0

Merge 2.16.x into 3.0.x

Author: IonBazan

.github/workflows/performance.yml

@@ -63,4 +63,4 @@ jobs:
           path: composer.lock
 
       - name: "Run PHPBench"
-        run: "vendor/bin/phpbench run --report=default --revs=100 --iterations=5 --report=aggregate"
+        run: "vendor/bin/phpbench run --report=default --report=aggregate"

.github/workflows/website-schema.yml

@@ -18,4 +18,4 @@ on:
 jobs:
   json-validate:
     name: "Validate JSON schema"
-    uses: "doctrine/.github/.github/workflows/website-schema.yml@13.0.0"
+    uses: "doctrine/.github/.github/workflows/website-schema.yml@13.1.0"

UPGRADE-2.16.md

@@ -1,5 +1,11 @@
 # UPGRADE FROM 2.15 to 2.16
 
+## Package `doctrine/cache` no longer required
+
+If you use `Doctrine\ODM\MongoDB\Configuration::getMetadataCacheImpl()`,
+then you need to require `doctrine/cache` explicitly in `composer.json`;
+or use `Doctrine\ODM\MongoDB\Configuration::getMetadataCache()` instead.
+
 ## Lazy Proxy Directory
 
 Using proxy classes with PHP 8.4+ is deprecated, only native lazy objects will

benchmark/BaseBench.php

@@ -32,9 +32,10 @@ public function initDocumentManager(): void
     {
         $config = new Configuration();
 
-        $config->setHydratorDir(__DIR__ . '/../../tests/Hydrators');
+        $config->setHydratorDir(__DIR__ . '/../tests/Hydrators');
+        $config->setAutoGenerateHydratorClasses(Configuration::AUTOGENERATE_ALWAYS);
         $config->setHydratorNamespace('Hydrators');
-        $config->setPersistentCollectionDir(__DIR__ . '/../../tests/PersistentCollections');
+        $config->setPersistentCollectionDir(__DIR__ . '/../tests/PersistentCollections');
         $config->setPersistentCollectionNamespace('PersistentCollections');
         $config->setDefaultDB(self::DATABASE_NAME);
         $config->setMetadataDriverImpl(self::createMetadataDriverImpl());

benchmark/Document/HydrateDocumentBench.php

@@ -10,14 +10,22 @@
 use MongoDB\BSON\ObjectId;
 use MongoDB\BSON\UTCDateTime;
 use PhpBench\Attributes\BeforeMethods;
+use PhpBench\Attributes\Iterations;
+use PhpBench\Attributes\Revs;
 use PhpBench\Attributes\Warmup;
 
 #[BeforeMethods(['initDocumentManager', 'clearDatabase', 'init'])]
+#[Warmup(2)]
+#[Revs(100)]
+#[Iterations(5)]
 final class HydrateDocumentBench extends BaseBench
 {
     /** @var array<string, mixed> */
     private static array $data;
 
+    /** @var array<string, mixed> */
+    private static array $extraData;
+
     /** @var array<string, mixed> */
     private static array $embedOneData;
 
@@ -40,6 +48,17 @@ public function init(): void
             'createdAt' => new UTCDateTime(),
         ];
 
+        self::$extraData = [
+            'hits' => 100,
+            'age' => 30,
+            'nullTest' => null,
+            'logs' => [
+                'User logged in',
+                'User updated profile',
+                'User logged out',
+            ],
+        ];
+
         self::$embedOneData = [
             'address' => ['city' => 'Munich'],
         ];
@@ -77,31 +96,26 @@ public function init(): void
             ->getHydratorFor(User::class);
     }
 
-    #[Warmup(2)]
     public function benchHydrateDocument(): void
     {
-        self::$hydrator->hydrate(new User(), self::$data);
+        self::$hydrator->hydrate(new User(), self::$data + self::$extraData);
     }
 
-    #[Warmup(2)]
     public function benchHydrateDocumentWithEmbedOne(): void
     {
         self::$hydrator->hydrate(new User(), self::$data + self::$embedOneData);
     }
 
-    #[Warmup(2)]
     public function benchHydrateDocumentWithEmbedMany(): void
     {
         self::$hydrator->hydrate(new User(), self::$data + self::$embedManyData);
     }
 
-    #[Warmup(2)]
     public function benchHydrateDocumentWithReferenceOne(): void
     {
         self::$hydrator->hydrate(new User(), self::$data + self::$referenceOneData);
     }
 
-    #[Warmup(2)]
     public function benchHydrateDocumentWithReferenceMany(): void
     {
         self::$hydrator->hydrate(new User(), self::$data + self::$referenceManyData);

benchmark/Document/LoadDocumentBench.php

@@ -13,11 +13,16 @@
 use Documents\User;
 use MongoDB\BSON\ObjectId;
 use PhpBench\Attributes\BeforeMethods;
+use PhpBench\Attributes\Iterations;
+use PhpBench\Attributes\Revs;
 use PhpBench\Attributes\Warmup;
 
 use function assert;
 
 #[BeforeMethods(['initDocumentManager', 'clearDatabase', 'init'])]
+#[Warmup(2)]
+#[Revs(100)]
+#[Iterations(5)]
 final class LoadDocumentBench extends BaseBench
 {
     private static ObjectId $userId;
@@ -52,33 +57,28 @@ public function init(): void
         $this->getDocumentManager()->clear();
     }
 
-    #[Warmup(2)]
     public function benchLoadDocument(): void
     {
         $this->loadDocument();
     }
 
-    #[Warmup(2)]
     public function benchLoadEmbedOne(): void
     {
         $this->loadDocument()->getAddress()->getCity();
     }
 
-    #[Warmup(2)]
     public function benchLoadEmbedMany(): void
     {
         $this->loadDocument()->getPhonenumbers()->forAll(static function (int $key, Phonenumber $element) {
             return $element->getPhoneNumber() !== null;
         });
     }
 
-    #[Warmup(2)]
     public function benchLoadReferenceOne(): void
     {
         $this->loadDocument()->getAccount()->getName();
     }
 
-    #[Warmup(2)]
     public function benchLoadReferenceMany(): void
     {
         $this->loadDocument()->getGroups()->forAll(static function (int $key, Group $group) {

benchmark/Document/StoreDocumentBench.php

@@ -12,12 +12,16 @@
 use Documents\Phonenumber;
 use Documents\User;
 use PhpBench\Attributes\BeforeMethods;
+use PhpBench\Attributes\Iterations;
+use PhpBench\Attributes\Revs;
 use PhpBench\Attributes\Warmup;
 
 #[BeforeMethods(['initDocumentManager', 'clearDatabase'])]
+#[Warmup(2)]
+#[Revs(100)]
+#[Iterations(5)]
 final class StoreDocumentBench extends BaseBench
 {
-    #[Warmup(2)]
     public function benchStoreDocument(): void
     {
         $user = new User();
@@ -29,7 +33,6 @@ public function benchStoreDocument(): void
         $this->getDocumentManager()->clear();
     }
 
-    #[Warmup(2)]
     public function benchStoreDocumentWithEmbedOne(): void
     {
         $address = new Address();
@@ -46,7 +49,6 @@ public function benchStoreDocumentWithEmbedOne(): void
         $this->getDocumentManager()->clear();
     }
 
-    #[Warmup(2)]
     public function benchStoreDocumentWithEmbedMany(): void
     {
         $user = new User();
@@ -60,7 +62,6 @@ public function benchStoreDocumentWithEmbedMany(): void
         $this->getDocumentManager()->clear();
     }
 
-    #[Warmup(2)]
     public function benchStoreDocumentWithReferenceOne(): void
     {
         $account = new Account();
@@ -76,7 +77,6 @@ public function benchStoreDocumentWithReferenceOne(): void
         $this->getDocumentManager()->clear();
     }
 
-    #[Warmup(2)]
     public function benchStoreDocumentWithReferenceMany(): void
     {
         $group1 = new Group('One');