From a97f1796bf0c31553d3d0f231d722b465d7644e3 Mon Sep 17 00:00:00 2001
From: Brian Canini <canini.16@osu.edu>
Date: Tue, 23 Jun 2020 15:05:00 -0400
Subject: [PATCH] Updating drupal/allowed_formats (1.2.0 => 1.3.0)
---
composer.json | 2 +-
composer.lock | 21 ++++++++-----------
vendor/composer/installed.json | 21 ++++++++-----------
.../allowed_formats/allowed_formats.info.yml | 8 +++----
.../allowed_formats_base_fields_test.info.yml | 9 ++++----
.../src/Functional}/AllowedFormatsTest.php | 18 +++++++++-------
6 files changed, 38 insertions(+), 41 deletions(-)
rename web/modules/allowed_formats/{src/Tests => tests/src/Functional}/AllowedFormatsTest.php (93%)
diff --git a/composer.json b/composer.json
index 93ce7a8a30..97a9254085 100644
--- a/composer.json
+++ b/composer.json
@@ -90,7 +90,7 @@
"drupal/addtocalendar": "3.2",
"drupal/admin_toolbar": "2.3",
"drupal/administerusersbyrole": "3.0",
- "drupal/allowed_formats": "1.2",
+ "drupal/allowed_formats": "1.3",
"drupal/anchor_link": "1.7",
"drupal/better_exposed_filters": "3.0-alpha6",
"drupal/bigmenu": "1.0.0-alpha1",
diff --git a/composer.lock b/composer.lock
index 15b1d3306b..ba1c094352 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": "c24125320eff87a059378e0ed5a2e0f5",
+ "content-hash": "7dd9a8b5e6d785337762dd2b7cb8ddd2",
"packages": [
{
"name": "alchemy/zippy",
@@ -2244,29 +2244,26 @@
},
{
"name": "drupal/allowed_formats",
- "version": "1.2.0",
+ "version": "1.3.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/allowed_formats.git",
- "reference": "8.x-1.2"
+ "reference": "8.x-1.3"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/allowed_formats-8.x-1.2.zip",
- "reference": "8.x-1.2",
- "shasum": "50f8f80cf3326382c968521d34d3a113b37e32b3"
+ "url": "https://ftp.drupal.org/files/projects/allowed_formats-8.x-1.3.zip",
+ "reference": "8.x-1.3",
+ "shasum": "4c3c036d7b41428d6e22b61f1219de0ab012feec"
},
"require": {
- "drupal/core": "*"
+ "drupal/core": "^8.7.7 || ^9"
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-1.x": "1.x-dev"
- },
"drupal": {
- "version": "8.x-1.2",
- "datestamp": "1573747386",
+ "version": "8.x-1.3",
+ "datestamp": "1592909219",
"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 cb790bb0de..b2f3dc2db1 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2313,30 +2313,27 @@
},
{
"name": "drupal/allowed_formats",
- "version": "1.2.0",
- "version_normalized": "1.2.0.0",
+ "version": "1.3.0",
+ "version_normalized": "1.3.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/allowed_formats.git",
- "reference": "8.x-1.2"
+ "reference": "8.x-1.3"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/allowed_formats-8.x-1.2.zip",
- "reference": "8.x-1.2",
- "shasum": "50f8f80cf3326382c968521d34d3a113b37e32b3"
+ "url": "https://ftp.drupal.org/files/projects/allowed_formats-8.x-1.3.zip",
+ "reference": "8.x-1.3",
+ "shasum": "4c3c036d7b41428d6e22b61f1219de0ab012feec"
},
"require": {
- "drupal/core": "*"
+ "drupal/core": "^8.7.7 || ^9"
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-1.x": "1.x-dev"
- },
"drupal": {
- "version": "8.x-1.2",
- "datestamp": "1573747386",
+ "version": "8.x-1.3",
+ "datestamp": "1592909219",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/web/modules/allowed_formats/allowed_formats.info.yml b/web/modules/allowed_formats/allowed_formats.info.yml
index fe1aaf95ab..cef7368645 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: 8.x
+core_version_requirement: ^8.7.7 || ^9
dependencies:
- drupal:field
- drupal:filter
-# Information added by Drupal.org packaging script on 2019-11-14
-version: '8.x-1.2'
+# Information added by Drupal.org packaging script on 2020-06-23
+version: '8.x-1.3'
project: 'allowed_formats'
-datestamp: 1573747389
+datestamp: 1592909221
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 c24599bce2..6fba0b8350 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,13 +2,12 @@ name: 'Allowed formats base fields test'
type: module
description: 'Support module for allowed formats testing on base fields.'
package: Testing
-# version: VERSION
-core: 8.x
+core_version_requirement: ^8.7.7 || ^9
dependencies:
drupal:taxonomy
drupal:allowed_formats
-# Information added by Drupal.org packaging script on 2019-11-14
-version: '8.x-1.2'
+# Information added by Drupal.org packaging script on 2020-06-23
+version: '8.x-1.3'
project: 'allowed_formats'
-datestamp: 1573747389
+datestamp: 1592909221
diff --git a/web/modules/allowed_formats/src/Tests/AllowedFormatsTest.php b/web/modules/allowed_formats/tests/src/Functional/AllowedFormatsTest.php
similarity index 93%
rename from web/modules/allowed_formats/src/Tests/AllowedFormatsTest.php
rename to web/modules/allowed_formats/tests/src/Functional/AllowedFormatsTest.php
index 3d8eaceb04..ea2109be72 100644
--- a/web/modules/allowed_formats/src/Tests/AllowedFormatsTest.php
+++ b/web/modules/allowed_formats/tests/src/Functional/AllowedFormatsTest.php
@@ -1,22 +1,26 @@
<?php
-namespace Drupal\allowed_formats\Tests;
+namespace Drupal\Tests\allowed_formats\Functional;
-use Drupal\Component\Utility\Unicode;
use Drupal\filter\Entity\FilterFormat;
-use Drupal\simpletest\WebTestBase;
-use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait;
/**
* Tests the basic functionality of Allowed Formats.
*
* @group allowed_formats
*/
-class AllowedFormatsTest extends WebTestBase {
+class AllowedFormatsTest extends BrowserTestBase {
// Provides shortcut method createVocabulary().
use TaxonomyTestTrait;
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
/**
* Modules to enable.
*
@@ -60,7 +64,7 @@ public function testAllowedFormats() {
// Create one text format.
$format1 = FilterFormat::create([
- 'format' => Unicode::strtolower($this->randomMachineName()),
+ 'format' => mb_strtolower($this->randomMachineName()),
'name' => $this->randomString(),
'roles' => [$this->webUser->getRoles()[0]],
]);
@@ -68,7 +72,7 @@ public function testAllowedFormats() {
// Create a second text format.
$format2 = FilterFormat::create([
- 'format' => Unicode::strtolower($this->randomMachineName()),
+ 'format' => mb_strtolower($this->randomMachineName()),
'name' => $this->randomString(),
'roles' => [$this->webUser->getRoles()[0]],
]);
--
GitLab