Merge branch '2.20.x' into 2.21.x

derrabus · derrabus · commit 18d07a1003c2 · 2025-10-07T16:35:00.000+02:00
* 2.20.x: Remove calls to getMockForAbstractClass() (#12003) Upgrade to doctrine/coding-standard 14 Bump doctrine/.github from 7.3.0 to 8.0.0
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -24,4 +24,4 @@ on:
 
 jobs:
   coding-standards:
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.3.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@8.0.0"
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@7.3.0"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@8.0.0"
diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   release:
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.3.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@8.0.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
diff --git a/composer.json b/composer.json
@@ -41,14 +41,13 @@
     },
     "require-dev": {
         "doctrine/annotations": "^1.13 || ^2",
-        "doctrine/coding-standard": "^9.0.2 || ^13.0",
+        "doctrine/coding-standard": "^9.0.2 || ^14.0",
         "phpbench/phpbench": "^0.16.10 || ^1.0",
         "phpstan/extension-installer": "~1.1.0 || ^1.4",
         "phpstan/phpstan": "~1.4.10 || 2.1.22",
         "phpstan/phpstan-deprecation-rules": "^1 || ^2",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6",
         "psr/log": "^1 || ^2 || ^3",
-        "squizlabs/php_codesniffer": "3.13.2",
         "symfony/cache": "^4.4 || ^5.4 || ^6.4 || ^7.0",
         "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2 || ^7.0",
         "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -234,6 +234,7 @@
         <!-- extending a class from another package -->
         <exclude-pattern>tests/Tests/Mocks/DatabasePlatformMock.php</exclude-pattern>
         <exclude-pattern>tests/Tests/Mocks/SchemaManagerMock.php</exclude-pattern>
+        <exclude-pattern>tests/Tests/ORM/AbstractQueryTest.php</exclude-pattern>
         <exclude-pattern>tests/Tests/ORM/Functional/Ticket/DDC3634Test.php</exclude-pattern>
     </rule>
 
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -534,12 +534,6 @@ parameters:
 			count: 5
 			path: src/Cache/Persister/Entity/AbstractEntityPersister.php
 
-		-
-			message: '#^Method Doctrine\\ORM\\Cache\\Persister\\Entity\\AbstractEntityPersister\:\:loadAll\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: src/Cache/Persister/Entity/AbstractEntityPersister.php
-
 		-
 			message: '#^Method Doctrine\\ORM\\Cache\\Persister\\Entity\\AbstractEntityPersister\:\:loadManyToManyCollection\(\) has parameter \$assoc with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
@@ -852,6 +846,12 @@ parameters:
 			count: 1
 			path: src/EntityManager.php
 
+		-
+			message: '#^Method Doctrine\\ORM\\EntityRepository\:\:findBy\(\) should return list\<T of object\> but returns array\<mixed\>\.$#'
+			identifier: return.type
+			count: 1
+			path: src/EntityRepository.php
+
 		-
 			message: '#^Method Doctrine\\ORM\\EntityRepository\:\:findOneBy\(\) should return \(T of object\)\|null but returns object\|null\.$#'
 			identifier: return.type
@@ -2844,12 +2844,6 @@ parameters:
 			count: 5
 			path: src/Persisters/Entity/BasicEntityPersister.php
 
-		-
-			message: '#^Method Doctrine\\ORM\\Persisters\\Entity\\BasicEntityPersister\:\:loadAll\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: src/Persisters/Entity/BasicEntityPersister.php
-
 		-
 			message: '#^Method Doctrine\\ORM\\Persisters\\Entity\\BasicEntityPersister\:\:loadCollectionFromStatement\(\) has parameter \$coll with generic class Doctrine\\ORM\\PersistentCollection but does not specify its types\: TKey, T$#'
 			identifier: missingType.generics
@@ -3012,12 +3006,6 @@ parameters:
 			count: 5
 			path: src/Persisters/Entity/EntityPersister.php
 
-		-
-			message: '#^Method Doctrine\\ORM\\Persisters\\Entity\\EntityPersister\:\:loadAll\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: src/Persisters/Entity/EntityPersister.php
-
 		-
 			message: '#^Method Doctrine\\ORM\\Persisters\\Entity\\EntityPersister\:\:loadManyToManyCollection\(\) has parameter \$assoc with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
diff --git a/src/Persisters/Entity/EntityPersister.php b/src/Persisters/Entity/EntityPersister.php
@@ -258,6 +258,8 @@ public function loadCriteria(Criteria $criteria);
      * @param int|null $offset
      * @phpstan-param array<string, string>|null $orderBy
      * @phpstan-param array<string, mixed>       $criteria
+     *
+     * @return mixed[]
      */
     public function loadAll(array $criteria = [], ?array $orderBy = null, $limit = null, $offset = null);
 
diff --git a/tests/Tests/Models/Enums/Card.php b/tests/Tests/Models/Enums/Card.php
@@ -15,7 +15,9 @@
 class Card
 {
     /**
-     * @Id @GeneratedValue @Column(type="integer")
+     * @Id
+     * @GeneratedValue
+     * @Column(type="integer")
      * @var int
      */
     #[Id]
diff --git a/tests/Tests/Models/Enums/CardWithNullable.php b/tests/Tests/Models/Enums/CardWithNullable.php
@@ -15,7 +15,9 @@
 class CardWithNullable
 {
     /**
-     * @Id @GeneratedValue @Column(type="integer")
+     * @Id
+     * @GeneratedValue
+     * @Column(type="integer")
      * @var int
      */
     #[Id]
diff --git a/tests/Tests/Models/Enums/Scale.php b/tests/Tests/Models/Enums/Scale.php
@@ -15,7 +15,9 @@
 class Scale
 {
     /**
-     * @Id @GeneratedValue @Column(type="integer")
+     * @Id
+     * @GeneratedValue
+     * @Column(type="integer")
      * @var int
      */
     #[Id]
diff --git a/tests/Tests/Models/GH10336/GH10336Relation.php b/tests/Tests/Models/GH10336/GH10336Relation.php
@@ -19,8 +19,6 @@ class GH10336Relation
      */
     public ?int $id = null;
 
-    /**
-     * @ORM\Column(type="string")
-     */
+    /** @ORM\Column(type="string") */
     public string $value;
 }
diff --git a/tests/Tests/Models/GH11524/GH11524Relation.php b/tests/Tests/Models/GH11524/GH11524Relation.php
@@ -29,9 +29,7 @@ class GH11524Relation
      */
     public $name;
 
-    /**
-     * @var string|null
-     */
+    /** @var string|null */
     private $currentLocale;
 
     public function setCurrentLocale(string $locale): void
diff --git a/tests/Tests/Models/GH7717/GH7717Child.php b/tests/Tests/Models/GH7717/GH7717Child.php
@@ -19,8 +19,6 @@ class GH7717Child
      */
     public ?int $id = null;
 
-    /**
-     * @ORM\Column(type="string", nullable=true)
-     */
+    /** @ORM\Column(type="string", nullable=true) */
     public ?string $nullableProperty = null;
 }
diff --git a/tests/Tests/Models/Project/Project.php b/tests/Tests/Models/Project/Project.php
@@ -6,14 +6,10 @@
 
 class Project
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     private $id;
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $name;
 
     public function __construct(string $id, string $name)
diff --git a/tests/Tests/Models/Project/ProjectId.php b/tests/Tests/Models/Project/ProjectId.php
@@ -6,9 +6,7 @@
 
 class ProjectId
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     private $id;
 
     public function __construct(string $id)
diff --git a/tests/Tests/Models/Project/ProjectInvalidMapping.php b/tests/Tests/Models/Project/ProjectInvalidMapping.php
@@ -6,14 +6,10 @@
 
 class ProjectInvalidMapping
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     private $id;
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $name;
 
     public function __construct(string $id, string $name)
diff --git a/tests/Tests/Models/Project/ProjectName.php b/tests/Tests/Models/Project/ProjectName.php
@@ -6,9 +6,7 @@
 
 final class ProjectName
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     private $name;
 
     public function __construct(string $name)
diff --git a/tests/Tests/ORM/AbstractQueryTest.php b/tests/Tests/ORM/AbstractQueryTest.php
@@ -27,9 +27,7 @@ public function testItMakesHydrationCacheProfilesAwareOfTheResultCacheDriver():
 
         $configuration = new Configuration();
         $configuration->setHydrationCache($cache);
-        $entityManager = $this->createMock(EntityManagerInterface::class);
-        $entityManager->method('getConfiguration')->willReturn($configuration);
-        $query        = $this->getMockForAbstractClass(AbstractQuery::class, [$entityManager]);
+        $query        = $this->createAbstractQuery($configuration);
         $cacheProfile = new QueryCacheProfile();
 
         $query->setHydrationCacheProfile($cacheProfile);
@@ -45,9 +43,7 @@ public function testItMakesHydrationCacheProfilesAwareOfTheResultCache(): void
 
         $configuration = new Configuration();
         $configuration->setHydrationCache($cache);
-        $entityManager = $this->createMock(EntityManagerInterface::class);
-        $entityManager->method('getConfiguration')->willReturn($configuration);
-        $query        = $this->getMockForAbstractClass(AbstractQuery::class, [$entityManager]);
+        $query        = $this->createAbstractQuery($configuration);
         $cacheProfile = new QueryCacheProfile();
 
         $query->setHydrationCacheProfile($cacheProfile);
@@ -61,9 +57,7 @@ public function testItMakesResultCacheProfilesAwareOfTheResultCache(): void
 
         $configuration = new Configuration();
         $configuration->setResultCache($cache);
-        $entityManager = $this->createMock(EntityManagerInterface::class);
-        $entityManager->method('getConfiguration')->willReturn($configuration);
-        $query        = $this->getMockForAbstractClass(AbstractQuery::class, [$entityManager]);
+        $query        = $this->createAbstractQuery($configuration);
         $cacheProfile = new QueryCacheProfile();
 
         $query->setResultCacheProfile($cacheProfile);
@@ -74,9 +68,7 @@ public function testItMakesResultCacheProfilesAwareOfTheResultCache(): void
     /** @dataProvider provideSettersWithDeprecatedDefault */
     public function testCallingSettersWithoutArgumentsIsDeprecated(string $setter): void
     {
-        $entityManager = $this->createMock(EntityManagerInterface::class);
-        $entityManager->method('getConfiguration')->willReturn(new Configuration());
-        $query = $this->getMockForAbstractClass(AbstractQuery::class, [$entityManager]);
+        $query = $this->createAbstractQuery(new Configuration());
 
         $this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/9791');
         $query->$setter();
@@ -95,10 +87,7 @@ public static function provideSettersWithDeprecatedDefault(): array
     public function testSettingTheResultCacheIsPossibleWithoutCallingDeprecatedMethods(): void
     {
         $cache = $this->createMock(CacheItemPoolInterface::class);
-
-        $entityManager = $this->createMock(EntityManagerInterface::class);
-        $entityManager->method('getConfiguration')->willReturn(new Configuration());
-        $query = $this->getMockForAbstractClass(AbstractQuery::class, [$entityManager]);
+        $query = $this->createAbstractQuery(new Configuration());
 
         $query->setResultCache($cache);
         self::assertSame($cache, CacheAdapter::wrap($query->getResultCacheDriver()));
@@ -107,13 +96,27 @@ public function testSettingTheResultCacheIsPossibleWithoutCallingDeprecatedMetho
 
     public function testSettingTheFetchModeToRandomIntegersIsDeprecated(): void
     {
-        $query = $this->getMockForAbstractClass(
-            AbstractQuery::class,
-            [],
-            '',
-            false // no need to call the constructor
-        );
+        $query = $this->createAbstractQuery(new Configuration());
+
         $this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/9777');
         $query->setFetchMode(stdClass::class, 'foo', 42);
     }
+
+    private function createAbstractQuery(Configuration $configuration): AbstractQuery
+    {
+        $entityManager = $this->createMock(EntityManagerInterface::class);
+        $entityManager->method('getConfiguration')->willReturn($configuration);
+
+        return new class ($entityManager) extends AbstractQuery {
+            public function getSQL(): string
+            {
+                return '';
+            }
+
+            protected function _doExecute(): int
+            {
+                return 0;
+            }
+        };
+    }
 }
diff --git a/tests/Tests/ORM/Functional/QueryCacheTest.php b/tests/Tests/ORM/Functional/QueryCacheTest.php
@@ -4,6 +4,7 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
+use Doctrine\DBAL\Connection;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Exec\AbstractSqlExecutor;
 use Doctrine\ORM\Query\ParserResult;
@@ -121,15 +122,15 @@ public function testQueryCacheHitDoesNotSaveParserResult(): void
 
         $query = $this->_em->createQuery('select ux from Doctrine\Tests\Models\CMS\CmsUser ux');
 
-        $sqlExecMock = $this->getMockBuilder(AbstractSqlExecutor::class)
-                            ->getMockForAbstractClass();
-
-        $sqlExecMock->expects(self::once())
-                    ->method('execute')
-                    ->willReturn(10);
+        $sqlExecutorStub = new class extends AbstractSqlExecutor {
+            public function execute(Connection $conn, array $params, array $types): int
+            {
+                return 10;
+            }
+        };
 
         $parserResultMock = new ParserResult();
-        $parserResultMock->setSqlExecutor($sqlExecMock);
+        $parserResultMock->setSqlExecutor($sqlExecutorStub);
 
         $cache = $this->createMock(CacheItemPoolInterface::class);
 
diff --git a/tests/Tests/ORM/Functional/Ticket/DDC1690Test.php b/tests/Tests/ORM/Functional/Ticket/DDC1690Test.php
@@ -111,9 +111,7 @@ protected function onPropertyChanged($propName, $oldValue, $newValue): void
  */
 class DDC1690Parent extends NotifyBaseEntity
 {
-    /**
-     * @var bool
-     */
+    /** @var bool */
     public static $addPropertyChangedListenerInvoked = false;
 
     /**
@@ -173,9 +171,7 @@ public function addPropertyChangedListener(PropertyChangedListener $listener): v
 /** @Entity */
 class DDC1690Child extends NotifyBaseEntity
 {
-    /**
-     * @var bool
-     */
+    /** @var bool */
     public static $addPropertyChangedListenerInvoked = false;
 
     /**
diff --git a/tests/Tests/ORM/Functional/Ticket/GH10661/InvalidChildEntity.php b/tests/Tests/ORM/Functional/Ticket/GH10661/InvalidChildEntity.php
@@ -13,8 +13,6 @@ class InvalidChildEntity extends InvalidEntity
     /** @Column(type="string") */
     protected int $property2;
 
-    /**
-     * @Column(type="boolean")
-     */
+    /** @Column(type="boolean") */
     private string $anotherProperty;
 }
diff --git a/tests/Tests/ORM/Functional/Ticket/GH10661/InvalidEntity.php b/tests/Tests/ORM/Functional/Ticket/GH10661/InvalidEntity.php
@@ -18,8 +18,6 @@ class InvalidEntity
      */
     protected $key;
 
-    /**
-     * @Column(type="decimal")
-     */
+    /** @Column(type="decimal") */
     protected float $property1;
 }
diff --git a/tests/Tests/ORM/Functional/Ticket/GH11037/InvalidEntityWithTypedEnum.php b/tests/Tests/ORM/Functional/Ticket/GH11037/InvalidEntityWithTypedEnum.php
diff --git a/tests/Tests/ORM/Functional/Ticket/GH11037/ValidEntityWithTypedEnum.php b/tests/Tests/ORM/Functional/Ticket/GH11037/ValidEntityWithTypedEnum.php
diff --git a/tests/Tests/ORM/Functional/Ticket/GH6123Test.php b/tests/Tests/ORM/Functional/Ticket/GH6123Test.php
diff --git a/tests/Tests/ORM/Functional/Ticket/SwitchContextWithFilter/SwitchContextTest.php b/tests/Tests/ORM/Functional/Ticket/SwitchContextWithFilter/SwitchContextTest.php
diff --git a/tests/Tests/ORM/Hydration/AbstractHydratorTest.php b/tests/Tests/ORM/Hydration/AbstractHydratorTest.php
diff --git a/tests/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php b/tests/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php
diff --git a/tests/Tests/ORM/Query/ParserResultTest.php b/tests/Tests/ORM/Query/ParserResultTest.php
diff --git a/tests/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php b/tests/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php
