Make psalm and phpstan happy again

Author: colinodell

src/Coerce.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace League\HTMLToMarkdown;
+
+/**
+ * @internal
+ */
+final class Coerce
+{
+    private function __construct()
+    {
+    }
+
+    /**
+     * @param mixed $val
+     */
+    public static function toString($val): string
+    {
+        switch (true) {
+            case \is_string($val):
+                return $val;
+            case \is_bool($val):
+            case \is_float($val):
+            case \is_int($val):
+            case $val === null:
+                return \strval($val);
+            case \is_object($val) && \method_exists($val, '__toString'):
+                return $val->__toString();
+            default:
+                throw new \InvalidArgumentException('Cannot coerce this value to string');
+        }
+    }
+}

src/Converter/ListItemConverter.php

@@ -4,6 +4,7 @@
 
 namespace League\HTMLToMarkdown\Converter;
 
+use League\HTMLToMarkdown\Coerce;
 use League\HTMLToMarkdown\Configuration;
 use League\HTMLToMarkdown\ConfigurationAwareInterface;
 use League\HTMLToMarkdown\ElementInterface;
@@ -38,8 +39,8 @@ public function convert(ElementInterface $element): string
         }
 
         if ($listType === 'ul') {
-            $listItemStyle          = \strval($this->config->getOption('list_item_style', '-'));
-            $listItemStyleAlternate = \strval($this->config->getOption('list_item_style_alternate', ''));
+            $listItemStyle          = Coerce::toString($this->config->getOption('list_item_style', '-'));
+            $listItemStyleAlternate = Coerce::toString($this->config->getOption('list_item_style_alternate', ''));
             if (! isset($this->listItemStyle)) {
                 $this->listItemStyle = $listItemStyleAlternate ?: $listItemStyle;
             }

src/Converter/TableConverter.php

@@ -4,6 +4,7 @@
 
 namespace League\HTMLToMarkdown\Converter;
 
+use League\HTMLToMarkdown\Coerce;
 use League\HTMLToMarkdown\Configuration;
 use League\HTMLToMarkdown\ConfigurationAwareInterface;
 use League\HTMLToMarkdown\ElementInterface;
@@ -89,7 +90,7 @@ public function convert(ElementInterface $element): string
                 }
 
                 $value = \str_replace("\n", ' ', $value);
-                $value = \str_replace('|', \strval($this->config->getOption('table_pipe_escape') ?? '\|'), $value);
+                $value = \str_replace('|', Coerce::toString($this->config->getOption('table_pipe_escape') ?? '\|'), $value);
 
                 return '| ' . \trim($value) . ' ';
             case 'thead':

src/Element.php

@@ -144,11 +144,7 @@ public function isDescendantOf($tagNames): bool
             $tagNames = [$tagNames];
         }
 
-        for ($p = $this->node->parentNode; $p !== false; $p = $p->parentNode) {
-            if ($p === null) {
-                return false;
-            }
-
+        for ($p = $this->node->parentNode; $p !== null; $p = $p->parentNode) {
             if (\in_array($p->nodeName, $tagNames, true)) {
                 return true;
             }

src/HtmlConverter.php

@@ -212,7 +212,7 @@ protected function convertToMarkdown(ElementInterface $element): string
         $tag = $element->getTagName();
 
         // Strip nodes named in remove_nodes
-        $tagsToRemove = \explode(' ', \strval($this->getConfig()->getOption('remove_nodes') ?? ''));
+        $tagsToRemove = \explode(' ', Coerce::toString($this->getConfig()->getOption('remove_nodes') ?? ''));
         if (\in_array($tag, $tagsToRemove, true)) {
             return '';
         }

tests/CoerceTest.php

@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace League\HTMLToMarkdown\Test;
+
+use League\HTMLToMarkdown\Coerce;
+use PHPUnit\Framework\TestCase;
+
+final class CoerceTest extends TestCase
+{
+    /**
+     * @dataProvider provideStringTestCases
+     *
+     * @param mixed $val
+     */
+    public function testToString($val, string $expected): void
+    {
+        $this->assertSame($expected, Coerce::toString($val));
+    }
+
+    public function provideStringTestCases(): \Generator
+    {
+        yield ['foo', 'foo'];
+        yield [1, '1'];
+        yield [1.1, '1.1'];
+        yield [true, '1'];
+        yield [false, ''];
+        yield [null, ''];
+        yield [$this, $this->__toString()];
+    }
+
+    /**
+     * @dataProvider provideInvalidStringTestCases
+     *
+     * @param mixed $val
+     */
+    public function testToStringThrowsOnUncoercableValue($val): void
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Cannot coerce this value to string');
+
+        Coerce::toString($val);
+    }
+
+    public function provideInvalidStringTestCases(): \Generator
+    {
+        yield [new \stdClass()];
+        yield [STDOUT];
+    }
+
+    public function __toString(): string
+    {
+        return 'some object';
+    }
+}