Merge branch '2.13.x' into 3.0.x

* 2.13.x: Conditionally extend the old AnnotationDriver class (doctrine#9671)
derrabus · Apr 22, 2022 · 73228b1 · 73228b1
2 parents 682b4e3 + 2e4a872
commit 73228b1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -353,11 +353,6 @@ This is now deprecated. Please extend `EntityRepository` instead.
 +$entityManager->getRepository(CmsUser::class);
 ```
 
-## BC Break: `AttributeDriver` and `AnnotationDriver` no longer extends parent class from `doctrine/persistence`
-
-Both these classes used to extend an abstract `AnnotationDriver` class defined
-in `doctrine/persistence`, and no longer do.
-
 ## Deprecate `AttributeDriver::getReader()` and `AnnotationDriver::getReader()`
 
 That method was inherited from the abstract `AnnotationDriver` class of

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -44,7 +44,7 @@
     </rule>
 
     <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
-        <exclude-pattern>*/tests/*</exclude-pattern>
+        <exclude-pattern>tests/*</exclude-pattern>
     </rule>
 
     <rule ref="Squiz.Classes.ClassFileName.NoMatch">