adjusted code for Psalm ^5.4

thunderer · Jan 14, 2023 · 0093f35 · 0093f35
1 parent 3072ceb
commit 0093f35
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/Parser/RegularParser.php b/src/Parser/RegularParser.php
@@ -142,7 +142,6 @@ private function shortcode(array &$names)
             }
 
             $this->beginBacktrack();
-            /** @psalm-suppress MixedArgumentTypeCoercion */
             $contentMatchedShortcodes = $this->shortcode($names);
             if(\is_string($contentMatchedShortcodes)) {
                 $closingName = $contentMatchedShortcodes;

diff --git a/src/Serializer/XmlSerializer.php b/src/Serializer/XmlSerializer.php
@@ -88,6 +88,7 @@ public function unserialize($text)
         if($shortcode->length !== 1) {
             throw new \InvalidArgumentException('Invalid shortcode XML!');
         }
+        /** @psalm-suppress PossiblyNullArgument */
         $name = $this->getAttribute($shortcode->item(0), 'name');
 
         $bbCode = $this->getValue($xpath->query('/shortcode/bbCode'));
@@ -98,6 +99,7 @@ public function unserialize($text)
         for($i = 0; $i < $elements->length; $i++) {
             $node = $elements->item($i);
 
+            /** @psalm-suppress PossiblyNullReference */
             $parameters[$this->getAttribute($node, 'name')] = $node->hasChildNodes() ? $node->nodeValue : null;
         }
 
@@ -111,6 +113,7 @@ public function unserialize($text)
      */
     private function getValue(\DOMNodeList $node)
     {
+        /** @psalm-suppress PossiblyNullReference,PossiblyNullPropertyFetch */
         return $node->length === 1 && $node->item(0)->hasChildNodes()
             ? $node->item(0)->nodeValue
             : null;
@@ -119,7 +122,6 @@ private function getValue(\DOMNodeList $node)
     /**
      * @param \DOMNode $node
      * @param string $name
-     * @psalm-suppress UnusedParam
      *
      * @return string
      */

diff --git a/src/Serializer/YamlSerializer.php b/src/Serializer/YamlSerializer.php
@@ -27,7 +27,10 @@ public function serialize(ShortcodeInterface $shortcode)
      */
     public function unserialize($text)
     {
-        /** @psalm-var array{name:string,parameters:array<string,string|null>,bbCode:string|null,content:string|null}|null $data */
+        /**
+         * @psalm-var array{name:string,parameters:array<string,string|null>,bbCode:string|null,content:string|null}|null $data
+         * @psalm-suppress ReservedWord
+         */
         $data = Yaml::parse($text);
 
         if(!is_array($data)) {