diff options
Diffstat (limited to 'vendor/league/commonmark')
| -rw-r--r-- | vendor/league/commonmark/CHANGELOG.md | 20 | ||||
| -rw-r--r-- | vendor/league/commonmark/README.md | 4 | ||||
| -rw-r--r-- | vendor/league/commonmark/composer.json | 4 | ||||
| -rw-r--r-- | vendor/league/commonmark/src/CommonMarkConverter.php | 2 | ||||
| -rw-r--r-- | vendor/league/commonmark/src/Environment.php | 11 | ||||
| -rw-r--r-- | vendor/league/commonmark/src/Reference/Reference.php | 1 |
6 files changed, 34 insertions, 8 deletions
diff --git a/vendor/league/commonmark/CHANGELOG.md b/vendor/league/commonmark/CHANGELOG.md index 611832b8de..54e6f369d3 100644 --- a/vendor/league/commonmark/CHANGELOG.md +++ b/vendor/league/commonmark/CHANGELOG.md @@ -4,6 +4,22 @@ Updates should follow the [Keep a CHANGELOG](https://keepachangelog.com/) princi ## [Unreleased][unreleased] +## [1.5.3] - 2020-07-19 + +### Fixed + + - Fixed regression of multi-byte inline parser characters not being matched + +## [1.5.2] - 2020-07-19 + +### Changed + + - Significantly improved performance of the inline parser regex + +### Fixed + + - Fixed parent class lookups for non-existent classes on PHP 8 (#517) + ## [1.5.1] - 2020-06-27 ### Fixed @@ -347,7 +363,9 @@ No changes were made since 1.0.0-rc1. - Removed `DelimiterStack::iterateByCharacters()` (use the new `processDelimiters()` method instead) - Removed the protected `DelimiterStack::findMatchingOpener()` method -[unreleased]: https://github.com/thephpleague/commonmark/compare/1.5.1...1.5 +[unreleased]: https://github.com/thephpleague/commonmark/compare/1.5.3...1.5 +[1.5.3]: https://github.com/thephpleague/commonmark/compare/1.5.2...1.5.3 +[1.5.2]: https://github.com/thephpleague/commonmark/compare/1.5.1...1.5.2 [1.5.1]: https://github.com/thephpleague/commonmark/compare/1.5.0...1.5.1 [1.5.0]: https://github.com/thephpleague/commonmark/compare/1.4.3...1.5.0 [1.4.3]: https://github.com/thephpleague/commonmark/compare/1.4.2...1.4.3 diff --git a/vendor/league/commonmark/README.md b/vendor/league/commonmark/README.md index f800d51ff7..11342983b7 100644 --- a/vendor/league/commonmark/README.md +++ b/vendor/league/commonmark/README.md @@ -117,9 +117,9 @@ Any classes or methods marked `@internal` are not intended for use outside of th ## 🛠️ Maintenance & Support -When a new **minor** version (`1.x`) is released, the previous one will continue to receive security and bug fixes for *at least* 3 months. +When a new **minor** version (e.g. `1.4` -> `1.5`) is released, the previous one (`1.4`) will continue to receive security and critical bug fixes for *at least* 3 months. -When a new **major** version is released (`1.0`, `2.0`, etc), the previous one (`0.19.x`) will receive bug fixes for *at least* 3 months and security updates for 6 months after that new release comes out. +When a new **major** version is released (e.g. `1.5` -> `2.0`), the previous one (`1.5`) will receive critical bug fixes for *at least* 3 months and security updates for 6 months after that new release comes out. (This policy may change in the future and exceptions may be made on a case-by-case basis.) diff --git a/vendor/league/commonmark/composer.json b/vendor/league/commonmark/composer.json index 3a39e2820d..16395270c5 100644 --- a/vendor/league/commonmark/composer.json +++ b/vendor/league/commonmark/composer.json @@ -32,10 +32,12 @@ "michelf/php-markdown": "~1.4", "mikehaertl/php-shellcommand": "^1.4", "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^7.5", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.2", "scrutinizer/ocular": "^1.5", "symfony/finder": "^4.2" }, + "minimum-stability": "dev", + "prefer-stable": true, "conflict": { "scrutinizer/ocular": "1.7.*" }, diff --git a/vendor/league/commonmark/src/CommonMarkConverter.php b/vendor/league/commonmark/src/CommonMarkConverter.php index 463115960b..e0d710e694 100644 --- a/vendor/league/commonmark/src/CommonMarkConverter.php +++ b/vendor/league/commonmark/src/CommonMarkConverter.php @@ -27,7 +27,7 @@ class CommonMarkConverter extends Converter * @deprecated in 1.5.0 and will be removed from 2.0.0. * Use \Composer\InstalledVersions provided by composer-runtime-api instead. */ - public const VERSION = '1.5.1'; + public const VERSION = '1.5.3'; /** @var EnvironmentInterface */ protected $environment; diff --git a/vendor/league/commonmark/src/Environment.php b/vendor/league/commonmark/src/Environment.php index 36640b9a34..3943738630 100644 --- a/vendor/league/commonmark/src/Environment.php +++ b/vendor/league/commonmark/src/Environment.php @@ -369,10 +369,15 @@ final class Environment implements ConfigurableEnvironmentInterface if (empty($chars)) { // If no special inline characters exist then parse the whole line - $this->inlineParserCharacterRegex = '/^.+$/u'; + $this->inlineParserCharacterRegex = '/^.+$/'; } else { // Match any character which inline parsers are not interested in - $this->inlineParserCharacterRegex = '/^[^' . \preg_quote(\implode('', $chars), '/') . ']+/u'; + $this->inlineParserCharacterRegex = '/^[^' . \preg_quote(\implode('', $chars), '/') . ']+/'; + + // Only add the u modifier (which slows down performance) if we have a multi-byte UTF-8 character in our regex + if (\strlen($this->inlineParserCharacterRegex) > \mb_strlen($this->inlineParserCharacterRegex)) { + $this->inlineParserCharacterRegex .= 'u'; + } } } @@ -410,7 +415,7 @@ final class Environment implements ConfigurableEnvironmentInterface return $list[$class]; } - while ($parent = \get_parent_class($parent ?? $class)) { + while (\class_exists($parent = $parent ?? $class) && $parent = \get_parent_class($parent)) { if (!isset($list[$parent])) { continue; } diff --git a/vendor/league/commonmark/src/Reference/Reference.php b/vendor/league/commonmark/src/Reference/Reference.php index aeb3a6c956..ebe57aa8bf 100644 --- a/vendor/league/commonmark/src/Reference/Reference.php +++ b/vendor/league/commonmark/src/Reference/Reference.php @@ -65,6 +65,7 @@ final class Reference implements ReferenceInterface * @return string * * @deprecated Use TextNormalizer::normalize() instead + * @group legacy */ public static function normalizeReference(string $string): string { |
