phpstan level 9

Author: dominikzogg

composer.json

@@ -73,7 +73,7 @@
         "test:infection": "vendor/bin/infection --threads=$(nproc) --min-msi=100 --verbose --coverage=build/phpunit",
         "test:integration": "vendor/bin/phpunit --testsuite=Integration --cache-directory=build/phpunit",
         "test:lint": "mkdir -p build && find src tests -name '*.php' -print0 | xargs -0 -n1 -P$(nproc) php -l | tee build/phplint.log",
-        "test:static-analysis": "mkdir -p build && bash -c 'vendor/bin/phpstan analyse src --no-progress --level=8 --error-format=junit | tee build/phpstan.junit.xml; if [ ${PIPESTATUS[0]} -ne \"0\" ]; then exit 1; fi'",
+        "test:static-analysis": "mkdir -p build && bash -c 'vendor/bin/phpstan analyse src --no-progress --level=9 --error-format=junit | tee build/phpstan.junit.xml; if [ ${PIPESTATUS[0]} -ne \"0\" ]; then exit 1; fi'",
         "test:unit": "vendor/bin/phpunit --testsuite=Unit --coverage-text --coverage-clover=build/phpunit/clover.xml --coverage-html=build/phpunit/coverage-html --coverage-xml=build/phpunit/coverage-xml --log-junit=build/phpunit/junit.xml --cache-directory=build/phpunit"
     }
 }

phpstan.neon

@@ -1,17 +1 @@
 parameters:
-    ignoreErrors:
-        -
-            message: '/has no value type specified in iterable type array/'
-            path: %currentWorkingDirectory%/src/Decoder/*.php
-        -
-            message: '//'
-            path: %currentWorkingDirectory%/src/Decoder/JsonxTypeDecoder.php
-        -
-            message: '//'
-            path: %currentWorkingDirectory%/src/Decoder/UrlEncodedTypeDecoder.php
-        -
-            message: '/with no value type specified in iterable type array/'
-            path: %currentWorkingDirectory%/src/Encoder/*.php
-        -
-            message: '//'
-            path: %currentWorkingDirectory%/src/Encoder/JsonxTypeEncoder.php

src/Decoder/Decoder.php

@@ -33,7 +33,7 @@ public function getContentTypes(): array
     }
 
     /**
-     * @return array<string, null|array|bool|float|int|string>
+     * @return array<string, mixed>
      *
      * @throws LogicException
      * @throws RuntimeException

src/Decoder/DecoderInterface.php

@@ -15,7 +15,7 @@ interface DecoderInterface
     public function getContentTypes(): array;
 
     /**
-     * @return array<string, null|array|bool|float|int|string>
+     * @return array<string, mixed>
      *
      * @throws LogicException
      * @throws RuntimeException

src/Decoder/JsonTypeDecoder.php

@@ -14,7 +14,7 @@ public function getContentType(): string
     }
 
     /**
-     * @return array<string, null|array|bool|float|int|string>
+     * @return array<string, mixed>
      *
      * @throws RuntimeException
      */
@@ -30,6 +30,8 @@ public function decode(string $data): array
             throw RuntimeException::createNotParsable($this->getContentType(), 'Not an object');
         }
 
+        /** @var array<string, mixed> $decoded */
+
         return $decoded;
     }
 }

src/Decoder/JsonxTypeDecoder.php

@@ -24,7 +24,7 @@ public function getContentType(): string
     }
 
     /**
-     * @return array<string, null|array|bool|float|int|string>
+     * @return array<string, mixed>
      *
      * @throws RuntimeException
      */
@@ -36,10 +36,27 @@ public function decode(string $data): array
             throw RuntimeException::createNotParsable($this->getContentType());
         }
 
-        return $this->decodeNode($document->documentElement);
+        $documentElement = $document->documentElement;
+
+        if (null === $documentElement) {
+            throw RuntimeException::createNotParsable($this->getContentType());
+        }
+
+        $result = $this->decodeNode($documentElement);
+
+        if (!\is_array($result)) {
+            throw RuntimeException::createNotParsable($this->getContentType());
+        }
+
+        /** @var array<string, mixed> $result */
+
+        return $result;
     }
 
-    private function decodeNode(\DOMNode $node): array|bool|float|int|string|null
+    /**
+     * @return null|array<mixed>|bool|float|int|string
+     */
+    private function decodeNode(\DOMElement $node): array|bool|float|int|string|null
     {
         $nodeName = $node->nodeName;
 
@@ -73,13 +90,13 @@ private function decodeNode(\DOMNode $node): array|bool|float|int|string|null
     }
 
     /**
-     * @return array<string, null|array|bool|float|int|string>
+     * @return array<string, mixed>
      */
-    private function decodeObjectNode(\DOMNode $node): array
+    private function decodeObjectNode(\DOMElement $node): array
     {
         $data = [];
         foreach ($node->childNodes as $childNode) {
-            if ($childNode instanceof \DOMText) {
+            if (!$childNode instanceof \DOMElement) {
                 continue;
             }
 
@@ -90,13 +107,13 @@ private function decodeObjectNode(\DOMNode $node): array
     }
 
     /**
-     * @return array<int, null|array|bool|float|int|string>
+     * @return array<int, mixed>
      */
-    private function decodeArrayNode(\DOMNode $node): array
+    private function decodeArrayNode(\DOMElement $node): array
     {
         $data = [];
         foreach ($node->childNodes as $childNode) {
-            if ($childNode instanceof \DOMText) {
+            if (!$childNode instanceof \DOMElement) {
                 continue;
             }
 
@@ -106,19 +123,19 @@ private function decodeArrayNode(\DOMNode $node): array
         return $data;
     }
 
-    private function decodeBooleanNode(\DOMNode $node): bool
+    private function decodeBooleanNode(\DOMElement $node): bool
     {
         return 'true' === $node->nodeValue;
     }
 
-    private function decodeStringNode(\DOMNode $node): string
+    private function decodeStringNode(\DOMElement $node): string
     {
-        return $node->nodeValue;
+        return $node->nodeValue ?? '';
     }
 
-    private function decodeNumberNode(\DOMNode $node): float|int
+    private function decodeNumberNode(\DOMElement $node): float|int
     {
-        $value = $node->nodeValue;
+        $value = $node->nodeValue ?? '0';
 
         if ($value === (string) (int) $value) {
             return (int) $value;

src/Decoder/TypeDecoderInterface.php

@@ -11,7 +11,7 @@ interface TypeDecoderInterface
     public function getContentType(): string;
 
     /**
-     * @return array<string, null|array|bool|float|int|string>
+     * @return array<string, mixed>
      *
      * @throws RuntimeException
      */

src/Decoder/UrlEncodedTypeDecoder.php

@@ -14,38 +14,44 @@ public function getContentType(): string
     }
 
     /**
-     * @return array<string, null|array|bool|float|int|string>
+     * @return array<string, mixed>
      *
      * @throws RuntimeException
      */
     public function decode(string $data): array
     {
+        /** @var array<string, mixed> $rawData */
         $rawData = [];
         parse_str($data, $rawData);
 
         if ('' !== $data && [] === $rawData) {
             throw RuntimeException::createNotParsable($this->getContentType());
         }
 
+        /** @var array<string, mixed> */
         return $this->fixValues($rawData);
     }
 
     /**
-     * @param array<int|string, null|array|bool|float|int|string> $rawData
+     * @param array<int|string, mixed> $rawData
      *
-     * @return array<int|string, null|array|bool|float|int|string>
+     * @return array<int|string, mixed>
      */
     private function fixValues(array $rawData): array
     {
         $data = [];
         foreach ($rawData as $key => $value) {
-            $data[$key] = \is_array($value) ? $this->fixValues($value) : $this->fixValue($value);
+            if (\is_array($value)) {
+                $data[$key] = $this->fixValues($value);
+            } elseif (\is_string($value)) {
+                $data[$key] = $this->fixValue($value);
+            }
         }
 
         return $data;
     }
 
-    private function fixValue(string $value): bool|float|int|string|null
+    private function fixValue(string $value): bool|float|int|string
     {
         if ('true' === $value) {
             return true;

src/Decoder/XmlTypeDecoder.php

@@ -19,7 +19,7 @@ public function getContentType(): string
     }
 
     /**
-     * @return array<string, null|array|bool|float|int|string>
+     * @return array<string, mixed>
      */
     public function decode(string $data): array
     {

src/Decoder/YamlTypeDecoder.php

@@ -16,7 +16,7 @@ public function getContentType(): string
     }
 
     /**
-     * @return array<string, null|array|bool|float|int|string>
+     * @return array<string, mixed>
      *
      * @throws RuntimeException
      */
@@ -32,6 +32,8 @@ public function decode(string $data): array
             throw RuntimeException::createNotParsable($this->getContentType(), 'Not an object');
         }
 
+        /** @var array<string, mixed> $decoded */
+
         return $decoded;
     }
 }