+ minors fixes for vendor/bin/phpstan validation

Author: vincent-le-henaff

composer.json

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

lib/Doctrine/ODM/MongoDB/Event/PreUpdateEventArgs.php

@@ -5,6 +5,7 @@
 namespace Doctrine\ODM\MongoDB\Event;
 
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\ODM\MongoDB\UnitOfWork;
 use InvalidArgumentException;
 
 use function get_class;

lib/Doctrine/ODM/MongoDB/Hydrator/HydratorInterface.php

@@ -4,6 +4,8 @@
 
 namespace Doctrine\ODM\MongoDB\Hydrator;
 
+use Doctrine\ODM\MongoDB\UnitOfWork;
+
 /**
  * The HydratorInterface defines methods all hydrator need to implement
  *

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

@@ -8,6 +8,7 @@
 use Generator;
 use RuntimeException;
 use Traversable;
+use ReturnTypeWillChange;
 
 use function count;
 use function current;

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

@@ -10,6 +10,7 @@
 use Iterator;
 use RuntimeException;
 use Traversable;
+use ReturnTypeWillChange;
 
 /**
  * Iterator that wraps a traversable and hydrates results into objects

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

@@ -8,6 +8,7 @@
 use LogicException;
 use RuntimeException;
 use Traversable;
+use ReturnTypeWillChange;
 
 use function iterator_to_array;
 use function sprintf;

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

@@ -8,10 +8,12 @@
 use Closure;
 use Doctrine\Common\Collections\Collection as BaseCollection;
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\ODM\MongoDB\MongoDBException;
 use Doctrine\ODM\MongoDB\UnitOfWork;
 use Doctrine\ODM\MongoDB\Utility\CollectionHelper;
 use Traversable;
+use ReturnTypeWillChange;
 
 use function array_combine;
 use function array_diff_key;

lib/Doctrine/ODM/MongoDB/UnitOfWork.php

@@ -25,6 +25,7 @@
 use Doctrine\Persistence\PropertyChangedListener;
 use InvalidArgumentException;
 use MongoDB\BSON\UTCDateTime;
+use MongoDB\Driver\WriteConcern;
 use ProxyManager\Proxy\GhostObjectInterface;
 use ReflectionProperty;
 use UnexpectedValueException;
@@ -54,7 +55,7 @@
  *      1: mixed
  * }
  * @psalm-type Hints = array<int, mixed>
- * @psalm-type CommitOptions array{
+ * @psalm-type CommitOptions = array{
  *      fsync?: bool,
  *      safe?: int,
  *      w?: int,

tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH1152Test.php

@@ -7,6 +7,7 @@
 use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs;
 use Doctrine\ODM\MongoDB\Events;
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\ODM\MongoDB\Tests\BaseTest;
 
 class GH1152Test extends BaseTest