diff --git a/composer.json b/composer.json
index bdd5be6d0cbd2db7f0230ed406d2cd35204d2432..62b3a7aba420d6555e03d704956c6144ed4a904a 100644
--- a/composer.json
+++ b/composer.json
@@ -95,7 +95,7 @@
"drupal/anchor_link": "1.10",
"drupal/better_exposed_filters": "^6.0",
"drupal/block_field": "1.0.0-rc4",
- "drupal/block_permissions": "1.2",
+ "drupal/block_permissions": "1.3",
"drupal/block_region_permissions": "1.5",
"drupal/bootstrap": "^3.23",
"drupal/cache_control_override": "^1.0@alpha",
diff --git a/composer.lock b/composer.lock
index 083032d5e166d78078f2c87849a09906c1086750..9fc4612e2d9c93c1881b89de4796488e60b78969 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2118,26 +2118,26 @@
},
{
"name": "drupal/block_permissions",
- "version": "1.2.0",
+ "version": "1.3.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/block_permissions.git",
- "reference": "8.x-1.2"
+ "reference": "8.x-1.3"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/block_permissions-8.x-1.2.zip",
- "reference": "8.x-1.2",
- "shasum": "45c63cf14da18d82c73049c8dcdf90fde6a107b5"
+ "url": "https://ftp.drupal.org/files/projects/block_permissions-8.x-1.3.zip",
+ "reference": "8.x-1.3",
+ "shasum": "f12967eba6498a77249836849b4245c98af60867"
},
"require": {
- "drupal/core": "^8 || ^9"
+ "drupal/core": "^9.3 || ^10"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.2",
- "datestamp": "1617805905",
+ "version": "8.x-1.3",
+ "datestamp": "1680965820",
"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 88ccbbe1c2c6442f9c9890bf3e67f2fa0209116e..d889cc2ffedc7be5d3ed2cb9609c9e1f95670484 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2199,27 +2199,27 @@
},
{
"name": "drupal/block_permissions",
- "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/block_permissions.git",
- "reference": "8.x-1.2"
+ "reference": "8.x-1.3"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/block_permissions-8.x-1.2.zip",
- "reference": "8.x-1.2",
- "shasum": "45c63cf14da18d82c73049c8dcdf90fde6a107b5"
+ "url": "https://ftp.drupal.org/files/projects/block_permissions-8.x-1.3.zip",
+ "reference": "8.x-1.3",
+ "shasum": "f12967eba6498a77249836849b4245c98af60867"
},
"require": {
- "drupal/core": "^8 || ^9"
+ "drupal/core": "^9.3 || ^10"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.2",
- "datestamp": "1617805905",
+ "version": "8.x-1.3",
+ "datestamp": "1680965820",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -2232,10 +2232,6 @@
"GPL-2.0+"
],
"authors": [
- {
- "name": "Steven Buteneers",
- "homepage": "https://www.drupal.org/user/3301055"
- },
{
"name": "jefuri",
"homepage": "https://www.drupal.org/user/2733365"
@@ -2247,6 +2243,10 @@
{
"name": "sinn",
"homepage": "https://www.drupal.org/user/682600"
+ },
+ {
+ "name": "Steven Buteneers",
+ "homepage": "https://www.drupal.org/user/3301055"
}
],
"description": "Adds specific permissions for administering blocks.",
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 7f1b135a30fb398d5a841d7e45c26d759bb2f85c..dd96b6833c7f5df3d091179ff3bc9be277f620d3 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -335,9 +335,9 @@
'dev_requirement' => false,
),
'drupal/block_permissions' => array(
- 'pretty_version' => '1.2.0',
- 'version' => '1.2.0.0',
- 'reference' => '8.x-1.2',
+ 'pretty_version' => '1.3.0',
+ 'version' => '1.3.0.0',
+ 'reference' => '8.x-1.3',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/block_permissions',
'aliases' => array(),
diff --git a/web/modules/block_permissions/README.txt b/web/modules/block_permissions/README.md
similarity index 68%
rename from web/modules/block_permissions/README.txt
rename to web/modules/block_permissions/README.md
index e586f4be6af0b1aa43710512a3efef9627d9f539..ebce7982f17e4db077dc999f91e2922f6f2ed558 100644
--- a/web/modules/block_permissions/README.txt
+++ b/web/modules/block_permissions/README.md
@@ -1,14 +1,13 @@
-CONTENTS OF THIS FILE
----------------------
+## CONTENTS OF THIS FILE
- * Introduction
- * Requirements
- * Installation
- * Configuration
- * Maintainers
+ - Introduction
+ - Requirements
+ - Installation
+ - Configuration
+ - Maintainers
+
+## INTRODUCTION
-INTRODUCTION
-------------
This module provides additional permissions for finer grained permissions in
managing blocks.
@@ -23,20 +22,17 @@ The following permissions are added:
This enables granting a user permission to add certain types of blocks but not
system block plugins.
-REQUIREMENTS
-------------
+## REQUIREMENTS
No requirements for this module.
-INSTALLATION
-------------
+## INSTALLATION
- * Install as you would normally install a contributed Drupal module. See:
- https://drupal.org/documentation/install/modules-themes/modules-8
+ - Install as you would normally install a contributed Drupal module. See:
+ <https://www.drupal.org/docs/extending-drupal/installing-modules>
for further information.
-CONFIGURATION
--------------
+## CONFIGURATION
After enabling this module users without the specific permissions will not be
able to manage the blocks, even if they have the permission to administer the
@@ -48,8 +44,8 @@ For Block layout page (/admin/structure/block) permission 'administer blocks' is
permission to administer block settings for the default theme also.
-MAINTAINERS
------------
+## MAINTAINERS
Current maintainers:
- * Michiel Nugter - https://www.drupal.org/user/1023784
+ * Michiel Nugter - <https://www.drupal.org/user/1023784>
+ * Evgenii Nikitin - <https://www.drupal.org/u/sinn>
diff --git a/web/modules/block_permissions/block_permissions.info.yml b/web/modules/block_permissions/block_permissions.info.yml
index 0d0bfc479fbd1a1c8a1d2d6a8d832dfcbd7d8e3b..4c5160838131348a6cb29fec90970146f778384b 100644
--- a/web/modules/block_permissions/block_permissions.info.yml
+++ b/web/modules/block_permissions/block_permissions.info.yml
@@ -2,10 +2,9 @@ name: 'Block Permissions'
type: module
description: 'Adds specific permissions for administering blocks.'
package: Block
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9.3 || ^10
-# Information added by Drupal.org packaging script on 2021-04-07
-version: '8.x-1.2'
+# Information added by Drupal.org packaging script on 2023-04-08
+version: '8.x-1.3'
project: 'block_permissions'
-datestamp: 1617805907
+datestamp: 1680965779
diff --git a/web/modules/block_permissions/src/BlockPermissionsAccessControlHandler.php b/web/modules/block_permissions/src/BlockPermissionsAccessControlHandler.php
index d744c5ecd8161a7c0e39c45675a155ea5adfb700..2d337097c9a96584cc330bd93ed66e8da84be01a 100644
--- a/web/modules/block_permissions/src/BlockPermissionsAccessControlHandler.php
+++ b/web/modules/block_permissions/src/BlockPermissionsAccessControlHandler.php
@@ -43,7 +43,7 @@ public static function create(ContainerInterface $container) {
return new static(
$container->get('plugin.manager.block'),
$container->get('current_user'),
- $container->get('config.factory'),
+ $container->get('config.factory')
);
}
diff --git a/web/modules/block_permissions/tests/src/Functional/BlockFormRoutesAccessTest.php b/web/modules/block_permissions/tests/src/Functional/BlockFormRoutesAccessTest.php
index 8822732522456f5d3282aacf5cfb15662c08d589..527eba8dc60ae09a5812ac84e7d31a3752dc6b55 100644
--- a/web/modules/block_permissions/tests/src/Functional/BlockFormRoutesAccessTest.php
+++ b/web/modules/block_permissions/tests/src/Functional/BlockFormRoutesAccessTest.php
@@ -221,7 +221,7 @@ protected function getBlockAdminAddUrl($id, $theme) {
* Page title.
*/
protected function getBlockDeleteFormTitle($name) {
- return new FormattableMarkup('Are you sure you want to remove the block @name?', ['@name' => $name]);
+ return new FormattableMarkup('Are you sure you want to remove the block @name from the Content region?', ['@name' => $name]);
}
}
diff --git a/web/modules/block_permissions/tests/src/Functional/BlockPermissionsBrowserTestBase.php b/web/modules/block_permissions/tests/src/Functional/BlockPermissionsBrowserTestBase.php
index 0fa3bb0c3a91cd0aa756f674e544131d55202a16..6ebc5caaaea76bddd813c151f32b4911570c7e4b 100644
--- a/web/modules/block_permissions/tests/src/Functional/BlockPermissionsBrowserTestBase.php
+++ b/web/modules/block_permissions/tests/src/Functional/BlockPermissionsBrowserTestBase.php
@@ -27,7 +27,7 @@ abstract class BlockPermissionsBrowserTestBase extends BrowserTestBase {
*
* @var string
*/
- protected $secondTheme = 'bartik';
+ protected $secondTheme = 'olivero';
/**
* Page title block.