Merge pull request #312 from benbalter/update-w2m

Update w2m
benbalter · Apr 18, 2024 · 1c9af3b · 1c9af3b
2 parents 38344d5 + 0d8fb28
commit 1c9af3b
Show file tree

Hide file tree

Showing 13 changed files with 101 additions and 29 deletions.
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'benbalter/wordpress-to-jekyll-exporter',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '4265631f526976ae968a0ede62d0e14d400bf874',
+        'reference' => '52dec7112d6d2d45eac2c8ee766f0ef56dc68f94',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'benbalter/wordpress-to-jekyll-exporter' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '4265631f526976ae968a0ede62d0e14d400bf874',
+            'reference' => '52dec7112d6d2d45eac2c8ee766f0ef56dc68f94',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

diff --git a/vendor/league/html-to-markdown/.github/workflows/tests.yml b/vendor/league/html-to-markdown/.github/workflows/tests.yml
@@ -10,7 +10,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - uses: shivammathur/setup-php@v2
               with:
@@ -28,19 +28,19 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.2', '7.3', '7.4']
+                php: ['7.2', '7.3', '7.4', '8.0', '8.1']
                 coverage: [true]
                 composer-flags: ['']
                 include:
-                    - php: '8.0'
+                    - php: '8.2'
                       coverage: false
                       composer-flags: '--ignore-platform-req=php'
                     - php: '7.2'
                       coverage: false
                       composer-flags: '--prefer-lowest'
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - uses: shivammathur/setup-php@v2
               with:
@@ -53,7 +53,7 @@ jobs:
 
             - name: "Use PHPUnit 9.3+ on PHP 8"
               run: composer require --no-update --dev phpunit/phpunit:^9.3
-              if: "matrix.php == '8.0'"
+              if: "matrix.php >= '8.0'"
 
             - run: composer update --no-progress ${{ matrix.composer-flags }}
 
@@ -72,7 +72,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - uses: shivammathur/setup-php@v2
               with:
@@ -90,7 +90,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             - uses: shivammathur/setup-php@v2
               with:

diff --git a/vendor/league/html-to-markdown/CHANGELOG.md b/vendor/league/html-to-markdown/CHANGELOG.md
@@ -4,6 +4,23 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## [Unreleased][unreleased]
 
+## [5.1.1] - 2023-07-12
+
+### Fixed
+
+- Fixed `<pre>` tags with attributes not being parsed (#215, #238)
+- Fixed missing type checks and coercions
+
+## [5.1.0] - 2022-03-02
+
+### Changed
+
+ - Changed horizontal rule style (#218, #219)
+
+### Fixed
+
+ - Fixed `Element::getValue()` not handling possible nulls
+
 ## [5.0.2] - 2021-11-06
 
 ### Fixed
@@ -305,7 +322,9 @@ not ideally set, so this releases fixes that. Moving forwards this should reduce
 ### Added
  - Initial release
 
-[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/5.0.2...master
+[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/5.1.1...master
+[5.1.1]: https://github.com/thephpleague/html-to-markdown/compare/5.1.0...5.1.1
+[5.1.0]: https://github.com/thephpleague/html-to-markdown/compare/5.0.2...5.1.0
 [5.0.2]: https://github.com/thephpleague/html-to-markdown/compare/5.0.1...5.0.2
 [5.0.1]: https://github.com/thephpleague/html-to-markdown/compare/5.0.0...5.0.1
 [5.0.0]: https://github.com/thephpleague/html-to-markdown/compare/4.10.0...5.0.0

diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json
@@ -36,16 +36,33 @@
     },
     "require-dev": {
         "mikehaertl/php-shellcommand": "^1.1.0",
-        "phpstan/phpstan": "^0.12.82",
+        "phpstan/phpstan": "^1.8.8",
         "phpunit/phpunit": "^8.5 || ^9.2",
         "scrutinizer/ocular": "^1.6",
-        "unleashedtech/php-coding-standard": "^2.7",
-        "vimeo/psalm": "^4.6"
+        "unleashedtech/php-coding-standard": "^2.7 || ^3.0",
+        "vimeo/psalm": "^4.22 || ^5.0"
     },
     "bin": ["bin/html-to-markdown"],
+    "scripts": {
+        "phpcs": "phpcs",
+        "phpstan": "phpstan analyse",
+        "phpunit": "phpunit --no-coverage",
+        "psalm": "psalm --stats",
+        "test": [
+            "@phpcs",
+            "@phpstan",
+            "@psalm",
+            "@phpunit"
+        ]
+    },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.1-dev"
+            "dev-master": "5.2-dev"
+        }
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     }
 }
diff --git a/vendor/league/html-to-markdown/psalm.xml b/vendor/league/html-to-markdown/psalm.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <psalm
-    totallyTyped="false"
     errorLevel="3"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

diff --git a/vendor/league/html-to-markdown/src/Coerce.php b/vendor/league/html-to-markdown/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');
+        }
+    }
+}
diff --git a/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php
@@ -10,7 +10,7 @@ class HorizontalRuleConverter implements ConverterInterface
 {
     public function convert(ElementInterface $element): string
     {
-        return "- - - - - -\n\n";
+        return "---\n\n";
     }
 
     /**

diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/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/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/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          = $this->config->getOption('list_item_style', '-');
-            $listItemStyleAlternate = $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;
             }

diff --git a/vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php b/vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php
@@ -11,7 +11,9 @@ class PreformattedConverter implements ConverterInterface
     public function convert(ElementInterface $element): string
     {
         $preContent = \html_entity_decode($element->getChildrenAsString());
-        $preContent = \str_replace(['<pre>', '</pre>'], '', $preContent);
+        $preContent = \preg_replace('/<pre\b[^>]*>/', '', $preContent);
+        \assert($preContent !== null);
+        $preContent = \str_replace('</pre>', '', $preContent);
 
         /*
          * Checking for the code tag.

diff --git a/vendor/league/html-to-markdown/src/Converter/TableConverter.php b/vendor/league/html-to-markdown/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('|', $this->config->getOption('table_pipe_escape') ?? '\|', $value);
+                $value = \str_replace('|', Coerce::toString($this->config->getOption('table_pipe_escape') ?? '\|'), $value);
 
                 return '| ' . \trim($value) . ' ';
             case 'thead':

diff --git a/vendor/league/html-to-markdown/src/Element.php b/vendor/league/html-to-markdown/src/Element.php
@@ -63,7 +63,7 @@ public function getTagName(): string
 
     public function getValue(): string
     {
-        return $this->node->nodeValue;
+        return $this->node->nodeValue ?? '';
     }
 
     public function hasParent(): bool
@@ -98,6 +98,8 @@ public function getChildren(): array
     {
         $ret = [];
         foreach ($this->node->childNodes as $node) {
+            /** @psalm-suppress RedundantCondition */
+            \assert($node instanceof \DOMNode);
             $ret[] = new self($node);
         }
 
@@ -116,7 +118,7 @@ public function getNext(): ?ElementInterface
         return $this->nextCached;
     }
 
-    private function getNextNode(\DomNode $node, bool $checkChildren = true): ?\DomNode
+    private function getNextNode(\DOMNode $node, bool $checkChildren = true): ?\DOMNode
     {
         if ($checkChildren && $node->firstChild) {
             return $node->firstChild;
@@ -142,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;
             }

diff --git a/vendor/league/html-to-markdown/src/HtmlConverter.php b/vendor/league/html-to-markdown/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(' ', Coerce::toString($this->getConfig()->getOption('remove_nodes') ?? ''));
         if (\in_array($tag, $tagsToRemove, true)) {
             return '';
         }