+ rollback some unexpected changes in previous commits

Author: vincent-le-henaff

composer.json

@@ -22,7 +22,7 @@
         { "name": "Andreas Braun", "email": "alcaeus@alcaeus.org" }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^7.4 || ^8.0",
         "ext-mongodb": "^1.5",
         "doctrine/annotations": "^1.12",
         "doctrine/cache": "^1.11 || ^2.0",

lib/Doctrine/ODM/MongoDB/Configuration.php

@@ -104,7 +104,8 @@ class Configuration
      *      persistentCollectionGenerator?: PersistentCollectionGenerator,
      *      persistentCollectionDir?: string,
      *      persistentCollectionNamespace?: string,
-     *      repositoryFactory?: RepositoryFactory
+     *      repositoryFactory?: RepositoryFactory,
+     *      writeConcern?: WriteConcern
      * }
      */
     private array $attributes = [];

lib/Doctrine/ODM/MongoDB/Iterator/CachingIterator.php

@@ -8,7 +8,6 @@
 use Generator;
 use RuntimeException;
 use Traversable;
-use ReturnTypeWillChange;
 
 use function count;
 use function current;
@@ -80,7 +79,7 @@ public function toArray(): array
     /**
      * @return TValue|false
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return current($this->items);
@@ -89,7 +88,7 @@ public function current()
     /**
      * @return mixed
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return key($this->items);

lib/Doctrine/ODM/MongoDB/Iterator/HydratingIterator.php

@@ -10,7 +10,6 @@
 use Iterator;
 use RuntimeException;
 use Traversable;
-use ReturnTypeWillChange;
 
 /**
  * Iterator that wraps a traversable and hydrates results into objects
@@ -60,7 +59,7 @@ public function __destruct()
     /**
      * @return TDocument|null
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->hydrate($this->getIterator()->current());
@@ -69,7 +68,7 @@ public function current()
     /**
      * @return mixed
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->getIterator()->key();

lib/Doctrine/ODM/MongoDB/Iterator/PrimingIterator.php

@@ -7,7 +7,6 @@
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\ODM\MongoDB\Query\ReferencePrimer;
 use Doctrine\ODM\MongoDB\UnitOfWork;
-use ReturnTypeWillChange;
 
 use function is_callable;
 use function iterator_to_array;
@@ -62,7 +61,7 @@ public function toArray(): array
     /**
      * @return TValue|null
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $this->primeReferences();
@@ -78,7 +77,7 @@ public function next(): void
     /**
      * @return mixed
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->iterator->key();

lib/Doctrine/ODM/MongoDB/Iterator/UnrewindableIterator.php

@@ -8,7 +8,6 @@
 use LogicException;
 use RuntimeException;
 use Traversable;
-use ReturnTypeWillChange;
 
 use function iterator_to_array;
 use function sprintf;
@@ -61,7 +60,7 @@ public function toArray(): array
     /**
      * @return TValue|null
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->getIterator()->current();
@@ -70,7 +69,7 @@ public function current()
     /**
      * @return mixed
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function key()
     {
         if ($this->iterator) {

lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php

@@ -13,7 +13,6 @@
 use Doctrine\ODM\MongoDB\UnitOfWork;
 use Doctrine\ODM\MongoDB\Utility\CollectionHelper;
 use Traversable;
-use ReturnTypeWillChange;
 
 use function array_combine;
 use function array_diff_key;
@@ -410,7 +409,7 @@ public function getValues()
     /**
      * @return int
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function count()
     {
         // Workaround around not being able to directly count inverse collections anymore
@@ -438,7 +437,7 @@ public function isEmpty()
      * @return Traversable
      * @psalm-return Traversable<TKey, T>
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         $this->initialize();
@@ -537,7 +536,7 @@ public function __sleep()
      *
      * @return bool
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         $this->initialize();
@@ -551,7 +550,7 @@ public function offsetExists($offset)
      * @return mixed
      * @psalm-return T|null
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         $this->initialize();
@@ -565,7 +564,7 @@ public function offsetGet($offset)
      *
      * @return void
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         if (! isset($offset)) {
@@ -582,7 +581,7 @@ public function offsetSet($offset, $value)
      *
      * @return void
      */
-    #[ReturnTypeWillChange]
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         $this->doRemove($offset, true);