From ddb264dd84283475c2e99cd2b74d87d4b4f958a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 07:21:10 -0500 Subject: [PATCH] Bump league/commonmark from 2.5.3 to 2.6.0 (#4156) * Bump league/commonmark from 2.5.3 to 2.6.0 Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.5.3 to 2.6.0. - [Release notes](https://github.com/thephpleague/commonmark/releases) - [Changelog](https://github.com/thephpleague/commonmark/blob/2.6/CHANGELOG.md) - [Commits](https://github.com/thephpleague/commonmark/compare/2.5.3...2.6.0) --- updated-dependencies: - dependency-name: league/commonmark dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Fix test and configuration. --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Demian Katz (cherry picked from commit 1d8fa31c83b181ad659b4b24745d9971fa9ee060) --- composer.json | 2 +- composer.lock | 21 +++++++------- config/vufind/markdown.ini | 29 ++++++++++--------- .../Service/MarkdownFactoryTest.php | 1 + 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index 0a63e1fe847..82a6d71dd53 100644 --- a/composer.json +++ b/composer.json @@ -70,7 +70,7 @@ "laminas/laminas-text": "2.11.0", "laminas/laminas-validator": "2.55.0", "laminas/laminas-view": "2.27.0", - "league/commonmark": "2.5.3", + "league/commonmark": "2.6.0", "league/oauth2-client": "^2.7", "league/oauth2-server": "8.5.4", "lm-commons/lmc-rbac-mvc": "3.4.0", diff --git a/composer.lock b/composer.lock index 19fcb494296..8bcec26094f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b15ea90f88ec350a6fa2edb87cc785b9", + "content-hash": "04336648d57f2936fc3d342f8061b69b", "packages": [ { "name": "ahand/mobileesp", @@ -4971,16 +4971,16 @@ }, { "name": "league/commonmark", - "version": "2.5.3", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "b650144166dfa7703e62a22e493b853b58d874b0" + "reference": "d150f911e0079e90ae3c106734c93137c184f932" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0", - "reference": "b650144166dfa7703e62a22e493b853b58d874b0", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d150f911e0079e90ae3c106734c93137c184f932", + "reference": "d150f911e0079e90ae3c106734c93137c184f932", "shasum": "" }, "require": { @@ -5005,8 +5005,9 @@ "phpstan/phpstan": "^1.8.2", "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0", "scrutinizer/ocular": "^1.8.1", - "symfony/finder": "^5.3 | ^6.0 || ^7.0", - "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 || ^7.0", + "symfony/finder": "^5.3 | ^6.0 | ^7.0", + "symfony/process": "^5.4 | ^6.0 | ^7.0", + "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0", "unleashedtech/php-coding-standard": "^3.1.1", "vimeo/psalm": "^4.24.0 || ^5.0.0" }, @@ -5016,7 +5017,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.6-dev" + "dev-main": "2.7-dev" } }, "autoload": { @@ -5073,7 +5074,7 @@ "type": "tidelift" } ], - "time": "2024-08-16T11:46:16+00:00" + "time": "2024-12-07T15:34:16+00:00" }, { "name": "league/config", @@ -16120,7 +16121,7 @@ "platform": { "php": ">=8.1" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "8.1" }, diff --git a/config/vufind/markdown.ini b/config/vufind/markdown.ini index 96aa0b47892..2ae10af15bf 100644 --- a/config/vufind/markdown.ini +++ b/config/vufind/markdown.ini @@ -1,6 +1,6 @@ ; This file could be used to define configuration of markdown to HTML converter. ; More detailed configuration documentation could be found here: -; https://commonmark.thephpleague.com/2.5/configuration/ +; https://commonmark.thephpleague.com/2.6/configuration/ [Markdown] ; How to handle HTML input. Options are: strip, allow, escape. Defaults to strip ;html_input = allow @@ -18,11 +18,11 @@ ;max_nesting_level = 10 ; Which extension you want to activate. List of extension names separated by comma. -; Available extensions as of league/commonmark version 2.5: +; Available extensions as of league/commonmark version 2.6: ; Attributes, Autolink, DefaultAttributes, DescriptionList, DisallowedRawHtml, ; ExternalLink, Footnote, FrontMatter, HeadingPermalink, Mention, SmartPunct, ; Strikethrough, Table, TableOfContents, TaskList. -; More about extensions: https://commonmark.thephpleague.com/2.5/extensions/overview/ +; More about extensions: https://commonmark.thephpleague.com/2.6/extensions/overview/ ; Some of them could have a configuration, see sections below. ; Note: FrontMatter does enable to inject the title other then main heading. Just add ; something like this at the very beginning of your markdown file: @@ -30,7 +30,7 @@ ;title: "Some specific title" ;--- ; See more about FrontMatter extension here: -; https://commonmark.thephpleague.com/2.5/extensions/front-matter/ +; https://commonmark.thephpleague.com/2.6/extensions/front-matter/ ; ; You can also use own extensions, just address it using fully qualified class name ; like 'VuFindLocalModule\Markdown\ExampleExtension'. If your extension is @@ -38,7 +38,7 @@ ; qualified name. For example: '[VuFindLocalModule\Markdown\ExampleExtension]', and ; with 'config_key' with value of configuration key, in which your extension expects ; its configuration. More about custom extension configuration: -; https://commonmark.thephpleague.com/2.5/customization/configuration/ +; https://commonmark.thephpleague.com/2.6/customization/configuration/ extensions = Autolink,DisallowedRawHtml,Strikethrough,Table,TaskList ; CommonMarkCore extension is always enabled by default @@ -57,13 +57,13 @@ extensions = Autolink,DisallowedRawHtml,Strikethrough,Table,TaskList ;unordered_list_markers[] = "*" ;unordered_list_markers[] = "+" -; See https://commonmark.thephpleague.com/2.5/extensions/default-attributes/ +; See https://commonmark.thephpleague.com/2.6/extensions/default-attributes/ [DefaultAttributes] ; Example configuration: ;League\CommonMark\Extension\Table\Table[class] = 'table' ;League\CommonMark\Extension\CommonMark\Node\Inline\Link[target] = '_blank' -; See https://commonmark.thephpleague.com/2.5/extensions/disallowed-raw-html/ +; See https://commonmark.thephpleague.com/2.6/extensions/disallowed-raw-html/ [DisallowedRawHtml] ; Default configuration, to enable any tag, just comment out the appropriate line disallowed_tags[] = "title" @@ -76,7 +76,7 @@ disallowed_tags[] = "noframes" disallowed_tags[] = "script" disallowed_tags[] = "plaintext" -; See https://commonmark.thephpleague.com/2.5/extensions/external-links/ +; See https://commonmark.thephpleague.com/2.6/extensions/external-links/ [ExternalLink] ; This should be always set, if you want to use this extension. You can use regular ; expressions to match group of hosts @@ -87,7 +87,7 @@ internal_hosts[] = www.example.com ;noopener = external ;noreferrer = external -; See https://commonmark.thephpleague.com/2.5/extensions/footnotes/ +; See https://commonmark.thephpleague.com/2.6/extensions/footnotes/ [Footnote] ;backref_class = footnote-backref ;backref_symbol = '↩' @@ -98,7 +98,7 @@ internal_hosts[] = www.example.com ;footnote_class = footnote ;footnote_id_prefix = 'fn:' -; See https://commonmark.thephpleague.com/2.5/extensions/heading-permalinks/ +; See https://commonmark.thephpleague.com/2.6/extensions/heading-permalinks/ [HeadingPermalink] ; There is also 'slug_normalizer' options, which should be set to an object ; implementing League\CommonMark\Normalizer\TextNormalizerInterface @@ -117,21 +117,21 @@ internal_hosts[] = www.example.com ;heading_class = 'heading' ;insert = 'none' -; See https://commonmark.thephpleague.com/2.5/extensions/mentions/ +; See https://commonmark.thephpleague.com/2.6/extensions/mentions/ [Mention] ; This is an example of configuration, see more details in original documentation ;github_handle[prefix] = '@' ;github_handle[pattern] = '/^[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}(?!\w)/' ;github_handle[generator] = 'https://github.com/%s' -; See https://commonmark.thephpleague.com/2.5/extensions/smart-punctuation/ +; See https://commonmark.thephpleague.com/2.6/extensions/smart-punctuation/ [SmartPunct] ;double_quote_opener = '“' ;double_quote_closer = '”' ;single_quote_opener = '‘' ;single_quote_closer = '’' -; See https://commonmark.thephpleague.com/2.5/extensions/table-of-contents/ +; See https://commonmark.thephpleague.com/2.6/extensions/table-of-contents/ [TableOfContents] ;html_class = table-of-contents ;position = top @@ -141,7 +141,7 @@ internal_hosts[] = www.example.com ;normalize = relative ;placeholder = -; See https://commonmark.thephpleague.com/2.5/extensions/tables/ +; See https://commonmark.thephpleague.com/2.6/extensions/tables/ [Table] ;wrap[enabled] = true ;wrap[tag] = 'div' @@ -153,3 +153,4 @@ internal_hosts[] = www.example.com ;alignment_attributes[left] = 'align:left' ;alignment_attributes[center] = 'align:center' ;alignment_attributes[right] = 'align:right' +;max_autocompleted_cells = 10000 diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Service/MarkdownFactoryTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Service/MarkdownFactoryTest.php index bd05827138f..580297403de 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/Service/MarkdownFactoryTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Service/MarkdownFactoryTest.php @@ -191,6 +191,7 @@ public function testConfig(): void 'class' => 'right', ], ], + 'max_autocompleted_cells' => 10000, ], 'example' => [ 'example' => 'example',