aboutsummaryrefslogtreecommitdiffstats
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
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
-rw-r--r--composer.lock22
-rw-r--r--vendor/composer/installed.json24
-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
7 files changed, 56 insertions, 25 deletions
diff --git a/composer.lock b/composer.lock
index 3a38edd95..58f63d56f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -251,16 +251,16 @@
},
{
"name": "league/html-to-markdown",
- "version": "4.8.1",
+ "version": "4.8.2",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/html-to-markdown.git",
- "reference": "250d1bf45f80d15594fb6b316df777d6d4c97ad1"
+ "reference": "e747489191f8e9144a7270eb61f8b9516e99e413"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/250d1bf45f80d15594fb6b316df777d6d4c97ad1",
- "reference": "250d1bf45f80d15594fb6b316df777d6d4c97ad1",
+ "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/e747489191f8e9144a7270eb61f8b9516e99e413",
+ "reference": "e747489191f8e9144a7270eb61f8b9516e99e413",
"shasum": ""
},
"require": {
@@ -293,16 +293,16 @@
],
"authors": [
{
- "name": "Nick Cernis",
- "email": "nick@cern.is",
- "homepage": "http://modernnerd.net",
- "role": "Original Author"
- },
- {
"name": "Colin O'Dell",
"email": "colinodell@gmail.com",
"homepage": "https://www.colinodell.com",
"role": "Lead Developer"
+ },
+ {
+ "name": "Nick Cernis",
+ "email": "nick@cern.is",
+ "homepage": "http://modernnerd.net",
+ "role": "Original Author"
}
],
"description": "An HTML-to-markdown conversion helper for PHP",
@@ -311,7 +311,7 @@
"html",
"markdown"
],
- "time": "2018-12-24T17:21:44+00:00"
+ "time": "2019-08-02T11:57:39+00:00"
},
{
"name": "lukasreschke/id3parser",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index c083b26c9..d0e7afb04 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -254,17 +254,17 @@
},
{
"name": "league/html-to-markdown",
- "version": "4.8.1",
- "version_normalized": "4.8.1.0",
+ "version": "4.8.2",
+ "version_normalized": "4.8.2.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/html-to-markdown.git",
- "reference": "250d1bf45f80d15594fb6b316df777d6d4c97ad1"
+ "reference": "e747489191f8e9144a7270eb61f8b9516e99e413"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/250d1bf45f80d15594fb6b316df777d6d4c97ad1",
- "reference": "250d1bf45f80d15594fb6b316df777d6d4c97ad1",
+ "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/e747489191f8e9144a7270eb61f8b9516e99e413",
+ "reference": "e747489191f8e9144a7270eb61f8b9516e99e413",
"shasum": ""
},
"require": {
@@ -277,7 +277,7 @@
"phpunit/phpunit": "4.*",
"scrutinizer/ocular": "~1.1"
},
- "time": "2018-12-24T17:21:44+00:00",
+ "time": "2019-08-02T11:57:39+00:00",
"bin": [
"bin/html-to-markdown"
],
@@ -299,16 +299,16 @@
],
"authors": [
{
- "name": "Nick Cernis",
- "email": "nick@cern.is",
- "homepage": "http://modernnerd.net",
- "role": "Original Author"
- },
- {
"name": "Colin O'Dell",
"email": "colinodell@gmail.com",
"homepage": "https://www.colinodell.com",
"role": "Lead Developer"
+ },
+ {
+ "name": "Nick Cernis",
+ "email": "nick@cern.is",
+ "homepage": "http://modernnerd.net",
+ "role": "Original Author"
}
],
"description": "An HTML-to-markdown conversion helper for PHP",
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 . ')';
}