Merge remote-tracking branch 'origin/2.20.x' into 3.3.x

doctrine · Dec 7, 2024 · b7d1a74 · b7d1a74
2 parents 360b80a + 6fd26a3
commit b7d1a74
Show file tree

Hide file tree

Showing 8 changed files with 1,300 additions and 588 deletions.
diff --git a/composer.json b/composer.json
@@ -41,8 +41,8 @@
         "phpbench/phpbench": "^1.0",
         "phpdocumentor/guides-cli": "^1.4",
         "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan": "1.12.6",
-        "phpstan/phpstan-deprecation-rules": "^1.2",
+        "phpstan/phpstan": "2.0.3",
+        "phpstan/phpstan-deprecation-rules": "^2",
         "phpunit/phpunit": "^10.4.0",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.7.2",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/phpstan-params.neon b/phpstan-params.neon
@@ -8,4 +8,4 @@ parameters:
     earlyTerminatingMethodCalls:
         Doctrine\ORM\Query\Parser:
             - syntaxError
-    phpVersion: 80200
+    phpVersion: 80400
diff --git a/src/Cache/DefaultQueryCache.php b/src/Cache/DefaultQueryCache.php
@@ -231,7 +231,6 @@ public function put(QueryCacheKey $key, ResultSetMapping $rsm, mixed $result, ar
         $region = $persister->getCacheRegion();
 
         $cm = $this->em->getClassMetadata($entityName);
-        assert($cm instanceof ClassMetadata);
 
         foreach ($result as $index => $entity) {
             $identifier = $this->uow->getEntityIdentifier($entity);

diff --git a/src/Cache/Persister/Entity/AbstractEntityPersister.php b/src/Cache/Persister/Entity/AbstractEntityPersister.php
@@ -28,7 +28,6 @@
 use Doctrine\ORM\UnitOfWork;
 
 use function array_merge;
-use function assert;
 use function serialize;
 use function sha1;
 
@@ -549,9 +548,10 @@ public function refresh(array $id, object $entity, LockMode|int|null $lockMode =
     /** @param array<string, mixed> $ownerId */
     protected function buildCollectionCacheKey(AssociationMapping $association, array $ownerId): CollectionCacheKey
     {
-        $metadata = $this->metadataFactory->getMetadataFor($association->sourceEntity);
-        assert($metadata instanceof ClassMetadata);
-
-        return new CollectionCacheKey($metadata->rootEntityName, $association->fieldName, $ownerId);
+        return new CollectionCacheKey(
+            $this->metadataFactory->getMetadataFor($association->sourceEntity)->rootEntityName,
+            $association->fieldName,
+            $ownerId,
+        );
     }
 }
diff --git a/src/Mapping/DefaultTypedFieldMapper.php b/src/Mapping/DefaultTypedFieldMapper.php
@@ -74,8 +74,6 @@ public function validateAndComplete(array $mapping, ReflectionProperty $field):
             assert(is_a($type->getName(), BackedEnum::class, true));
             $mapping['enumType'] = $type->getName();
             $type                = $reflection->getBackingType();
-
-            assert($type instanceof ReflectionNamedType);
         }
 
         if (isset($mapping['type'])) {

diff --git a/src/Mapping/Driver/AttributeDriver.php b/src/Mapping/Driver/AttributeDriver.php
@@ -15,7 +15,6 @@
 use InvalidArgumentException;
 use ReflectionClass;
 use ReflectionMethod;
-use ReflectionProperty;
 
 use function assert;
 use function class_exists;
@@ -273,8 +272,6 @@ public function loadMetadataForClass(string $className, PersistenceClassMetadata
         }
 
         foreach ($reflectionClass->getProperties() as $property) {
-            assert($property instanceof ReflectionProperty);
-
             if ($this->isRepeatedPropertyDeclaration($property, $metadata)) {
                 continue;
             }
@@ -285,8 +282,6 @@ public function loadMetadataForClass(string $className, PersistenceClassMetadata
             // Evaluate #[Cache] attribute
             $cacheAttribute = $this->reader->getPropertyAttribute($property, Mapping\Cache::class);
             if ($cacheAttribute !== null) {
-                assert($cacheAttribute instanceof Mapping\Cache);
-
                 $mapping['cache'] = $metadata->getAssociationCacheDefaults(
                     $mapping['fieldName'],
                     [
@@ -560,7 +555,6 @@ public function loadMetadataForClass(string $className, PersistenceClassMetadata
                 $listenerClass = new ReflectionClass($listenerClassName);
 
                 foreach ($listenerClass->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
-                    assert($method instanceof ReflectionMethod);
                     // find method callbacks.
                     $callbacks  = $this->getMethodCallbacks($method);
                     $hasMapping = $hasMapping ?: ! empty($callbacks);
@@ -584,7 +578,6 @@ public function loadMetadataForClass(string $className, PersistenceClassMetadata
             }
 
             foreach ($reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
-                assert($method instanceof ReflectionMethod);
                 foreach ($this->getMethodCallbacks($method) as $value) {
                     $metadata->addLifecycleCallback($value[0], $value[1]);
                 }

diff --git a/tests/Tests/ORM/Functional/QueryDqlFunctionTest.php b/tests/Tests/ORM/Functional/QueryDqlFunctionTest.php
@@ -427,6 +427,7 @@ public function testInArithmeticExpression1(): void
             SELECT m, m.name AS m_name
             FROM Doctrine\Tests\Models\Company\CompanyManager m
             WHERE m.salary IN (800000 / 8, 100000 * 2)
+            ORDER BY m.name DESC
 SQL;
 
         $result = $this->_em->createQuery($dql)->getArrayResult();