[8.x] Add support for both CommonMark 1.x and 2.x #37954
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
colinodell
commented
Jul 8, 2021
| @@ -22,7 +22,7 @@ | |||
| "doctrine/inflector": "^1.4|^2.0", | |||
| "dragonmantank/cron-expression": "^3.0.2", | |||
| "egulias/email-validator": "^2.1.10", | |||
| "league/commonmark": "^1.3", | |||
| "league/commonmark": "^1.3|^2.0", | |||
There was a problem hiding this comment.
Technically you'll want ^1.3|^2.0.0-beta3, as the type hints in the first two betas do not support $converter->getEnvironment()->addExtension() as used below.
|
|
||
| return new HtmlString($converter->convertToHtml($text)); | ||
| return new HtmlString((string) $converter->convertToHtml($text)); |
There was a problem hiding this comment.
In 1.x the convertToHtml() method returns a string. In 2.x it returns a Stringable object. Casting the output to a string allows us to support both.
|
I'll make the adjustments to require CommonMark v2 on Laravel v9 after this is merged upstream 👍 |
GrahamCampbell
approved these changes
Jul 8, 2021
|
Thanks @colinodell |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR complements #37953 by allowing users of 8.x to install either major version of the CommonMark library.