diff --git a/composer.json b/composer.json index cdf37534af93dc087a22226aa8ab95a2aee1b6ff..8567b9cc7f61b1df49b959e7ef3b09d3d8d67c19 100644 --- a/composer.json +++ b/composer.json @@ -110,7 +110,7 @@ "drupal/ctools": "^4.0", "drupal/decorative_image_widget": "^1.0", "drupal/edit_media_modal": "^2.0", - "drupal/editor_advanced_link": "2.2.4", + "drupal/editor_advanced_link": "2.2.6", "drupal/editoria11y": "^2.1", "drupal/entity_browser": "2.10", "drupal/entity_clone": "2.1.0-beta1", diff --git a/composer.lock b/composer.lock index 62e2fa9940bab11fbb8e4428551203c61cf48568..6a73750ca4c61ef6f9b4ae9c00e97e2c1cdef290 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": "ab37278475d358e74f6fe758eeb44439", + "content-hash": "258c094b450ec8b12eae32e22c66ece4", "packages": [ { "name": "algolia/places", @@ -2780,20 +2780,20 @@ }, { "name": "drupal/editor_advanced_link", - "version": "2.2.4", + "version": "2.2.6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editor_advanced_link.git", - "reference": "2.2.4" + "reference": "2.2.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editor_advanced_link-2.2.4.zip", - "reference": "2.2.4", - "shasum": "cd0db397827f2e21ec8a68211e8a153463a6c89b" + "url": "https://ftp.drupal.org/files/projects/editor_advanced_link-2.2.6.zip", + "reference": "2.2.6", + "shasum": "f6d7c437900f288b1e735b4faf2decc99bdd30e8" }, "require": { - "drupal/core": "^9.2 || ^10" + "drupal/core": "^10.2 || ^11.0" }, "require-dev": { "drupal/ckeditor": "*", @@ -2802,8 +2802,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.2.4", - "datestamp": "1688040059", + "version": "2.2.6", + "datestamp": "1723183019", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2818,6 +2818,10 @@ { "name": "DuaelFr", "homepage": "https://www.drupal.org/user/931394" + }, + { + "name": "VladimirAus", + "homepage": "https://www.drupal.org/user/673120" } ], "description": "Editor Advanced link", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 8eb50e26b636ea55d4f739cb2f1cfb59d7a5f82c..fe730fdd53669765dd67b2f2a1b3a366c2bd0bfc 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -2922,21 +2922,21 @@ }, { "name": "drupal/editor_advanced_link", - "version": "2.2.4", - "version_normalized": "2.2.4.0", + "version": "2.2.6", + "version_normalized": "2.2.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editor_advanced_link.git", - "reference": "2.2.4" + "reference": "2.2.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editor_advanced_link-2.2.4.zip", - "reference": "2.2.4", - "shasum": "cd0db397827f2e21ec8a68211e8a153463a6c89b" + "url": "https://ftp.drupal.org/files/projects/editor_advanced_link-2.2.6.zip", + "reference": "2.2.6", + "shasum": "f6d7c437900f288b1e735b4faf2decc99bdd30e8" }, "require": { - "drupal/core": "^9.2 || ^10" + "drupal/core": "^10.2 || ^11.0" }, "require-dev": { "drupal/ckeditor": "*", @@ -2945,8 +2945,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.2.4", - "datestamp": "1688040059", + "version": "2.2.6", + "datestamp": "1723183019", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2962,6 +2962,10 @@ { "name": "DuaelFr", "homepage": "https://www.drupal.org/user/931394" + }, + { + "name": "VladimirAus", + "homepage": "https://www.drupal.org/user/673120" } ], "description": "Editor Advanced link", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 74ade7fd4370849d229a5f6d473788013dd683c3..34338083d3fc9ece1d04e221d430f82571fea1f4 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'osu-asc-webservices/d8-upstream', 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => 'f5bcc9ef2f78f4b3bfda17c862726efd7e74834f', + 'reference' => '8e576870770d8d73a1429787c66c520512de7944', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -593,9 +593,9 @@ 'dev_requirement' => false, ), 'drupal/editor_advanced_link' => array( - 'pretty_version' => '2.2.4', - 'version' => '2.2.4.0', - 'reference' => '2.2.4', + 'pretty_version' => '2.2.6', + 'version' => '2.2.6.0', + 'reference' => '2.2.6', 'type' => 'drupal-module', 'install_path' => __DIR__ . '/../../web/modules/editor_advanced_link', 'aliases' => array(), @@ -1564,7 +1564,7 @@ 'osu-asc-webservices/d8-upstream' => array( 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => 'f5bcc9ef2f78f4b3bfda17c862726efd7e74834f', + 'reference' => '8e576870770d8d73a1429787c66c520512de7944', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/web/modules/editor_advanced_link/.gitlab-ci.yml b/web/modules/editor_advanced_link/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..042f2ff451dccfead579f99cf74113f2934d1089 --- /dev/null +++ b/web/modules/editor_advanced_link/.gitlab-ci.yml @@ -0,0 +1,27 @@ +include: + - project: $_GITLAB_TEMPLATES_REPO + ref: $_GITLAB_TEMPLATES_REF + file: + - '/includes/include.drupalci.main.yml' + - '/includes/include.drupalci.variables.yml' + - '/includes/include.drupalci.workflows.yml' +variables: + OPT_IN_TEST_NEXT_MINOR: 1 + OPT_IN_TEST_NEXT_MAJOR: 1 + RUN_JOB_UPGRADE_STATUS: 1 +cspell: + allow_failure: true +phpcs: + allow_failure: true +phpstan: + allow_failure: false +phpstan (next minor): + allow_failure: false +phpstan (next major): + allow_failure: false +phpunit (next minor): + allow_failure: true +phpunit (next major): + allow_failure: true +upgrade status: + allow_failure: false diff --git a/web/modules/editor_advanced_link/README.md b/web/modules/editor_advanced_link/README.md index d0f43f145f3a6d8638a1fbbf19c8b4d063d5d2f4..adad6dfc0bb85c408690b66207b626ddcc73f848 100644 --- a/web/modules/editor_advanced_link/README.md +++ b/web/modules/editor_advanced_link/README.md @@ -1,73 +1,55 @@ -# Editor Advanced link - -## Table of contents +## CONTENTS OF THIS FILE - Introduction - Requirements +- Recommended modules - Installation - Configuration -- Recommended modules - Maintainers -## Introduction - -Enhances the link Dialog in CKEditor. Allows to define the following -attributes: -- `title` -- `class` -- `id` -- `target` -- `rel` - -For a full description of the module, visit the project page:\ -<https://www.drupal.org/project/editor_advanced_link> - -To submit bug reports and feature suggestions, or track changes:\ -<https://www.drupal.org/project/issues/editor_advanced_link> - -## Requirements +## INTRODUCTION -This module requires no modules outside of Drupal Core. +Enhances the link Dialog in CKEditor. +Allows to define the following attributes: -## Installation +- title +- class +- id +- target +- rel -Install the module as you would normally install a contributed Drupal -module. Visit [the documentation](https://www.drupal.org/docs/extending-drupal/installing-modules) -for further information. +* For a full description of the module, visit the project page: + https://www.drupal.org/project/editor_advanced_link -## Configuration +* To submit bug reports and feature suggestions, or track changes: + https://www.drupal.org/project/issues/editor_advanced_link -- Install and enable the module. -- Go to the "Text formats and editor" admin page - (admin/config/content/formats). -- If you are using CKEditor 5, click the "Advanced links" tab. There you will - see a list of attributes provided by this module that you can enable. For - example, "ARIA label", "ID", and "Open in new window." -- If you are using CKEditor 4, configure your text format. - - If the "Limit allowed HTML tags and correct faulty HTML" filter is disabled - you don't have anything to do with this text format - - else, add the `title`, `class`, `id`, `target` and/or the `rel` attributes - to the "allowed HTML tags" field (only those whitelisted will show up in - the dialog) +## REQUIREMENTS +This module requires no modules outside of Drupal core. -## Recommended modules +## RECOMMENDED MODULES -- [Editor File upload](https://www.drupal.org/project/editor_file):\ +- Editor File upload (https://www.drupal.org/project/editor_file): Allows to create link to uploaded files in the text editor easily. -- [Linkit](https://www.drupal.org/project/linkit):\ +- Linkit (https://www.drupal.org/project/linkit): Provides an easy interface for internal and external linking with WYSIWYG editors by using an autocomplete field. -- [CKEditor Entity Link](https://www.drupal.org/project/ckeditor_entity_link):\ +- CKEditor Entity Link (https://www.drupal.org/project/ckeditor_entity_link): It is an alternative to Linkit that also provides an easy interface for internal linking within the editor. -## Maintainers +## INSTALLATION -Current maintainers: +Install the module as you would normally install a contributed Drupal module. +Visit https://www.drupal.org/node/1897420 for further information. -- [Edouard Cunibil (DuaelFr)](https://www.drupal.org/u/duaelfr) +## CONFIGURATION -This project has been sponsored by: +Install module and follow the insturctions: -- [Happyculture](https://happyculture.coop) (paid contribution time) +- go to the "Text formats and editor" admin page (admin/config/content/formats) +- manage text format +- if the "Limit allowed HTML tags and correct faulty HTML" filter is enabled, + add the "title", "class", "id", "target" and/or the "rel" attributes to the + "allowed HTML tags" field (only those whitelisted will show up in the dialog). diff --git a/web/modules/editor_advanced_link/editor_advanced_link.info.yml b/web/modules/editor_advanced_link/editor_advanced_link.info.yml index 8f8af056e59fd9dc6ef117145cbf79d4004e78df..8379d984574b632f49c190a3d5f7ac92d1b33029 100644 --- a/web/modules/editor_advanced_link/editor_advanced_link.info.yml +++ b/web/modules/editor_advanced_link/editor_advanced_link.info.yml @@ -1,13 +1,13 @@ name: 'Editor Advanced Link' description: 'Add title, target etc. attributes to Text Editor''s link dialog if the text format allows them.' type: module -core_version_requirement: ^9.2 || ^10 +core_version_requirement: ^10.2 || ^11.0 dependencies: - drupal:editor test_dependencies: - drupal:ckeditor -# Information added by Drupal.org packaging script on 2023-06-29 -version: '2.2.4' +# Information added by Drupal.org packaging script on 2024-08-09 +version: '2.2.6' project: 'editor_advanced_link' -datestamp: 1688040061 +datestamp: 1723183022 diff --git a/web/modules/editor_advanced_link/tests/src/Kernel/CKEditor4To5Upgrade/UpgradePathTest.php b/web/modules/editor_advanced_link/tests/src/Kernel/CKEditor4To5Upgrade/UpgradePathTest.php index 5dbd8fa1225c94b26b0d1068eae7835ee846e9e7..12bfac7fb918113a87560726c51cdabb5edfd3e8 100644 --- a/web/modules/editor_advanced_link/tests/src/Kernel/CKEditor4To5Upgrade/UpgradePathTest.php +++ b/web/modules/editor_advanced_link/tests/src/Kernel/CKEditor4To5Upgrade/UpgradePathTest.php @@ -119,7 +119,7 @@ protected function setUp(): void { /** * {@inheritdoc} */ - public function provider() { + public static function provider() { $expected_ckeditor5_toolbar = [ 'items' => [ 'bold',