diff options
author | Mario <mario@mariovavti.com> | 2022-02-11 09:21:19 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2022-02-11 09:21:19 +0000 |
commit | 6d8aabab2347feabdd804b609dcd4513f09f78d4 (patch) | |
tree | 9bea1aba6caa85084ec664f498c445bb92d9457c /vendor/michelf/php-markdown | |
parent | e74359fcfe4d97efe72a811b45526a69edae3893 (diff) | |
download | volse-hubzilla-6d8aabab2347feabdd804b609dcd4513f09f78d4.tar.gz volse-hubzilla-6d8aabab2347feabdd804b609dcd4513f09f78d4.tar.bz2 volse-hubzilla-6d8aabab2347feabdd804b609dcd4513f09f78d4.zip |
composer libs minor version updates
Diffstat (limited to 'vendor/michelf/php-markdown')
9 files changed, 63 insertions, 32 deletions
diff --git a/vendor/michelf/php-markdown/.travis.yml b/vendor/michelf/php-markdown/.travis.yml index d46714787..440045be3 100644 --- a/vendor/michelf/php-markdown/.travis.yml +++ b/vendor/michelf/php-markdown/.travis.yml @@ -1,25 +1,29 @@ language: php -sudo: false +matrix: + include: + - php: hhvm-3.18 + dist: trusty + - php: 5.3 + dist: precise + - php: 5.4 + dist: trusty + - php: 5.5 + dist: trusty + - php: 5.6 + dist: xenial + - php: 7.0 + dist: xenial + - php: 7.1 + dist: bionic + - php: 7.2 + dist: bionic + - php: 7.3 + dist: bionic + - php: 7.4 + dist: bionic -cache: - directories: - - $HOME/.composer/ - -# Run tests against all these PHP versions -# TODO: When it becomes possible in TravisCI, switch 7.4snapshot to plain 7.4 -php: - - 5.4 - - 5.5 - - 5.6 - - 7.0 - - 7.1 - - 7.2 - - 7.3 - - 7.4snapshot - - hhvm - -before_script: +install: - composer install --prefer-dist script: diff --git a/vendor/michelf/php-markdown/License.md b/vendor/michelf/php-markdown/License.md index 16bbd5400..25d1e16b6 100644 --- a/vendor/michelf/php-markdown/License.md +++ b/vendor/michelf/php-markdown/License.md @@ -1,5 +1,5 @@ PHP Markdown Lib -Copyright (c) 2004-2019 Michel Fortin +Copyright (c) 2004-2021 Michel Fortin <https://michelf.ca/> All rights reserved. diff --git a/vendor/michelf/php-markdown/Michelf/Markdown.php b/vendor/michelf/php-markdown/Michelf/Markdown.php index 43b3c79e8..f644080c7 100644 --- a/vendor/michelf/php-markdown/Michelf/Markdown.php +++ b/vendor/michelf/php-markdown/Michelf/Markdown.php @@ -4,7 +4,7 @@ * * @package php-markdown * @author Michel Fortin <michel.fortin@michelf.com> - * @copyright 2004-2019 Michel Fortin <https://michelf.com/projects/php-markdown/> + * @copyright 2004-2021 Michel Fortin <https://michelf.com/projects/php-markdown/> * @copyright (Original Markdown) 2004-2006 John Gruber <https://daringfireball.net/projects/markdown/> */ @@ -18,7 +18,7 @@ class Markdown implements MarkdownInterface { * Define the package version * @var string */ - const MARKDOWNLIB_VERSION = "1.9.0"; + const MARKDOWNLIB_VERSION = "1.9.1"; /** * Simple function interface - Initialize the parser and return the result @@ -354,7 +354,7 @@ class Markdown implements MarkdownInterface { $block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'. 'script|noscript|style|form|fieldset|iframe|math|svg|'. 'article|section|nav|aside|hgroup|header|footer|'. - 'figure'; + 'figure|details|summary'; // Regular expression for the content of a block tag. $nested_tags_level = 4; diff --git a/vendor/michelf/php-markdown/Michelf/MarkdownExtra.php b/vendor/michelf/php-markdown/Michelf/MarkdownExtra.php index 62d25f38e..888f5f28d 100644 --- a/vendor/michelf/php-markdown/Michelf/MarkdownExtra.php +++ b/vendor/michelf/php-markdown/Michelf/MarkdownExtra.php @@ -4,7 +4,7 @@ * * @package php-markdown * @author Michel Fortin <michel.fortin@michelf.com> - * @copyright 2004-2019 Michel Fortin <https://michelf.com/projects/php-markdown/> + * @copyright 2004-2021 Michel Fortin <https://michelf.com/projects/php-markdown/> * @copyright (Original Markdown) 2004-2006 John Gruber <https://daringfireball.net/projects/markdown/> */ @@ -345,7 +345,7 @@ class MarkdownExtra extends \Michelf\Markdown { * Tags that are always treated as block tags * @var string */ - protected $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption|figure'; + protected $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption|figure|details|summary'; /** * Tags treated as block tags only if the opening tag is alone on its line @@ -932,6 +932,7 @@ class MarkdownExtra extends \Michelf\Markdown { protected function _doAnchors_inline_callback($matches) { $link_text = $this->runSpanGamut($matches[2]); $url = $matches[3] === '' ? $matches[4] : $matches[3]; + $title_quote =& $matches[6]; $title =& $matches[7]; $attr = $this->doExtraAttributes("a", $dummy =& $matches[8]); @@ -944,7 +945,7 @@ class MarkdownExtra extends \Michelf\Markdown { $url = $this->encodeURLAttribute($url); $result = "<a href=\"$url\""; - if (isset($title)) { + if (isset($title) && $title_quote) { $title = $this->encodeAttribute($title); $result .= " title=\"$title\""; } @@ -1056,13 +1057,14 @@ class MarkdownExtra extends \Michelf\Markdown { protected function _doImages_inline_callback($matches) { $alt_text = $matches[2]; $url = $matches[3] === '' ? $matches[4] : $matches[3]; + $title_quote =& $matches[6]; $title =& $matches[7]; $attr = $this->doExtraAttributes("img", $dummy =& $matches[8]); $alt_text = $this->encodeAttribute($alt_text); $url = $this->encodeURLAttribute($url); $result = "<img src=\"$url\" alt=\"$alt_text\""; - if (isset($title)) { + if (isset($title) && $title_quote) { $title = $this->encodeAttribute($title); $result .= " title=\"$title\""; // $title already quoted } diff --git a/vendor/michelf/php-markdown/Michelf/MarkdownInterface.php b/vendor/michelf/php-markdown/Michelf/MarkdownInterface.php index 006452445..32069dff2 100644 --- a/vendor/michelf/php-markdown/Michelf/MarkdownInterface.php +++ b/vendor/michelf/php-markdown/Michelf/MarkdownInterface.php @@ -4,7 +4,7 @@ * * @package php-markdown * @author Michel Fortin <michel.fortin@michelf.com> - * @copyright 2004-2019 Michel Fortin <https://michelf.com/projects/php-markdown/> + * @copyright 2004-2021 Michel Fortin <https://michelf.com/projects/php-markdown/> * @copyright (Original Markdown) 2004-2006 John Gruber <https://daringfireball.net/projects/markdown/> */ diff --git a/vendor/michelf/php-markdown/Readme.md b/vendor/michelf/php-markdown/Readme.md index e1eb30660..1a0ee06eb 100644 --- a/vendor/michelf/php-markdown/Readme.md +++ b/vendor/michelf/php-markdown/Readme.md @@ -1,7 +1,7 @@ PHP Markdown ============ -PHP Markdown Lib 1.9.0 - 1 Dec 2019 +PHP Markdown Lib 1.9.1 - 23 Nov 2021 by Michel Fortin <https://michelf.ca/> @@ -183,6 +183,17 @@ PHP Markdown, please visit [michelf.ca/donate]. Version History --------------- +PHP Markdown Lib 1.9.1 (23 Nov 2021) + +* Now treating `<details>` and `<summary>` as block level so they don't + get wrapped in `<p>`. + (Thanks to Thomas Hochstein for the fix.) + +* Fix for unintended blank title attribute when adding supplementary attributes + to a link in Markdown Extra. + (Thanks to Richie Black for the fix.) + + PHP Markdown Lib 1.9.0 (1 Dec 2019) * Added `fn_backlink_label` configuration variable to put some text in the @@ -399,7 +410,7 @@ Copyright and License --------------------- PHP Markdown Lib -Copyright (c) 2004-2019 Michel Fortin +Copyright (c) 2004-2021 Michel Fortin <https://michelf.ca/> All rights reserved. diff --git a/vendor/michelf/php-markdown/test/helpers/MarkdownTestHelper.php b/vendor/michelf/php-markdown/test/helpers/MarkdownTestHelper.php index 545dabd12..ffca0c969 100644 --- a/vendor/michelf/php-markdown/test/helpers/MarkdownTestHelper.php +++ b/vendor/michelf/php-markdown/test/helpers/MarkdownTestHelper.php @@ -20,7 +20,7 @@ class MarkdownTestHelper RecursiveRegexIterator::GET_MATCH ); - $dataValues = []; + $dataValues = array(); /** @var SplFileInfo $inputFile */ foreach ($regexIterator as $inputFiles) { @@ -31,7 +31,7 @@ class MarkdownTestHelper $expectedHtmlPath = substr($inputMarkdownPath, 0, -4) . 'html'; $xhtml = false; } - $dataValues[] = [$inputMarkdownPath, $expectedHtmlPath, $xhtml]; + $dataValues[] = array($inputMarkdownPath, $expectedHtmlPath, $xhtml); } } diff --git a/vendor/michelf/php-markdown/test/resources/php-markdown.mdtest/Inline HTML (Simple).html b/vendor/michelf/php-markdown/test/resources/php-markdown.mdtest/Inline HTML (Simple).html index 1451d625b..efb6763cd 100644 --- a/vendor/michelf/php-markdown/test/resources/php-markdown.mdtest/Inline HTML (Simple).html +++ b/vendor/michelf/php-markdown/test/resources/php-markdown.mdtest/Inline HTML (Simple).html @@ -14,6 +14,13 @@ <hr class="foo" id="bar" > +<p>Details and Summary:</p> + +<details> + <summary>Some details</summary> + <p>More info about the details.</p> +</details> + <p>Regression:</p> <pre> diff --git a/vendor/michelf/php-markdown/test/resources/php-markdown.mdtest/Inline HTML (Simple).text b/vendor/michelf/php-markdown/test/resources/php-markdown.mdtest/Inline HTML (Simple).text index 359b622fd..7b67dde68 100644 --- a/vendor/michelf/php-markdown/test/resources/php-markdown.mdtest/Inline HTML (Simple).text +++ b/vendor/michelf/php-markdown/test/resources/php-markdown.mdtest/Inline HTML (Simple).text @@ -14,6 +14,13 @@ Hr's: <hr class="foo" id="bar" > +Details and Summary: + +<details> + <summary>Some details</summary> + <p>More info about the details.</p> +</details> + Regression: <pre> |