Merge pull request #496 from greg0ire/2.0.x

Merge 1.14.x up into 2.0.x

Author: greg0ire

.github/workflows/static-analysis.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@2.1.0"
+    uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.0.0"

composer.json

@@ -40,10 +40,10 @@
     "require-dev": {
         "doctrine/cache": "^2.0",
         "doctrine/coding-standard": "^10",
-        "phpstan/phpstan": "^1.8.0",
+        "phpstan/phpstan": "^1.10.28",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
         "symfony/cache": "^5.4 || ^6",
-        "vimeo/psalm": "^4.10"
+        "vimeo/psalm": "^4.30 || ^5.14"
     },
     "suggest": {
         "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations"

lib/Doctrine/Common/Annotations/DocLexer.php

@@ -74,7 +74,7 @@ public function nextTokenIsAdjacent(): bool
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     protected function getCatchablePatterns()
     {
@@ -86,15 +86,15 @@ protected function getCatchablePatterns()
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     protected function getNonCatchablePatterns()
     {
         return ['\s+', '\*+', '(.)'];
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     protected function getType(&$value)
     {

lib/Doctrine/Common/Annotations/DocParser.php

@@ -49,6 +49,8 @@
  * A parser for docblock annotations.
  *
  * It is strongly discouraged to change the default annotation parsing process.
+ *
+ * @psalm-type Arguments = array{positional_arguments?: array<int, mixed>, named_arguments?: array<string, mixed>}
  */
 final class DocParser
 {
@@ -1026,7 +1028,7 @@ private function Annotation()
     /**
      * MethodCall ::= ["(" [Values] ")"]
      *
-     * @return mixed[]
+     * @psalm-return Arguments
      *
      * @throws AnnotationException
      * @throws ReflectionException
@@ -1053,7 +1055,7 @@ private function MethodCall(): array
     /**
      * Values ::= Array | Value {"," Value}* [","]
      *
-     * @return mixed[]
+     * @psalm-return Arguments
      *
      * @throws AnnotationException
      * @throws ReflectionException
@@ -1415,7 +1417,7 @@ private function isIgnoredAnnotation(string $name): bool
     /**
      * Resolve positional arguments (without name) to named ones
      *
-     * @param array<string,mixed> $arguments
+     * @psalm-param Arguments $arguments
      *
      * @return array<string,mixed>
      */

phpcs.xml.dist

@@ -56,6 +56,11 @@
         <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php</exclude-pattern>
         <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/Fixtures/*</exclude-pattern>
     </rule>
+    <rule ref="SlevomatCodingStandard.Commenting.DocCommentSpacing">
+        <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php</exclude-pattern>
+        <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/Fixtures/*</exclude-pattern>
+        <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/SimpleAnnotationReaderTest.php</exclude-pattern>
+    </rule>
     <rule ref="SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash.UseStartsWithBackslash">
         <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/Fixtures/*</exclude-pattern>
     </rule>
@@ -88,6 +93,7 @@
 
     <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName">
         <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/PhpParserTest.php</exclude-pattern>
+        <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/Ticket/DCOM141Test.php</exclude-pattern>
     </rule>
 
     <!-- It is easier to understand tests that involve annotations if you can
@@ -119,6 +125,7 @@
     <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint">
         <!-- there is a class property with an empty var annotation on purpose -->
         <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php</exclude-pattern>
+        <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/DummyClass.php</exclude-pattern>
         <exclude-pattern>*/tests/Doctrine/Tests/Common/Annotations/Fixtures/ClassWithValidAnnotationTarget.php</exclude-pattern>
     </rule>
 

phpstan.neon

@@ -1,5 +1,6 @@
 parameters:
     level: 3
+    phpVersion: 80200
     paths:
         - lib
         - tests

psalm.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="7"
+    phpVersion="8.2"
     resolveFromConfigFile="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
@@ -12,4 +15,12 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
+    <issueHandlers>
+        <NoValue>
+            <errorLevel type="suppress">
+                <file name="lib/Doctrine/Common/Annotations/Annotation/Enum.php" />
+                <file name="lib/Doctrine/Common/Annotations/Annotation/Target.php" />
+            </errorLevel>
+        </NoValue>
+    </issueHandlers>
 </psalm>

tests/Doctrine/Tests/Common/Annotations/Fixtures/ClassWithInvalidAnnotationTargetAtProperty.php

@@ -16,7 +16,6 @@ class ClassWithInvalidAnnotationTargetAtProperty
      */
     public $foo;
 
-
     /**
      * @var mixed
      * @AnnotationTargetAnnotation("Foo")

tests/Doctrine/Tests/Common/Annotations/Fixtures/ClassWithValidAnnotationTarget.php

@@ -14,7 +14,6 @@ class ClassWithValidAnnotationTarget
     /** @AnnotationTargetPropertyMethod("Some data") */
     public $foo;
 
-
     /** @AnnotationTargetAll("Some data",name="Some name") */
     public $name;