From 6a4c2023fd724dc0b46206523347298c09ceb26c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mads=20N=C3=B8rgaard?= Date: Thu, 21 Sep 2023 19:40:09 +0200 Subject: [PATCH] Revert "Merge pull request #93 from OS2Forms/feature/OS2FRMS-11--cleanup-permissions-by-term" This reverts commit 8cd2586ea76fd43f1448b48c7056275e0c294601, reversing changes made to 703123175875eea2ac0810386a6f31685867ee7d. --- composer.json | 25 ++++++ composer.lock | 83 ++++++++++++-------- patches/webform_permissions_by_term-d9.patch | 11 +++ 3 files changed, 85 insertions(+), 34 deletions(-) create mode 100644 patches/webform_permissions_by_term-d9.patch diff --git a/composer.json b/composer.json index f9a6b75..de9fd98 100644 --- a/composer.json +++ b/composer.json @@ -27,6 +27,24 @@ } } }, + { + "type": "package", + "package": { + "name": "drupal/webform_permissions_by_term", + "version": "1.2.0", + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/webform_permissions_by_term-8.x-1.2.zip", + "reference": "8.x-1.2", + "shasum": "eabcfdbbbc850986fdd0d8b3a26cad8d6b5d675e" + }, + "require": { + "drupal/core": "~8.0 || ^9.0", + "drupal/permissions_by_term": "*" + }, + "type": "drupal-module" + } + }, { "type": "package", "package": { @@ -83,6 +101,7 @@ "drupal/menu_link_attributes": "^1.3", "drupal/migrate_tools": "^5.0", "drupal/migrate_upgrade": "^4.0", + "drupal/permissions_by_term": "3.1.21", "drupal/queue_mail": "^1.3", "drupal/queue_ui": "^2.1", "drupal/restui": "^1.20", @@ -94,6 +113,7 @@ "drupal/webform_composite": "^1.0@RC", "drupal/webform_migrate": "^1.2", "drupal/webform_node_element": "^1.1", + "drupal/webform_permissions_by_term": "^1.2", "drupal/webform_scheduled_tasks": "^2.0", "drupal/webform_views": "^5.0@alpha", "drush/drush": "^11", @@ -180,6 +200,11 @@ "force-reset": true }, "patches": { + "drupal/webform_permissions_by_term": { + "3192241 - Too few arguments after Permissions by Term update to 2.28": "https://www.drupal.org/files/issues/2021-12-10/too-few-arguments-access-check_3192241-3.patch", + "3142184 - Automated Drupal 9 compatibility fixes": "https://www.drupal.org/files/issues/2020-06-28/webform_permissions_by_term.1.x-dev.rector.patch", + "Enabled D9 support": "patches/webform_permissions_by_term-d9.patch" + }, "drupal/webform_embed": { "Enabled D9 support": "./patches/webform_embed-d9.patch", "3170384 - Fixed D9 imcopatibility": "https://www.drupal.org/files/issues/2020-09-11/3170384-2.patch" diff --git a/composer.lock b/composer.lock index cfc6813..652bae1 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": "df1ea720ad29356b6b8cb53f63089cba", + "content-hash": "368fa97cf7b4e3f9795335e8b32bf56f", "packages": [ { "name": "alchemy/zippy", @@ -4180,6 +4180,10 @@ { "name": "tatarbj", "homepage": "https://www.drupal.org/user/649590" + }, + { + "name": "volkswagenchick", + "homepage": "https://www.drupal.org/user/3332522" } ], "description": "Adds configuration to the system breadcrumbs.", @@ -4880,10 +4884,6 @@ "GPL-2.0+" ], "authors": [ - { - "name": "andrechun", - "homepage": "https://www.drupal.org/user/367558" - }, { "name": "gigiabba", "homepage": "https://www.drupal.org/user/3467335" @@ -7266,27 +7266,27 @@ }, { "name": "drupal/permissions_by_term", - "version": "3.1.27", + "version": "3.1.21", "source": { "type": "git", "url": "https://git.drupalcode.org/project/permissions_by_term.git", - "reference": "3.1.27" + "reference": "3.1.21" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/permissions_by_term-3.1.27.zip", - "reference": "3.1.27", - "shasum": "97787632318c38a458f2b0a87a75844742470de8" + "url": "https://ftp.drupal.org/files/projects/permissions_by_term-3.1.21.zip", + "reference": "3.1.21", + "shasum": "ecd9340f1aac1f183398a571415bb0859fcb6f4c" }, "require": { - "drupal/core": "^9.1 || ^10", + "drupal/core": "^9.0", "php": ">=7.1.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "3.1.27", - "datestamp": "1694609792", + "version": "3.1.21", + "datestamp": "1668009531", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7295,7 +7295,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0-or-later" + "GPL-2.0+" ], "authors": [ { @@ -7826,7 +7826,7 @@ "require": { "drupal/core": "^8.7||^9.0", "drupal/externalauth": "^1.1||^2.0", - "simplesamlphp/simplesamlphp": "^1.18.2||^1.19" + "simplesamlphp/simplesamlphp": "^1.19" }, "type": "drupal-module", "extra": { @@ -8790,6 +8790,21 @@ "issues": "https://www.drupal.org/project/issues/search/webform_node_element" } }, + { + "name": "drupal/webform_permissions_by_term", + "version": "1.2.0", + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/webform_permissions_by_term-8.x-1.2.zip", + "reference": "8.x-1.2", + "shasum": "eabcfdbbbc850986fdd0d8b3a26cad8d6b5d675e" + }, + "require": { + "drupal/core": "~8.0 || ^9.0", + "drupal/permissions_by_term": "*" + }, + "type": "drupal-module" + }, { "name": "drupal/webform_remote_handlers", "version": "1.9.0", @@ -21578,16 +21593,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.0", + "version": "1.23.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6" + "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/3510b0a6274cc42f7219367cb3abfc123ffa09d6", - "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26", + "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26", "shasum": "" }, "require": { @@ -21619,22 +21634,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.1" }, - "time": "2023-09-07T20:46:32+00:00" + "time": "2023-08-03T16:32:59+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.28", + "version": "9.2.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef" + "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef", - "reference": "7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1", + "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1", "shasum": "" }, "require": { @@ -21691,7 +21706,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.28" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.27" }, "funding": [ { @@ -21699,7 +21714,7 @@ "type": "github" } ], - "time": "2023-09-12T14:36:20+00:00" + "time": "2023-07-26T13:44:30+00:00" }, { "name": "phpunit/php-file-iterator", @@ -21944,16 +21959,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.12", + "version": "9.6.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a122c2ebd469b751d774aa0f613dc0d67697653f" + "reference": "810500e92855eba8a7a5319ae913be2da6f957b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a122c2ebd469b751d774aa0f613dc0d67697653f", - "reference": "a122c2ebd469b751d774aa0f613dc0d67697653f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/810500e92855eba8a7a5319ae913be2da6f957b0", + "reference": "810500e92855eba8a7a5319ae913be2da6f957b0", "shasum": "" }, "require": { @@ -21968,7 +21983,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.28", + "phpunit/php-code-coverage": "^9.2.13", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -22027,7 +22042,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.12" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.11" }, "funding": [ { @@ -22043,7 +22058,7 @@ "type": "tidelift" } ], - "time": "2023-09-12T14:39:31+00:00" + "time": "2023-08-19T07:10:56+00:00" }, { "name": "react/promise", diff --git a/patches/webform_permissions_by_term-d9.patch b/patches/webform_permissions_by_term-d9.patch new file mode 100644 index 0000000..4a76ece --- /dev/null +++ b/patches/webform_permissions_by_term-d9.patch @@ -0,0 +1,11 @@ +diff --git a/webform_permissions_by_term.info.yml b/webform_permissions_by_term.info.yml +index 870f4dd..c1cd9d0 100644 +--- a/webform_permissions_by_term.info.yml ++++ b/webform_permissions_by_term.info.yml +@@ -2,5 +2,6 @@ name: 'Webform Permissions by Term' + description: 'Extends the functionality of Permissions By Term to be able to limit the webform submissions access by users or roles.' + type: module + # core: 8.x ++core_version_requirement: ^8 || ^9 + dependencies: + - permissions_by_term