diff options
Diffstat (limited to 'vendor/league')
5 files changed, 41 insertions, 3 deletions
diff --git a/vendor/league/html-to-markdown/.github/FUNDING.yml b/vendor/league/html-to-markdown/.github/FUNDING.yml index 40a26fbff..11ea19c6c 100644 --- a/vendor/league/html-to-markdown/.github/FUNDING.yml +++ b/vendor/league/html-to-markdown/.github/FUNDING.yml @@ -1,2 +1,3 @@ github: colinodell patreon: colinodell +custom: ["https://www.colinodell.com/sponsor", "https://www.paypal.me/colinpodell/10.00"] diff --git a/vendor/league/html-to-markdown/CHANGELOG.md b/vendor/league/html-to-markdown/CHANGELOG.md index 9ce8e8b2d..c19cd9f69 100644 --- a/vendor/league/html-to-markdown/CHANGELOG.md +++ b/vendor/league/html-to-markdown/CHANGELOG.md @@ -4,6 +4,11 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip ## [Unreleased][unreleased] +## [4.10.0] - 2020-06-30 +### Added + + - Added the ability to disable autolinking with a configuration option (#187, #188) + ## [4.9.1] - 2019-12-27 ### Fixed - Fixed issue with HTML entity escaping in text (#184) @@ -263,7 +268,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.9.1...master +[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.10.0...master +[4.10.0]: https://github.com/thephpleague/html-to-markdown/compare/4.9.1...4.10.0 [4.9.1]: https://github.com/thephpleague/html-to-markdown/compare/4.9.0...4.9.1 [4.9.0]: https://github.com/thephpleague/html-to-markdown/compare/4.8.3...4.9.0 [4.8.3]: https://github.com/thephpleague/html-to-markdown/compare/4.8.2...4.8.3 diff --git a/vendor/league/html-to-markdown/README.md b/vendor/league/html-to-markdown/README.md index c7ae2dcab..c1ac805ab 100644 --- a/vendor/league/html-to-markdown/README.md +++ b/vendor/league/html-to-markdown/README.md @@ -141,6 +141,21 @@ $converter->getConfig()->setOption('hard_break', false); // default $markdown = $converter->convert($html); // $markdown now contains "test \nline break" ``` +### Autolinking options + +By default, `a` tags are converted to the easiest possible link syntax, i.e. if no text or title is available, then the `<url>` syntax will be used rather than the full `[url](url)` syntax. Set `use_autolinks` to `false` to change this behavior to always use the full link syntax. + +```php +$converter = new HtmlConverter(); +$html = '<p><a href="https://thephpleague.com">https://thephpleague.com</a></p>'; + +$converter->getConfig()->setOption('use_autolinks', true); +$markdown = $converter->convert($html); // $markdown now contains "<https://thephpleague.com>" + +$converter->getConfig()->setOption('use_autolinks', false); // default +$markdown = $converter->convert($html); // $markdown now contains "[https://google.com](https://google.com)" +``` + ### Passing custom Environment object You can pass current `Environment` object to customize i.e. which converters should be used. diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php index 81c18b65f..ed52619d2 100644 --- a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php +++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php @@ -2,11 +2,25 @@ namespace League\HTMLToMarkdown\Converter; +use League\HTMLToMarkdown\Configuration; +use League\HTMLToMarkdown\ConfigurationAwareInterface; use League\HTMLToMarkdown\ElementInterface; -class LinkConverter implements ConverterInterface +class LinkConverter implements ConverterInterface, ConfigurationAwareInterface { /** + * @var Configuration + */ + protected $config; + + /** + * @param Configuration $config + */ + public function setConfig(Configuration $config) { + $this->config = $config; + } + + /** * @param ElementInterface $element * * @return string @@ -52,7 +66,8 @@ class LinkConverter implements ConverterInterface */ private function isValidAutolink($href) { - return preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1; + $useAutolinks = $this->config->getOption('use_autolinks'); + return $useAutolinks && (preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1); } /** diff --git a/vendor/league/html-to-markdown/src/HtmlConverter.php b/vendor/league/html-to-markdown/src/HtmlConverter.php index 846131af6..6f98e97b4 100644 --- a/vendor/league/html-to-markdown/src/HtmlConverter.php +++ b/vendor/league/html-to-markdown/src/HtmlConverter.php @@ -41,6 +41,7 @@ class HtmlConverter implements HtmlConverterInterface 'hard_break' => false, // Set to true to turn <br> into `\n` instead of ` \n` 'list_item_style' => '-', // Set the default character for each <li> in a <ul>. Can be '-', '*', or '+' 'preserve_comments' => false, // Set to true to preserve comments, or set to an array of strings to preserve specific comments + 'use_autolinks' => true, // Set to true to use simple link syntax if possible. Will always use []() if set to false ); $this->environment = Environment::createDefaultEnvironment($defaults); |