Updated composer packages

slackero · Aug 24, 2024 · 928895d · 928895d
1 parent 61113d2
commit 928895d
Show file tree

Hide file tree

Showing 16 changed files with 130 additions and 80 deletions.
diff --git a/composer.json b/composer.json
@@ -11,13 +11,13 @@
         "algo26-matthias/idna-convert": "^v4.0.2",
         "enshrined/svg-sanitize": "^0.19.0",
         "netcarver/textile": "v4.1.1",
-        "league/commonmark": "^2.5.1",
+        "league/commonmark": "^2.5.3",
         "ezyang/htmlpurifier": "^v4.17.0",
         "openpsa/universalfeedcreator": "^v1.9.0",
         "phpmailer/phpmailer": "^v6.9.1",
         "phpoffice/phpspreadsheet": "^2.2.0",
         "simplepie/simplepie": "@dev",
-        "html2text/html2text": "^4.3.1",
+        "html2text/html2text": "^4.3.2",
         "php81_bc/strftime": "^0.7.5",
         "symfony/polyfill-php72": "v1.30.0",
         "symfony/polyfill-php73": "v1.30.0",

diff --git a/include/inc_lib/revision/revision.php b/include/inc_lib/revision/revision.php
@@ -9,6 +9,6 @@
  *
  **/
 
-const PHPWCMS_VERSION = '1.10.5-dev';
-const PHPWCMS_RELEASE_DATE = '2024/08/08';
+const PHPWCMS_VERSION = '1.10.6-dev';
+const PHPWCMS_RELEASE_DATE = '2024/08/24';
 const PHPWCMS_REVISION = '554';
diff --git a/include/vendor/composer/autoload_psr4.php b/include/vendor/composer/autoload_psr4.php
@@ -25,7 +25,7 @@
     'Matrix\\' => array($vendorDir . '/markbaker/matrix/classes/src'),
     'League\\Config\\' => array($vendorDir . '/league/config/src'),
     'League\\CommonMark\\' => array($vendorDir . '/league/commonmark/src'),
-    'Html2Text\\' => array($vendorDir . '/html2text/html2text/src', $vendorDir . '/html2text/html2text/test'),
+    'Html2Text\\' => array($vendorDir . '/html2text/html2text/src'),
     'Dflydev\\DotAccessData\\' => array($vendorDir . '/dflydev/dot-access-data/src'),
     'Complex\\' => array($vendorDir . '/markbaker/complex/classes/src'),
     'Algo26\\IdnaConvert\\' => array($vendorDir . '/algo26-matthias/idna-convert/src'),

diff --git a/include/vendor/composer/autoload_static.php b/include/vendor/composer/autoload_static.php
@@ -160,7 +160,6 @@ class ComposerStaticInit4b55c751baaf47512d22ca0465e5183a
         'Html2Text\\' => 
         array (
             0 => __DIR__ . '/..' . '/html2text/html2text/src',
-            1 => __DIR__ . '/..' . '/html2text/html2text/test',
         ),
         'Dflydev\\DotAccessData\\' => 
         array (

diff --git a/include/vendor/composer/installed.json b/include/vendor/composer/installed.json
@@ -251,35 +251,32 @@
         },
         {
             "name": "html2text/html2text",
-            "version": "4.3.1",
-            "version_normalized": "4.3.1.0",
+            "version": "4.3.2",
+            "version_normalized": "4.3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mtibben/html2text.git",
-                "reference": "61ad68e934066a6f8df29a3d23a6460536d0855c"
+                "reference": "3b443cbe302b52eb5806a21a9dbd79524203970a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mtibben/html2text/zipball/61ad68e934066a6f8df29a3d23a6460536d0855c",
-                "reference": "61ad68e934066a6f8df29a3d23a6460536d0855c",
+                "url": "https://api.github.com/repos/mtibben/html2text/zipball/3b443cbe302b52eb5806a21a9dbd79524203970a",
+                "reference": "3b443cbe302b52eb5806a21a9dbd79524203970a",
                 "shasum": ""
             },
             "require-dev": {
-                "phpunit/phpunit": "~4"
+                "phpunit/phpunit": "~4|^9.0"
             },
             "suggest": {
                 "ext-mbstring": "For best performance",
                 "symfony/polyfill-mbstring": "If you can't install ext-mbstring"
             },
-            "time": "2020-04-16T23:44:31+00:00",
+            "time": "2024-08-20T02:43:29+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
-                    "Html2Text\\": [
-                        "src/",
-                        "test/"
-                    ]
+                    "Html2Text\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -289,7 +286,7 @@
             "description": "Converts HTML to formatted plain text",
             "support": {
                 "issues": "https://github.com/mtibben/html2text/issues",
-                "source": "https://github.com/mtibben/html2text/tree/4.3.1"
+                "source": "https://github.com/mtibben/html2text/tree/4.3.2"
             },
             "install-path": "../html2text/html2text"
         },
@@ -335,17 +332,17 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.5.1",
-            "version_normalized": "2.5.1.0",
+            "version": "2.5.3",
+            "version_normalized": "2.5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "ac815920de0eff6de947eac0a6a94e5ed0fb147c"
+                "reference": "b650144166dfa7703e62a22e493b853b58d874b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/ac815920de0eff6de947eac0a6a94e5ed0fb147c",
-                "reference": "ac815920de0eff6de947eac0a6a94e5ed0fb147c",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0",
+                "reference": "b650144166dfa7703e62a22e493b853b58d874b0",
                 "shasum": ""
             },
             "require": {
@@ -358,8 +355,8 @@
             },
             "require-dev": {
                 "cebe/markdown": "^1.0",
-                "commonmark/cmark": "0.31.0",
-                "commonmark/commonmark.js": "0.31.0",
+                "commonmark/cmark": "0.31.1",
+                "commonmark/commonmark.js": "0.31.1",
                 "composer/package-versions-deprecated": "^1.8",
                 "embed/embed": "^4.4",
                 "erusev/parsedown": "^1.0",
@@ -378,7 +375,7 @@
             "suggest": {
                 "symfony/yaml": "v2.3+ required if using the Front Matter extension"
             },
-            "time": "2024-07-24T12:52:09+00:00",
+            "time": "2024-08-16T11:46:16+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {

diff --git a/include/vendor/composer/installed.php b/include/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '660b1bbff9a9d807539441cb4eeb3d705ccf601b',
+        'reference' => '61113d2bee2ee3f483bae74d679b419210410db4',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '660b1bbff9a9d807539441cb4eeb3d705ccf601b',
+            'reference' => '61113d2bee2ee3f483bae74d679b419210410db4',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../../',
             'aliases' => array(),
@@ -56,9 +56,9 @@
             'dev_requirement' => false,
         ),
         'html2text/html2text' => array(
-            'pretty_version' => '4.3.1',
-            'version' => '4.3.1.0',
-            'reference' => '61ad68e934066a6f8df29a3d23a6460536d0855c',
+            'pretty_version' => '4.3.2',
+            'version' => '4.3.2.0',
+            'reference' => '3b443cbe302b52eb5806a21a9dbd79524203970a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../html2text/html2text',
             'aliases' => array(),
@@ -74,9 +74,9 @@
             'dev_requirement' => false,
         ),
         'league/commonmark' => array(
-            'pretty_version' => '2.5.1',
-            'version' => '2.5.1.0',
-            'reference' => 'ac815920de0eff6de947eac0a6a94e5ed0fb147c',
+            'pretty_version' => '2.5.3',
+            'version' => '2.5.3.0',
+            'reference' => 'b650144166dfa7703e62a22e493b853b58d874b0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../league/commonmark',
             'aliases' => array(),

diff --git a/include/vendor/html2text/html2text/.github/workflows/ci.yml b/include/vendor/html2text/html2text/.github/workflows/ci.yml
@@ -0,0 +1,38 @@
+name: CI Tests
+on: [push, pull_request]
+
+jobs:
+  PHPUnit:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+        php:
+          - 5.4
+          - 5.5
+          - 5.6
+          - 7.0
+          - 7.1
+          - 7.2
+          - 7.3
+          - 7.4
+          - 8.0
+          - 8.1
+          - 8.2
+          - 8.3
+          - 8.4
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+
+      - name: Install dependencies
+        run: composer install
+
+      - name: Run PHPUnit
+        run: vendor/bin/phpunit
diff --git a/include/vendor/html2text/html2text/.travis.yml b/include/vendor/html2text/html2text/.travis.yml
diff --git a/include/vendor/html2text/html2text/README.md b/include/vendor/html2text/html2text/README.md
@@ -2,7 +2,7 @@
 
 A PHP library for converting HTML to formatted plain text.
 
-[![Build Status](https://travis-ci.org/mtibben/html2text.png?branch=master)](https://travis-ci.org/mtibben/html2text)
+[![Build status](https://github.com/mtibben/html2text/actions/workflows/ci.yml/badge.svg)](https://github.com/mtibben/html2text/actions/workflows/ci.yml)
 
 ## Installing
 

diff --git a/include/vendor/html2text/html2text/composer.json b/include/vendor/html2text/html2text/composer.json
@@ -4,13 +4,20 @@
     "type": "library",
     "license": "GPL-2.0-or-later",
     "autoload": {
-        "psr-4": { "Html2Text\\": ["src/", "test/"] }
+        "psr-4": {
+            "Html2Text\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Html2Text\\": "test/"
+        }
     },
     "require-dev": {
-        "phpunit/phpunit": "~4"
+        "phpunit/phpunit": "~4|^9.0"
     },
     "suggest": {
         "ext-mbstring": "For best performance",
         "symfony/polyfill-mbstring": "If you can't install ext-mbstring"
     }
-}
+}
diff --git a/include/vendor/html2text/html2text/phpunit.xml.dist b/include/vendor/html2text/html2text/phpunit.xml.dist
@@ -6,7 +6,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="test/bootstrap.php"
 >
     <testsuites>

diff --git a/include/vendor/html2text/html2text/src/Html2Text.php b/include/vendor/html2text/html2text/src/Html2Text.php
@@ -236,16 +236,19 @@ private function legacyConstruct($html = '', $fromFile = false, array $options =
      */
     public function __construct($html = '', $options = array())
     {
+        $this->htmlFuncFlags = (PHP_VERSION_ID < 50400)
+            ? ENT_QUOTES
+            : ENT_QUOTES | ENT_HTML5;
+
         // for backwards compatibility
         if (!is_array($options)) {
-            return call_user_func_array(array($this, 'legacyConstruct'), func_get_args());
+            // phpcs:ignore (PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.NeedsInspection
+            call_user_func_array(array($this, 'legacyConstruct'), func_get_args());
+            return;
         }
 
         $this->html = $html;
         $this->options = array_merge($this->options, $options);
-        $this->htmlFuncFlags = (PHP_VERSION_ID < 50400)
-            ? ENT_COMPAT
-            : ENT_COMPAT | ENT_HTML5;
     }
 
     /**
@@ -351,7 +354,11 @@ protected function doConvert()
     {
         $this->linkList = array();
 
-        $text = trim($this->html);
+        if ($this->html === null) {
+            $text = '';
+        } else {
+            $text = trim($this->html);
+        }
 
         $this->converter($text);
 
@@ -389,6 +396,9 @@ protected function converter(&$text)
         $text = preg_replace("/[\n]{3,}/", "\n\n", $text);
 
         // remove leading empty lines (can be produced by eg. P tag on the beginning)
+        if ($text === null) {
+            $text = '';
+        }
         $text = ltrim($text, "\n");
 
         if ($this->options['width'] > 0) {
@@ -417,7 +427,7 @@ protected function buildlinkList($link, $display, $linkOverride = null)
         }
 
         // Ignored link types
-        if (preg_match('!^(javascript:|mailto:|#)!i', html_entity_decode($link))) {
+        if (preg_match('!^(javascript:|mailto:|#)!i', html_entity_decode($link, $this->htmlFuncFlags, self::ENCODING))) {
             return $display;
         }
 

diff --git a/include/vendor/league/commonmark/CHANGELOG.md b/include/vendor/league/commonmark/CHANGELOG.md
@@ -6,6 +6,23 @@ Updates should follow the [Keep a CHANGELOG](https://keepachangelog.com/) princi
 
 ## [Unreleased][unreleased]
 
+## [2.5.3] - 2024-08-16
+
+### Changed
+
+- Made compatible with CommonMark spec 0.31.1, including:
+  - Remove `source`, add `search` to list of recognized block tags
+
+## [2.5.2] - 2024-08-14
+
+### Changed
+
+- Boolean attributes now require an explicit `true` value (#1040)
+
+### Fixed
+
+- Fixed regression where text could be misinterpreted as an attribute (#1040)
+
 ## [2.5.1] - 2024-07-24
 
 ### Fixed
@@ -614,8 +631,10 @@ No changes were introduced since the previous release.
     - Alternative 1: Use `CommonMarkConverter` or `GithubFlavoredMarkdownConverter` if you don't need to customize the environment
     - Alternative 2: Instantiate a new `Environment` and add the necessary extensions yourself
 
-[unreleased]: https://github.com/thephpleague/commonmark/compare/2.5.1....main
-[2.5.1]: https://github.com/thephpleague/commonmark/compare/2.5.0....2.5.1
+[unreleased]: https://github.com/thephpleague/commonmark/compare/2.5.3...main
+[2.5.3]: https://github.com/thephpleague/commonmark/compare/2.5.2...2.5.3
+[2.5.2]: https://github.com/thephpleague/commonmark/compare/2.5.1...2.5.2
+[2.5.1]: https://github.com/thephpleague/commonmark/compare/2.5.0...2.5.1
 [2.5.0]: https://github.com/thephpleague/commonmark/compare/2.4.4...2.5.0
 [2.4.4]: https://github.com/thephpleague/commonmark/compare/2.4.3...2.4.4
 [2.4.3]: https://github.com/thephpleague/commonmark/compare/2.4.2...2.4.3