Merge pull request doctrine#11759 from doctrine/2.20.x

greg0ire · web-flow · commit 2b94ec18b981 · 2024-12-08T14:33:31.000+01:00
Merge 2.20.x up into 2.21.x
diff --git a/composer.json b/composer.json
@@ -44,8 +44,8 @@
         "doctrine/coding-standard": "^9.0.2 || ^12.0",
         "phpbench/phpbench": "^0.16.10 || ^1.0",
         "phpstan/extension-installer": "~1.1.0 || ^1.4",
-        "phpstan/phpstan": "~1.4.10 || 1.12.6",
-        "phpstan/phpstan-deprecation-rules": "^1",
+        "phpstan/phpstan": "~1.4.10 || 2.0.3",
+        "phpstan/phpstan-deprecation-rules": "^1 || ^2",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.7.2",
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<ruleset>
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         name="PHP_CodeSniffer"
+         xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
     <arg name="basepath" value="."/>
     <arg name="extensions" value="php"/>
     <arg name="parallel" value="80"/>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/phpstan-dbal2.neon b/phpstan-dbal2.neon
@@ -7,6 +7,7 @@ parameters:
 
     ignoreErrors:
         # PHPStan doesn't understand our method_exists() safeguards.
+        - '/Call to function method_exists.*/'
         - '/Call to an undefined method Doctrine\\DBAL\\Connection::createSchemaManager\(\)\./'
         # Class name will change in DBAL 3.
         - '/^Class Doctrine\\DBAL\\Platforms\\PostgreSQLPlatform not found\.$/'
@@ -46,6 +47,16 @@ parameters:
             path: src/Query/AST/Functions/LocateFunction.php
 
         # Won't get fixed in DBAL 2
+        -
+            message: '#.*deleteItem.*expects string.*#'
+            count: 1
+            path: src/Query.php
+
+        -
+            message: '#.*get(Drop|Create)SchemaS(ql|QL).*should return list.*but returns array.*#'
+            count: 2
+            path: src/Tools/SchemaTool.php
+
         -
             message: "#^Parameter \\#2 \\$start of method Doctrine\\\\DBAL\\\\Platforms\\\\AbstractPlatform\\:\\:getSubstringExpression\\(\\) expects int, string given\\.$#"
             count: 1
diff --git a/phpstan-params.neon b/phpstan-params.neon
@@ -9,7 +9,3 @@ parameters:
         Doctrine\ORM\Query\Parser:
             - syntaxError
     phpVersion: 80400
-
-    ignoreErrors:
-        # Remove on 3.0.x
-        - '~^Default value of the parameter #2 \$value \(array\{\}\) of method Doctrine\\ORM\\Query\\AST\\InstanceOfExpression\:\:__construct\(\) is incompatible with type non\-empty\-array<int, Doctrine\\ORM\\Query\\AST\\InputParameter\|string>\.$~'
diff --git a/phpstan-persistence2.neon b/phpstan-persistence2.neon
@@ -98,5 +98,5 @@ parameters:
             path: src/Mapping/ClassMetadataFactory.php
 
         -
-            message: '#^Parameter \#1 \$classNames of method Doctrine\\ORM\\Mapping\\ClassMetadataInfo\<object\>\:\:setParentClasses\(\) expects array\<int, class\-string\>, array\<string\> given\.$#'
+            message: '#^Parameter \#1 \$classNames of method Doctrine\\ORM\\Mapping\\ClassMetadataInfo\<object\>\:\:setParentClasses\(\) expects list\<class\-string\>, array\<string\> given\.$#'
             path: src/Mapping/ClassMetadataFactory.php
diff --git a/src/Cache/DefaultQueryCache.php b/src/Cache/DefaultQueryCache.php
@@ -262,7 +262,6 @@ public function put(QueryCacheKey $key, ResultSetMapping $rsm, $result, array $h
         $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
@@ -25,7 +25,6 @@
 use Doctrine\ORM\UnitOfWork;
 
 use function array_merge;
-use function assert;
 use function serialize;
 use function sha1;
 
@@ -614,9 +613,10 @@ public function refresh(array $id, $entity, $lockMode = null)
      */
     protected function buildCollectionCacheKey(array $association, $ownerId)
     {
-        $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/ClassMetadataFactory.php b/src/Mapping/ClassMetadataFactory.php
@@ -830,7 +830,6 @@ private function inheritIdGeneratorMapping(ClassMetadataInfo $class, ClassMetada
      */
     protected function wakeupReflection(ClassMetadataInterface $class, ReflectionService $reflService)
     {
-        assert($class instanceof ClassMetadata);
         $class->wakeupReflection($reflService);
     }
 
@@ -839,7 +838,6 @@ protected function wakeupReflection(ClassMetadataInterface $class, ReflectionSer
      */
     protected function initializeReflection(ClassMetadataInterface $class, ReflectionService $reflService)
     {
-        assert($class instanceof ClassMetadata);
         $class->initializeReflection($reflService);
     }
 
diff --git a/src/Mapping/DefaultTypedFieldMapper.php b/src/Mapping/DefaultTypedFieldMapper.php
@@ -68,8 +68,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($this->typedFieldMappings[$type->getName()])) {
diff --git a/src/Mapping/Driver/AttributeDriver.php b/src/Mapping/Driver/AttributeDriver.php
@@ -16,9 +16,7 @@
 use LogicException;
 use ReflectionClass;
 use ReflectionMethod;
-use ReflectionProperty;
 
-use function assert;
 use function class_exists;
 use function constant;
 use function defined;
@@ -310,8 +308,6 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad
         }
 
         foreach ($reflectionClass->getProperties() as $property) {
-            assert($property instanceof ReflectionProperty);
-
             if ($this->isRepeatedPropertyDeclaration($property, $metadata)) {
                 continue;
             }
@@ -322,8 +318,6 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad
             // 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'],
                     [
@@ -569,7 +563,6 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad
                 $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);
@@ -589,7 +582,6 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad
         // Evaluate #[HasLifecycleCallbacks] attribute
         if (isset($classAttributes[Mapping\HasLifecycleCallbacks::class])) {
             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/src/Tools/Console/Command/ClearCache/QueryCommand.php b/src/Tools/Console/Command/ClearCache/QueryCommand.php
@@ -18,7 +18,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
-use function assert;
 use function get_debug_type;
 use function sprintf;
 
@@ -96,13 +95,7 @@ private function doExecute(InputInterface $input, OutputInterface $output): int
 
         $ui->comment('Clearing <info>all</info> Query cache entries');
 
-        if ($cache) {
-            $result = $cache->clear();
-        } else {
-            assert($cacheDriver !== null);
-            $result = $cacheDriver->deleteAll();
-        }
-
+        $result  = $cache ? $cache->clear() : $cacheDriver->deleteAll();
         $message = $result ? 'Successfully deleted cache entries.' : 'No cache entries were deleted.';
 
         if ($input->getOption('flush') === true && ! $cache) {
diff --git a/src/Tools/SchemaTool.php b/src/Tools/SchemaTool.php
@@ -31,13 +31,11 @@
 use function array_filter;
 use function array_flip;
 use function array_intersect_key;
-use function assert;
 use function count;
 use function current;
 use function func_num_args;
 use function implode;
 use function in_array;
-use function is_array;
 use function is_numeric;
 use function method_exists;
 use function strtolower;
@@ -327,7 +325,6 @@ static function (ClassMetadata $class) use ($idMapping): bool {
                     $pkColumns[] = $this->quoteStrategy->getColumnName($identifierField, $class, $this->platform);
                 } elseif (isset($class->associationMappings[$identifierField])) {
                     $assoc = $class->associationMappings[$identifierField];
-                    assert(is_array($assoc));
 
                     foreach ($assoc['joinColumns'] as $joinColumn) {
                         $pkColumns[] = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform);
diff --git a/tests/Tests/ORM/Functional/QueryDqlFunctionTest.php b/tests/Tests/ORM/Functional/QueryDqlFunctionTest.php
@@ -428,6 +428,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();

Original file line number	Diff line number	Diff line change
`@@ -98,5 +98,5 @@ parameters:`
`98`	`98`	`path: src/Mapping/ClassMetadataFactory.php`
`99`	`99`
`100`	`100`	`-`
`101`		`- message: '#^Parameter \#1 \$classNames of method Doctrine\\ORM\\Mapping\\ClassMetadataInfo\<object\>\:\:setParentClasses\(\) expects array\<int, class\-string\>, array\<string\> given\.$#'`
	`101`	`+ message: '#^Parameter \#1 \$classNames of method Doctrine\\ORM\\Mapping\\ClassMetadataInfo\<object\>\:\:setParentClasses\(\) expects list\<class\-string\>, array\<string\> given\.$#'`
`102`	`102`	`path: src/Mapping/ClassMetadataFactory.php`
Original file line number	Diff line number	Diff line change
`@@ -830,7 +830,6 @@ private function inheritIdGeneratorMapping(ClassMetadataInfo $class, ClassMetada`
`830`	`830`	`*/`
`831`	`831`	`protected function wakeupReflection(ClassMetadataInterface $class, ReflectionService $reflService)`
`832`	`832`	`{`
`833`		`- assert($class instanceof ClassMetadata);`
`834`	`833`	`$class->wakeupReflection($reflService);`
`835`	`834`	`}`
`836`	`835`
`@@ -839,7 +838,6 @@ protected function wakeupReflection(ClassMetadataInterface $class, ReflectionSer`
`839`	`838`	`*/`
`840`	`839`	`protected function initializeReflection(ClassMetadataInterface $class, ReflectionService $reflService)`
`841`	`840`	`{`
`842`		`- assert($class instanceof ClassMetadata);`
`843`	`841`	`$class->initializeReflection($reflService);`
`844`	`842`	`}`
`845`	`843`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,6 @@ public function validateAndComplete(array $mapping, ReflectionProperty $field):`
`68`	`68`	`assert(is_a($type->getName(), BackedEnum::class, true));`
`69`	`69`	`$mapping['enumType'] = $type->getName();`
`70`	`70`	`$type = $reflection->getBackingType();`
`71`		`-`
`72`		`- assert($type instanceof ReflectionNamedType);`
`73`	`71`	`}`
`74`	`72`
`75`	`73`	`if (isset($this->typedFieldMappings[$type->getName()])) {`