diff --git a/lib/composer.json b/lib/composer.json index b7a466bc0f..bfb0554b5e 100644 --- a/lib/composer.json +++ b/lib/composer.json @@ -35,9 +35,17 @@ }, "extra": { "patches": { + "erusev/parsedown": { + "Add namespace to Parsedown class": "patches/parsedown-add-namespace.patch" + }, "gorhill/php-fine-diff": { "Fix class reference to work with namespaces": "patches/finediff-fix-class-reference.patch" } } + }, + "autoload": { + "psr-4": { + "Vendor\\Parsedown\\": "vendor/erusev/parsedown/" + } } } diff --git a/lib/composer.lock b/lib/composer.lock index e176127db5..f4881ed84b 100644 --- a/lib/composer.lock +++ b/lib/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2fa0dc942e82ae977b4bf8054f8d603c", + "content-hash": "062e871a7ba56633ed9dffe989091156", "packages": [ { "name": "box/spout", diff --git a/lib/parsedown/parsedown.class.php b/lib/parsedown/parsedown.class.php index f954e67bd7..c2cb48ea4a 100644 --- a/lib/parsedown/parsedown.class.php +++ b/lib/parsedown/parsedown.class.php @@ -3,7 +3,7 @@ require_once dirname(__FILE__, 2) . '/base/delegate/delegate.class.php'; class parsedown extends baseDelegate { - protected static $className = 'Parsedown'; + protected static $className = 'Vendor\Parsedown\Parsedown'; public function __construct() { diff --git a/lib/patches/parsedown-add-namespace.patch b/lib/patches/parsedown-add-namespace.patch new file mode 100644 index 0000000000..03754bfc8c --- /dev/null +++ b/lib/patches/parsedown-add-namespace.patch @@ -0,0 +1,8 @@ +--- a/vendor/erusev/parsedown/Parsedown.php ++++ b/vendor/erusev/parsedown/Parsedown.php +@@ -1,4 +1,5 @@ + array($vendorDir . '/phpseclib/phpseclib/phpseclib'), 'cweagans\\Composer\\' => array($vendorDir . '/cweagans/composer-patches/src'), 'WpOrg\\Requests\\' => array($vendorDir . '/rmccue/requests/src'), + 'Vendor\\Parsedown\\' => array($vendorDir . '/erusev/parsedown'), 'Symfony\\Component\\Finder\\' => array($vendorDir . '/symfony/finder'), 'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'), 'PhpOffice\\PhpWord\\' => array($vendorDir . '/phpoffice/phpword/src/PhpWord'), diff --git a/lib/vendor/composer/autoload_static.php b/lib/vendor/composer/autoload_static.php index 98f378ce2d..4c5050cea4 100644 --- a/lib/vendor/composer/autoload_static.php +++ b/lib/vendor/composer/autoload_static.php @@ -86,6 +86,10 @@ class ComposerStaticIniteb70fe9ec81c9f50588dedfb7a386792 array ( 'WpOrg\\Requests\\' => 15, ), + 'V' => + array ( + 'Vendor\\Parsedown\\' => 17, + ), 'S' => array ( 'Symfony\\Component\\Finder\\' => 25, @@ -140,6 +144,10 @@ class ComposerStaticIniteb70fe9ec81c9f50588dedfb7a386792 array ( 0 => __DIR__ . '/..' . '/rmccue/requests/src', ), + 'Vendor\\Parsedown\\' => + array ( + 0 => __DIR__ . '/..' . '/erusev/parsedown', + ), 'Symfony\\Component\\Finder\\' => array ( 0 => __DIR__ . '/..' . '/symfony/finder', diff --git a/lib/vendor/composer/installed.json b/lib/vendor/composer/installed.json index dff52cf419..1552b4daf7 100644 --- a/lib/vendor/composer/installed.json +++ b/lib/vendor/composer/installed.json @@ -218,6 +218,11 @@ }, "time": "2019-12-30T22:54:17+00:00", "type": "library", + "extra": { + "patches_applied": { + "Add namespace to Parsedown class": "patches/parsedown-add-namespace.patch" + } + }, "installation-source": "dist", "autoload": { "psr-0": { diff --git a/lib/vendor/composer/installed.php b/lib/vendor/composer/installed.php index 142f851c6e..8a022fa5d4 100644 --- a/lib/vendor/composer/installed.php +++ b/lib/vendor/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '5f83c88b4d1af794b335f1cab1e918fe88526d5f', + 'reference' => 'a25da45b71dd97cd376b604d92a798a231173c51', 'name' => '__root__', 'dev' => true, ), @@ -16,7 +16,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '5f83c88b4d1af794b335f1cab1e918fe88526d5f', + 'reference' => 'a25da45b71dd97cd376b604d92a798a231173c51', 'dev_requirement' => false, ), 'box/spout' => array( diff --git a/lib/vendor/erusev/parsedown/PATCHES.txt b/lib/vendor/erusev/parsedown/PATCHES.txt new file mode 100644 index 0000000000..a509657ac3 --- /dev/null +++ b/lib/vendor/erusev/parsedown/PATCHES.txt @@ -0,0 +1,7 @@ +This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches) +Patches applied to this directory: + +Add namespace to Parsedown class +Source: patches/parsedown-add-namespace.patch + + diff --git a/lib/vendor/erusev/parsedown/Parsedown.php b/lib/vendor/erusev/parsedown/Parsedown.php index 1b9d6d5bc2..0d96df3da5 100644 --- a/lib/vendor/erusev/parsedown/Parsedown.php +++ b/lib/vendor/erusev/parsedown/Parsedown.php @@ -1,4 +1,5 @@