Tweak CS rules and static analysis issues (#1402)

zircote · Feb 2, 2023 · 3700114 · 3700114
1 parent 75d7faa
commit 3700114
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -77,7 +77,7 @@
         'phpdoc_to_comment' => true,
         'phpdoc_summary' => true,
         'phpdoc_single_line_var_spacing' => true,
-        'phpdoc_separation' => true,
+        'phpdoc_separation' => ['skip_unlisted_annotations' => true],
         'phpdoc_scalar' => true,
         'phpdoc_no_useless_inheritdoc' => true,
         'phpdoc_no_empty_return' => true,

diff --git a/src/Analysers/TokenAnalyser.php b/src/Analysers/TokenAnalyser.php
@@ -564,6 +564,8 @@ private function parseNamespaceList(array &$tokens, &$token, Context $parseConte
 
     /**
      * Parse a use statement.
+     *
+     * @param (int|mixed)[]|string $token
      */
     private function parseUseStatement(array &$tokens, &$token, Context $parseContext): array
     {

diff --git a/src/Generator.php b/src/Generator.php
@@ -88,6 +88,7 @@ public function __construct(?LoggerInterface $logger = null)
             public function push(Generator $generator): void
             {
                 $this->generator = $generator;
+                /* @phpstan-ignore-next-line */
                 if (class_exists(AnnotationRegistry::class, true) && method_exists(AnnotationRegistry::class, 'registerLoader')) {
                     // keeping track of &this->generator allows to 'disable' the loader after we are done;
                     // no unload, unfortunately :/

diff --git a/tests/Analysers/DocBlockParserTest.php b/tests/Analysers/DocBlockParserTest.php
@@ -24,6 +24,7 @@ public function testParseContents(): void
 
     public function testDeprecatedAnnotationWarning(): void
     {
+        /* @phpstan-ignore-next-line */
         if (!class_exists(AnnotationRegistry::class, true) || !method_exists(AnnotationRegistry::class, 'registerLoader')) {
             $this->markTestSkipped('Not supported in doctrine/annotations v2');
         }

diff --git a/tests/GeneratorTest.php b/tests/GeneratorTest.php
@@ -99,7 +99,7 @@ public function testRemoveProcessor(): void
     {
         $generator = new Generator();
         $processors = $generator->getProcessors();
-        $processor = function (Analysis $analysis) {
+        $processor = function (Analysis $analysis): void {
         };
         $generator->addProcessor($processor);
         $generator->removeProcessor($processor);
@@ -137,7 +137,7 @@ public function configCases(): iterable
     /**
      * @dataProvider configCases
      */
-    public function testConfig(array $config, bool $expected)
+    public function testConfig(array $config, bool $expected): void
     {
         $generator = new Generator();
         $this->assertOperationIdHash($generator, true);

diff --git a/tests/OpenApiTestCase.php b/tests/OpenApiTestCase.php
@@ -95,7 +95,7 @@ public function getAnalyzer(): AnalyserInterface
 
     public function assertOpenApiLogEntryContains(string $needle, string $message = ''): void
     {
-        $this->expectedLogMessages[] = [function ($entry, $type) use ($needle, $message) {
+        $this->expectedLogMessages[] = [function ($entry, $type) use ($needle, $message): void {
             if ($entry instanceof \Exception) {
                 $entry = $entry->getMessage();
             }
@@ -114,7 +114,7 @@ public function assertOpenApiLogEntryContains(string $needle, string $message =
      */
     protected function assertSpecEquals($actual, $expected, string $message = '', bool $normalized = false): void
     {
-        $formattedValue = function ($value) {
+        $formattedValue = function ($value): string {
             if (is_bool($value)) {
                 return $value ? 'true' : 'false';
             }
-Original file line number
+Diff line change
@@ Expand Up @@
         /**
          * Parse a use statement.
+         *
+         * @param (int|mixed)[]|string $token
          */
         private function parseUseStatement(array &$tokens, &$token, Context $parseContext): array
         {
@@ Expand Down @@