diff --git a/composer.json b/composer.json index 5c35e38b6aadb82bf0b6817acec54c052106ad3f..a934544e9a9d6e90cb7b8493a532c6f961345276 100644 --- a/composer.json +++ b/composer.json @@ -91,7 +91,7 @@ "drupal/admin_toolbar": "3.4", "drupal/adminimal_theme": "^1.6", "drupal/administerusersbyrole": "3.3", - "drupal/allowed_formats": "1.5", + "drupal/allowed_formats": "2.0", "drupal/anchor_link": "1.10", "drupal/better_exposed_filters": "^6.0", "drupal/block_field": "1.0.0-rc4", diff --git a/composer.lock b/composer.lock index 50350a5fccd6de0a8739e862985f8fc7325e0398..69e6baec3afc9f50db0415f8d0479b36e00a5862 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": "b429493ac76543351aba292c1dede1ac", + "content-hash": "f95b1ee879161b7d7e127f62048bab46", "packages": [ { "name": "alchemy/zippy", @@ -1871,26 +1871,26 @@ }, { "name": "drupal/allowed_formats", - "version": "1.5.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/allowed_formats.git", - "reference": "8.x-1.5" + "reference": "2.0.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/allowed_formats-8.x-1.5.zip", - "reference": "8.x-1.5", - "shasum": "dbf61bee7aec87beaa2cf307c1d0d9d5b896328c" + "url": "https://ftp.drupal.org/files/projects/allowed_formats-2.0.0.zip", + "reference": "2.0.0", + "shasum": "ac6c6d398f303608ced7e9cd9d4556a728dc41f0" }, "require": { - "drupal/core": "^8.8 || ^9" + "drupal/core": "^9.2 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.5", - "datestamp": "1648060331", + "version": "2.0.0", + "datestamp": "1669170410", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 9a7ef02e0e452627d36ed471c95db54bdc65d2c7..80f43de35c315c824e3b2e64febde148fdcbf7d6 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1940,27 +1940,27 @@ }, { "name": "drupal/allowed_formats", - "version": "1.5.0", - "version_normalized": "1.5.0.0", + "version": "2.0.0", + "version_normalized": "2.0.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/allowed_formats.git", - "reference": "8.x-1.5" + "reference": "2.0.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/allowed_formats-8.x-1.5.zip", - "reference": "8.x-1.5", - "shasum": "dbf61bee7aec87beaa2cf307c1d0d9d5b896328c" + "url": "https://ftp.drupal.org/files/projects/allowed_formats-2.0.0.zip", + "reference": "2.0.0", + "shasum": "ac6c6d398f303608ced7e9cd9d4556a728dc41f0" }, "require": { - "drupal/core": "^8.8 || ^9" + "drupal/core": "^9.2 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.5", - "datestamp": "1648060331", + "version": "2.0.0", + "datestamp": "1669170410", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index b4fecc0b1970fec88d59cac088c502df5a090887..408987373f0480afdcacceca10cda86bf81ed1c5 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'osu-asc-webservices/d8-upstream', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '5dafc7fbe8adb99c5e7fe29817c3bb054341f064', + 'reference' => '4f6f09d1c2c53c0bcf391beef217e1f65cc79f7b', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -299,9 +299,9 @@ 'dev_requirement' => false, ), 'drupal/allowed_formats' => array( - 'pretty_version' => '1.5.0', - 'version' => '1.5.0.0', - 'reference' => '8.x-1.5', + 'pretty_version' => '2.0.0', + 'version' => '2.0.0.0', + 'reference' => '2.0.0', 'type' => 'drupal-module', 'install_path' => __DIR__ . '/../../web/modules/allowed_formats', 'aliases' => array(), @@ -1549,7 +1549,7 @@ 'osu-asc-webservices/d8-upstream' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '5dafc7fbe8adb99c5e7fe29817c3bb054341f064', + 'reference' => '4f6f09d1c2c53c0bcf391beef217e1f65cc79f7b', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/web/modules/allowed_formats/README.txt b/web/modules/allowed_formats/README.txt index 815c61bdc60a26c8850f1157cb2539d6a0f16437..a5437622d7dea45c5a0ad3f73db1f6529187db78 100644 --- a/web/modules/allowed_formats/README.txt +++ b/web/modules/allowed_formats/README.txt @@ -53,8 +53,10 @@ UI. MAINTAINERS ----------- + * Jordan Thompson (nord102) - https://www.drupal.org/u/nord102 * Florian Loretan (floretan) - https://www.drupal.org/u/floretan Supporting organization: + * Northern Commerce - https://www.drupal.org/northern-commerce * Wunder - https://www.drupal.org/wunder-group diff --git a/web/modules/allowed_formats/allowed_formats.info.yml b/web/modules/allowed_formats/allowed_formats.info.yml index 95135c550aa8e4f35a8e9efc4ff7e42a70804e49..0e2efa8b05287e470847cdf881f01391f92246c5 100644 --- a/web/modules/allowed_formats/allowed_formats.info.yml +++ b/web/modules/allowed_formats/allowed_formats.info.yml @@ -1,12 +1,12 @@ name: Allowed Formats description: Limit which text formats are available for each field instance. type: module -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^9.2 || ^10 dependencies: - drupal:field - drupal:filter -# Information added by Drupal.org packaging script on 2022-03-23 -version: '8.x-1.5' +# Information added by Drupal.org packaging script on 2022-11-23 +version: '2.0.0' project: 'allowed_formats' -datestamp: 1648060332 +datestamp: 1669170415 diff --git a/web/modules/allowed_formats/allowed_formats.module b/web/modules/allowed_formats/allowed_formats.module index dbab0cab125bf26071aec26377801538e0d3f1f6..7c582f653b2d3e4d97d4010779d3a4ce0770de9a 100644 --- a/web/modules/allowed_formats/allowed_formats.module +++ b/web/modules/allowed_formats/allowed_formats.module @@ -75,9 +75,9 @@ function allowed_formats_field_widget_third_party_settings_form(WidgetInterface } /** - * Implements hook_field_widget_form_alter(). + * Implements hook_field_widget_single_element_form_alter(). */ -function allowed_formats_field_widget_form_alter(&$element, FormStateInterface $form_state, $context) { +function allowed_formats_field_widget_single_element_form_alter(&$element, FormStateInterface $form_state, $context) { /** @var \Drupal\Core\Field\FieldDefinitionInterface $field_definition */ $field_definition = $context['items']->getFieldDefinition(); diff --git a/web/modules/allowed_formats/composer.json b/web/modules/allowed_formats/composer.json index 42b0ecaaeee7118c59735a474c1c418bab478f1f..14ac6887c28c8e6de95fa4384f695363902f5527 100644 --- a/web/modules/allowed_formats/composer.json +++ b/web/modules/allowed_formats/composer.json @@ -32,6 +32,6 @@ "source": "http://cgit.drupalcode.org/allowed_formats" }, "require": { - "drupal/core": "^8.8 || ^9" + "drupal/core": "^9.2 || ^10" } } diff --git a/web/modules/allowed_formats/tests/modules/allowed_formats_base_fields_test/allowed_formats_base_fields_test.info.yml b/web/modules/allowed_formats/tests/modules/allowed_formats_base_fields_test/allowed_formats_base_fields_test.info.yml index 366d4379b487a0f2927bc370dd638fef64a7f61b..9206be2ec39515cb701b82b210d4472cc80de201 100644 --- a/web/modules/allowed_formats/tests/modules/allowed_formats_base_fields_test/allowed_formats_base_fields_test.info.yml +++ b/web/modules/allowed_formats/tests/modules/allowed_formats_base_fields_test/allowed_formats_base_fields_test.info.yml @@ -2,12 +2,11 @@ name: 'Allowed formats base fields test' type: module description: 'Support module for allowed formats testing on base fields.' package: Testing -core_version_requirement: ^8.7.7 || ^9 dependencies: drupal:taxonomy drupal:allowed_formats -# Information added by Drupal.org packaging script on 2022-03-23 -version: '8.x-1.5' +# Information added by Drupal.org packaging script on 2022-11-23 +version: '2.0.0' project: 'allowed_formats' -datestamp: 1648060332 +datestamp: 1669170415 diff --git a/web/modules/allowed_formats/tests/src/Functional/AllowedFormatsTest.php b/web/modules/allowed_formats/tests/src/Functional/AllowedFormatsTest.php index ce22e98dfe189091071d0804286d0a44fc4d1bfb..663273b3558cc8a442030f946a186503e4bcf0e3 100644 --- a/web/modules/allowed_formats/tests/src/Functional/AllowedFormatsTest.php +++ b/web/modules/allowed_formats/tests/src/Functional/AllowedFormatsTest.php @@ -28,7 +28,7 @@ class AllowedFormatsTest extends BrowserTestBase { * * @var array */ - public static $modules = [ + protected static $modules = [ 'entity_test', 'allowed_formats', 'field_ui', @@ -52,7 +52,7 @@ class AllowedFormatsTest extends BrowserTestBase { /** * {@inheritdoc} */ - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->adminUser = $this->drupalCreateUser([