Fix PHPStan baselined errors (#91)

Author: mondrake

phpstan-baseline.neon

@@ -1,47 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: '#^Call to function is_string\(\) with class\-string\<FileEye\\MimeMap\\Map\\MimeMapInterface\> will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: src/Command/UpdateCommand.php
-
-		-
-			message: '#^Cannot access offset 0 on mixed\.$#'
-			identifier: offsetAccess.nonOffsetAccessible
-			count: 1
-			path: src/Command/UpdateCommand.php
-
-		-
-			message: '#^Cannot access offset 1 on mixed\.$#'
-			identifier: offsetAccess.nonOffsetAccessible
-			count: 1
-			path: src/Command/UpdateCommand.php
-
-		-
-			message: '#^Cannot access offset 2 on mixed\.$#'
-			identifier: offsetAccess.nonOffsetAccessible
-			count: 1
-			path: src/Command/UpdateCommand.php
-
-		-
-			message: '#^Parameter \#2 \$args of function call_user_func_array expects array\<int\|string, mixed\>, mixed given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Command/UpdateCommand.php
-
-		-
-			message: '#^Part \$command\[0\] \(mixed\) of encapsed string cannot be cast to string\.$#'
-			identifier: encapsedStringPart.nonString
-			count: 1
-			path: src/Command/UpdateCommand.php
-
-		-
-			message: '#^Part \$error \(mixed\) of encapsed string cannot be cast to string\.$#'
-			identifier: encapsedStringPart.nonString
-			count: 1
-			path: src/Command/UpdateCommand.php
-
 		-
 			message: '#^Method FileEye\\MimeMap\\Map\\BaseMap\:\:getMapSubEntry\(\) should return list\<string\> but returns array\<int, string\>\.$#'
 			identifier: return.type
@@ -53,27 +11,3 @@ parameters:
 			identifier: return.type
 			count: 1
 			path: src/Map/BaseMap.php
-
-		-
-			message: '#^Binary operation "\." between ''\: '' and mixed results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: src/MapUpdater.php
-
-		-
-			message: '#^Parameter \#1 \$format of method FileEye\\MimeMap\\Type\:\:toString\(\) expects int, mixed given\.$#'
-			identifier: argument.type
-			count: 7
-			path: src/Type.php
-
-		-
-			message: '#^Parameter \#1 \$format of method FileEye\\MimeMap\\TypeInterface\:\:toString\(\) expects int, mixed given\.$#'
-			identifier: argument.type
-			count: 3
-			path: src/Type.php
-
-		-
-			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''FileEye\\\\MimeMap\\\\TypeParameter'' and FileEye\\MimeMap\\TypeParameter will always evaluate to true\.$#'
-			identifier: method.alreadyNarrowedType
-			count: 1
-			path: tests/src/TypeTest.php

src/Command/UpdateCommand.php

@@ -74,7 +74,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return (2);
         }
 
-        /** @var class-string<MimeMapInterface> $mapClass */
         $mapClass = $input->getOption('class');
         if (!is_string($mapClass)) {
             $io->error('Invalid value for --class option.');
@@ -99,13 +98,15 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return (2);
         }
 
+        /** @var list<array{0: string, 1: string, 2: array<mixed>}> $commands */
         foreach ($commands as $command) {
             $output->writeln("<info>{$command[0]} ...</info>");
             try {
                 $callable = [$updater, $command[1]];
                 assert(is_callable($callable));
                 $errors = call_user_func_array($callable, $command[2]);
                 if (is_array($errors) && !empty($errors)) {
+                    /** @var list<string> $errors */
                     foreach ($errors as $error) {
                         $output->writeln("<comment>$error.</comment>");
                     }
@@ -117,6 +118,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         // Load the map to be changed.
+        /** @var class-string<MimeMapInterface> $mapClass */
         MapHandler::setDefaultMapClass($mapClass);
         $current_map = MapHandler::map();
 

src/MapUpdater.php

@@ -148,6 +148,7 @@ public function loadMapFromFreedesktopFile(string $source_file): array
             }
             if (isset($node->acronym)) {
                 $acronym = (string) $node->acronym;
+                /** @var ?string $expandedAcronym */
                 $expandedAcronym = $node->{'expanded-acronym'} ?? null;
                 if (isset($expandedAcronym)) {
                     $acronym .= ': ' . $expandedAcronym;

src/Type.php

@@ -11,16 +11,22 @@ class Type implements TypeInterface
 {
     /**
      * Short format [e.g. image/jpeg] for strings.
+     *
+     * @phpstan-var int
      */
     const SHORT_TEXT = 0;
 
     /**
      * Full format [e.g. image/jpeg; p="1"] for strings.
+     *
+     * @phpstan-var int
      */
     const FULL_TEXT = 1;
 
     /**
      * Full format with comments [e.g. image/jpeg; p="1" (comment)] for strings.
+     *
+     * @phpstan-var int
      */
     const FULL_TEXT_WITH_COMMENTS = 2;
 

tests/src/TypeTest.php

@@ -455,7 +455,6 @@ public function testParse(string $type, array $expectedToString, array $expected
         }
         foreach ($expectedParameters as $name => $param) {
             $this->assertTrue(isset($mt->getParameters()[$name]));
-            $this->assertInstanceOf(TypeParameter::class, $mt->getParameter($name));
             $this->assertSame($name, $mt->getParameter($name)->getName());
             $this->assertSame($param[0], $mt->getParameter($name)->getValue());
             if (isset($param[1])) {