aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/league
diff options
context:
space:
mode:
authorM. Dent <dentm42@gmail.com>2019-09-23 19:18:53 +0200
committerM. Dent <dentm42@gmail.com>2019-09-23 19:18:53 +0200
commit1e924a8530e8d82c8926f59ef14914fbd5aea2c6 (patch)
tree88c351be326f2807f91dacbc4b66ab9973f2f6fa /vendor/league
parent23995ccb07780c37b6867ad84ca8ce6ff6b943a2 (diff)
parentefec0af394df5ed4674d9cba8945be17de475388 (diff)
downloadvolse-hubzilla-1e924a8530e8d82c8926f59ef14914fbd5aea2c6.tar.gz
volse-hubzilla-1e924a8530e8d82c8926f59ef14914fbd5aea2c6.tar.bz2
volse-hubzilla-1e924a8530e8d82c8926f59ef14914fbd5aea2c6.zip
Merge branch 'cherry-pick-e4336578' into 'dev'
composer update vendor/league/html-to-markdown/.github/ See merge request hubzilla/core!1734
Diffstat (limited to 'vendor/league')
-rw-r--r--vendor/league/html-to-markdown/.github/FUNDING.yml1
-rw-r--r--vendor/league/html-to-markdown/.github/stale.yml18
-rw-r--r--vendor/league/html-to-markdown/CHANGELOG.md11
-rw-r--r--vendor/league/html-to-markdown/src/Converter/HeaderConverter.php2
-rw-r--r--vendor/league/html-to-markdown/src/Converter/LinkConverter.php3
5 files changed, 33 insertions, 2 deletions
diff --git a/vendor/league/html-to-markdown/.github/FUNDING.yml b/vendor/league/html-to-markdown/.github/FUNDING.yml
new file mode 100644
index 000000000..09cdff5da
--- /dev/null
+++ b/vendor/league/html-to-markdown/.github/FUNDING.yml
@@ -0,0 +1 @@
+patreon: colinodell
diff --git a/vendor/league/html-to-markdown/.github/stale.yml b/vendor/league/html-to-markdown/.github/stale.yml
new file mode 100644
index 000000000..bb7c5e94a
--- /dev/null
+++ b/vendor/league/html-to-markdown/.github/stale.yml
@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 90
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 30
+# Issues with these labels will never be considered stale
+exemptLabels:
+ - pinned
+ - on hold
+ - security
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+ This issue has been automatically marked as stale because it has not had
+ recent activity. It will be closed if no further activity occurs. Thank you
+ for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
diff --git a/vendor/league/html-to-markdown/CHANGELOG.md b/vendor/league/html-to-markdown/CHANGELOG.md
index e1893be9a..8f131fc46 100644
--- a/vendor/league/html-to-markdown/CHANGELOG.md
+++ b/vendor/league/html-to-markdown/CHANGELOG.md
@@ -4,6 +4,14 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
## [Unreleased][unreleased]
+## [4.8.2] - 2019-08-02
+### Fixed
+ - Fixed headers not being placed onto a new line in some cases (#172)
+ - Fixed handling of links containing spaces (#175)
+
+### Removed
+ - Removed support for HHVM
+
## [4.8.1] - 2018-12-24
### Added
- Added support for PHP 7.3
@@ -243,7 +251,8 @@ 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/4.8.1...master
+[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.8.2...master
+[4.8.2]: https://github.com/thephpleague/html-to-markdown/compare/4.8.1...4.8.2
[4.8.1]: https://github.com/thephpleague/html-to-markdown/compare/4.8.0...4.8.1
[4.8.0]: https://github.com/thephpleague/html-to-markdown/compare/4.7.0...4.8.0
[4.7.0]: https://github.com/thephpleague/html-to-markdown/compare/4.6.2...4.7.0
diff --git a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php
index 05d4fe81e..353833263 100644
--- a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php
@@ -35,7 +35,7 @@ class HeaderConverter implements ConverterInterface, ConfigurationAwareInterface
$style = $this->config->getOption('header_style', self::STYLE_SETEXT);
if (strlen($element->getValue()) === 0) {
- return '';
+ return "\n";
}
if (($level === 1 || $level === 2) && !$element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) {
diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php
index c82b70e97..81c18b65f 100644
--- a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php
@@ -24,6 +24,9 @@ class LinkConverter implements ConverterInterface
} elseif ($href === 'mailto:' . $text && $this->isValidEmail($text)) {
$markdown = '<' . $text . '>';
} else {
+ if (stristr($href, ' ')) {
+ $href = '<'.$href.'>';
+ }
$markdown = '[' . $text . '](' . $href . ')';
}