Merge branch '2.15.x' into 3.0.x

* 2.15.x:
  PHPStan 1.9.5 (#10359)
  Drop doctrine/lexer 1

composer.json

@@ -38,7 +38,7 @@
     "require-dev": {
         "doctrine/coding-standard": "^11.0",
         "phpbench/phpbench": "^1.0 || dev-master",
-        "phpstan/phpstan": "1.9.4",
+        "phpstan/phpstan": "1.9.5",
         "phpunit/phpunit": "^9.5.28@dev",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.7.1",

lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php

@@ -559,7 +559,8 @@ private function getGeneratedMode(string $generatedMode): int
     /**
      * Parses the given method.
      *
-     * @return callable[]
+     * @return list<array{string, string}>
+     * @psalm-return list<array{string, (Events::*)}>
      */
     private function getMethodCallbacks(ReflectionMethod $method): array
     {

phpstan-baseline.neon

@@ -370,11 +370,6 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/UnitOfWork.php
 
-		-
-			message: "#^Parameter \\#3 \\$collection of class Doctrine\\\\ORM\\\\PersistentCollection constructor expects Doctrine\\\\Common\\\\Collections\\\\Collection\\<\\(int\\|string\\), mixed\\>&Doctrine\\\\Common\\\\Collections\\\\Selectable\\<\\(int\\|string\\), mixed\\>, Doctrine\\\\Common\\\\Collections\\\\Collection given\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/UnitOfWork.php
-
 		-
 			message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$name\\.$#"
 			count: 1

psalm-baseline.xml

@@ -525,12 +525,6 @@
   </file>
   <file src="lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php">
     <InvalidArgument occurrences="1"/>
-    <InvalidArrayAccess occurrences="4">
-      <code>$value[0]</code>
-      <code>$value[0]</code>
-      <code>$value[1]</code>
-      <code>$value[1]</code>
-    </InvalidArrayAccess>
     <LessSpecificReturnStatement occurrences="1">
       <code>$mapping</code>
     </LessSpecificReturnStatement>