Merge 2.10.x into 2.11.x (#9331)

* Enable some previously disabled PHPCS rules (#9324)

* Fix broken type declaration (#9330)

Author: derrabus

phpcs.xml.dist

@@ -127,11 +127,6 @@
         <exclude-pattern>lib/Doctrine/ORM/Cache/DefaultQueryCache.php</exclude-pattern>
     </rule>
 
-    <rule ref="SlevomatCodingStandard.Commenting.UselessInheritDocComment.UselessInheritDocComment">
-        <!-- Workaround for https://github.com/slevomat/coding-standard/issues/1233 -->
-        <exclude-pattern>lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php</exclude-pattern>
-    </rule>
-
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming">
         <exclude-pattern>lib/Doctrine/ORM/EntityManagerInterface.php</exclude-pattern>
     </rule>
@@ -258,14 +253,6 @@
         <exclude-pattern>tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php</exclude-pattern>
     </rule>
 
-    <rule ref="PSR2.ControlStructures.SwitchDeclaration.TerminatingComment">
-        <!--
-            Remove when upgrading to squizlabs/php_codesniffer 3.6.0
-            https://github.com/squizlabs/PHP_CodeSniffer/pull/3186
-        -->
-        <exclude-pattern>lib/Doctrine/ORM/Query/Parser.php</exclude-pattern>
-    </rule>
-
     <rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedElse">
         <!-- The missing code needs to be implemented someday -->
         <exclude-pattern>lib/Doctrine/ORM/Id/TableGenerator.php</exclude-pattern>

tests/Doctrine/Performance/Mock/NonProxyLoadingUnitOfWork.php

@@ -5,14 +5,13 @@
 namespace Doctrine\Performance\Mock;
 
 use Doctrine\ORM\UnitOfWork;
-use Doctrine\Tests\ORM\Performance\PersisterMock;
 
 /**
  * An unit of work mock that prevents lazy-loading of proxies
  */
 class NonProxyLoadingUnitOfWork extends UnitOfWork
 {
-    /** @var PersisterMock */
+    /** @var NonLoadingPersister */
     private $entityPersister;
 
     public function __construct()