Guard against possible mixed types

thephpleague · Oct 7, 2022 · a4b127f · a4b127f
1 parent 279dd98
commit a4b127f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## [Unreleased][unreleased]
 
+### Fixed
+
+- Fixed missing type checks and coercions
+
 ## [5.1.0] - 2022-03-02
 
 ### Changed

diff --git a/src/Converter/LinkConverter.php b/src/Converter/LinkConverter.php
@@ -72,6 +72,6 @@ private function isValidEmail(string $email): bool
 
     private function shouldStrip(): bool
     {
-        return $this->config->getOption('strip_placeholder_links') ?? false;
+        return \boolval($this->config->getOption('strip_placeholder_links') ?? false);
     }
 }
diff --git a/src/Converter/ListItemConverter.php b/src/Converter/ListItemConverter.php
@@ -38,8 +38,8 @@ public function convert(ElementInterface $element): string
         }
 
         if ($listType === 'ul') {
-            $listItemStyle          = $this->config->getOption('list_item_style', '-');
-            $listItemStyleAlternate = $this->config->getOption('list_item_style_alternate');
+            $listItemStyle          = \strval($this->config->getOption('list_item_style', '-'));
+            $listItemStyleAlternate = \strval($this->config->getOption('list_item_style_alternate', ''));
             if (! isset($this->listItemStyle)) {
                 $this->listItemStyle = $listItemStyleAlternate ?: $listItemStyle;
             }

diff --git a/src/Converter/TableConverter.php b/src/Converter/TableConverter.php
@@ -89,7 +89,7 @@ public function convert(ElementInterface $element): string
                 }
 
                 $value = \str_replace("\n", ' ', $value);
-                $value = \str_replace('|', $this->config->getOption('table_pipe_escape') ?? '\|', $value);
+                $value = \str_replace('|', \strval($this->config->getOption('table_pipe_escape') ?? '\|'), $value);
 
                 return '| ' . \trim($value) . ' ';
             case 'thead':

diff --git a/src/Element.php b/src/Element.php
@@ -98,7 +98,9 @@ public function getChildren(): array
     {
         $ret = [];
         foreach ($this->node->childNodes as $node) {
-            $ret[] = new self($node);
+            if ($node instanceof \DOMNode) {
+                $ret[] = new self($node);
+            }
         }
 
         return $ret;

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