From 7a8371fbc0207d4610c57ed64ecf2af1716fd99e Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Tue, 28 Jun 2022 16:48:15 +0200 Subject: [PATCH 01/14] SUPPORT-532-changed-format-of-short-date --- config/sync/core.date_format.short.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sync/core.date_format.short.yml b/config/sync/core.date_format.short.yml index 5bfc0ad4..caf83d9c 100644 --- a/config/sync/core.date_format.short.yml +++ b/config/sync/core.date_format.short.yml @@ -7,4 +7,4 @@ _core: id: short label: 'Standard kort dato' locked: false -pattern: 'm/d/Y - H:i' +pattern: 'd. F Y' From 5684061d7023a33e7bb17ffffb6151bd3d4746d6 Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Wed, 29 Jun 2022 14:57:41 +0200 Subject: [PATCH 02/14] Cleaned up --- README.md | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 3b15809a..496fc24c 100644 --- a/README.md +++ b/README.md @@ -38,35 +38,10 @@ local machine for development and testing purposes. docker-compose exec phpfpm composer install --no-interaction ``` - **Note**: Due to we use - a composer [`post-install-cmd` - script](https://getcomposer.org/doc/articles/scripts.md#command-events) to - apply a patch to the OpenID Connect module (see - [`composer.json`](composer.json) for details). - - When is resolved, this - must be added to `extra.patches` in [`composer.json`](composer.json): - - ```json - { - … - "extra": { - … - "patches": { - … - "drupal/openid_connect": { - "Revoking group access does not reflect on applied roles (https://www.drupal.org/project/openid_connect/issues/3224128)": "https://git.drupalcode.org/project/openid_connect/-/merge_requests/31.diff" - } - … - } - } - } - ``` - 5. Install profile ```sh - docker-compose exec phpfpm vendor/bin/drush site:install os2forms_forloeb_profile --existing-config + docker-compose exec phpfpm vendor/bin/drush site:install os2forms_forloeb_profile --existing-config ``` Should you encounter the following error: @@ -79,7 +54,7 @@ local machine for development and testing purposes. Proceed to remove this entry from the db via the sql cli: ```sh - itkdev-docker-compose vendor/bin/drush sql:query 'DELETE FROM config WHERE name="config_entity_revisions.config_entity_revisions_type.webform_revisions";' + docker-compose exec phpfpm vendor/bin/drush sql:query 'DELETE FROM config WHERE name="config_entity_revisions.config_entity_revisions_type.webform_revisions";' ``` Afterwards, run config-import to import config from files: From f2847f4b18c549b33b7d0c38b3e88ab8d1892e98 Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Wed, 29 Jun 2022 15:05:27 +0200 Subject: [PATCH 03/14] Updated os2forms packages --- composer.lock | 50 +++++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/composer.lock b/composer.lock index a1900e13..09434a2f 100644 --- a/composer.lock +++ b/composer.lock @@ -8834,16 +8834,16 @@ }, { "name": "os2forms/os2forms", - "version": "3.2.3", + "version": "3.2.7", "source": { "type": "git", "url": "https://github.com/OS2Forms/os2forms.git", - "reference": "f76037a0a58e2992234d9bc52777b17b5c5bb0b7" + "reference": "96cc03245ce35ee885cc54f530aec494a7fce62c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/OS2Forms/os2forms/zipball/f76037a0a58e2992234d9bc52777b17b5c5bb0b7", - "reference": "f76037a0a58e2992234d9bc52777b17b5c5bb0b7", + "url": "https://api.github.com/repos/OS2Forms/os2forms/zipball/96cc03245ce35ee885cc54f530aec494a7fce62c", + "reference": "96cc03245ce35ee885cc54f530aec494a7fce62c", "shasum": "" }, "require": { @@ -8867,6 +8867,10 @@ "tecnickcom/tcpdf": "~6", "vaimo/composer-patches": "^4.20" }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1", + "drupal/coder": "^8.3" + }, "type": "drupal-module", "extra": { "composer-exit-on-patch-failure": true, @@ -8890,22 +8894,22 @@ "description": "Drupal 8 OS2Form module provides advanced webform functionality for Danish Municipalities", "support": { "issues": "https://github.com/OS2Forms/os2forms/issues", - "source": "https://github.com/OS2Forms/os2forms/tree/3.2.3" + "source": "https://github.com/OS2Forms/os2forms/tree/3.2.7" }, - "time": "2022-02-03T13:37:29+00:00" + "time": "2022-06-29T10:37:55+00:00" }, { "name": "os2forms/os2forms_forloeb", - "version": "2.3.1", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/OS2Forms/os2forms_forloeb.git", - "reference": "59c6bc586f01477dd574d5c23b271e96f398b601" + "reference": "05fedb45429b06b8218bd9477b7496e86e22a434" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/OS2Forms/os2forms_forloeb/zipball/59c6bc586f01477dd574d5c23b271e96f398b601", - "reference": "59c6bc586f01477dd574d5c23b271e96f398b601", + "url": "https://api.github.com/repos/OS2Forms/os2forms_forloeb/zipball/05fedb45429b06b8218bd9477b7496e86e22a434", + "reference": "05fedb45429b06b8218bd9477b7496e86e22a434", "shasum": "" }, "require": { @@ -8947,6 +8951,10 @@ "webmozart/path-util": "^2.3", "zaporylie/composer-drupal-optimizations": "^1.2" }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1", + "drupal/coder": "^8.3" + }, "type": "drupal-module", "extra": { "composer-exit-on-patch-failure": true, @@ -8982,22 +8990,22 @@ "description": "This module adds Maestro workflow engine and functionality to produce advanced workflows", "support": { "issues": "https://github.com/OS2Forms/os2forms_forloeb/issues", - "source": "https://github.com/OS2Forms/os2forms_forloeb/tree/2.3.1" + "source": "https://github.com/OS2Forms/os2forms_forloeb/tree/2.4.0" }, - "time": "2022-02-08T16:01:38+00:00" + "time": "2022-06-27T09:00:22+00:00" }, { "name": "os2forms/os2forms_forloeb_profile", - "version": "1.8.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/OS2Forms/os2forms_forloeb_profile.git", - "reference": "6d84f6f4769d52ce9aa6a5a3b452906c9c76436b" + "reference": "32e80e3491b6d04eb3be7957c8e0a1fd06b44df9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/OS2Forms/os2forms_forloeb_profile/zipball/6d84f6f4769d52ce9aa6a5a3b452906c9c76436b", - "reference": "6d84f6f4769d52ce9aa6a5a3b452906c9c76436b", + "url": "https://api.github.com/repos/OS2Forms/os2forms_forloeb_profile/zipball/32e80e3491b6d04eb3be7957c8e0a1fd06b44df9", + "reference": "32e80e3491b6d04eb3be7957c8e0a1fd06b44df9", "shasum": "" }, "require": { @@ -9007,6 +9015,10 @@ "os2forms/os2forms_forloeb": "^2.0.0-rc", "os2web/os2web_simplesaml": "8.x-dev" }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1", + "drupal/coder": "^8.3" + }, "type": "drupal-profile", "extra": { "composer-exit-on-patch-failure": true, @@ -9030,9 +9042,9 @@ "description": "This profile adds the configuration and initial install of OS2forms 2.1 med Forløb.", "support": { "issues": "https://github.com/OS2Forms/os2forms_forloeb_profile/issues", - "source": "https://github.com/OS2Forms/os2forms_forloeb_profile/tree/1.8.0" + "source": "https://github.com/OS2Forms/os2forms_forloeb_profile/tree/1.9.0" }, - "time": "2022-01-25T12:52:20+00:00" + "time": "2022-06-29T12:33:38+00:00" }, { "name": "os2web/os2web_datalookup", @@ -21040,5 +21052,5 @@ "php": "~7.4.0 || ~8.0.0" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } From 740706129abdef7fe271a0116f62a1e63fab7196 Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Wed, 29 Jun 2022 15:10:34 +0200 Subject: [PATCH 04/14] Updated drupal/maestro --- composer.json | 2 +- composer.lock | 31 +++++++++++++------------------ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index a9c2eb85..643762c8 100644 --- a/composer.json +++ b/composer.json @@ -73,7 +73,7 @@ "drupal/core-project-message": "^9.1", "drupal/core-recommended": "^9.1", "drupal/key_auth": "^2.0", - "drupal/maestro": "dev-3.x as 3.0.1-rc2", + "drupal/maestro": "^3.0", "drupal/memcache": "^2.3", "drupal/menu_link_attributes": "^1.2", "drupal/openid_connect": "^2.0", diff --git a/composer.lock b/composer.lock index 09434a2f..a0a5702d 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": "2a445a33df1e1dc4517fc6c64519803a", + "content-hash": "9ee0315646917393a415716cc94540f1", "packages": [ { "name": "asm89/stack-cors", @@ -4128,11 +4128,17 @@ }, { "name": "drupal/maestro", - "version": "dev-3.x", + "version": "3.0.1-rc3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/maestro.git", - "reference": "ee70d0ec009b7ab57104c79944d35e3a7bfc0690" + "reference": "3.0.1-rc3" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/maestro-3.0.1-rc3.zip", + "reference": "3.0.1-rc3", + "shasum": "9b2344cfd2ea0d0175f1fa35c970c44881877305" }, "require": { "drupal/core": "^8.8 || ^9" @@ -4143,15 +4149,12 @@ }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-3.x": "3.x-dev" - }, "drupal": { - "version": "3.x-dev", - "datestamp": "1643124375", + "version": "3.0.1-rc3", + "datestamp": "1623431606", "security-coverage": { "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "message": "RC releases are not covered by Drupal security advisories." } } }, @@ -21030,17 +21033,9 @@ "time": "2021-07-28T10:34:58+00:00" } ], - "aliases": [ - { - "package": "drupal/maestro", - "version": "dev-3.x", - "alias": "3.0.1-rc2", - "alias_normalized": "3.0.1.0-RC2" - } - ], + "aliases": [], "minimum-stability": "dev", "stability-flags": { - "drupal/maestro": 20, "itk-dev/os2forms_digital_post": 20, "itk-dev/os2forms_nemlogin_openid_connect": 20, "itk-dev/os2forms_user_field_lookup": 20, From 386469f5f6fbbc5d570c427cd72aabf5a303b9d2 Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Wed, 29 Jun 2022 20:27:11 +0200 Subject: [PATCH 05/14] DW-560: Updated itk-dev/web_accessibility_statement version constraint --- composer.json | 2 +- composer.lock | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 643762c8..9693bb14 100644 --- a/composer.json +++ b/composer.json @@ -86,7 +86,7 @@ "itk-dev/os2forms_digital_post": "dev-develop", "itk-dev/os2forms_nemlogin_openid_connect": "dev-develop", "itk-dev/os2forms_user_field_lookup": "dev-develop", - "itk-dev/web_accessibility_statement": "dev-master", + "itk-dev/web_accessibility_statement": "^1.0", "os2forms/os2forms_forloeb_profile": "^1.8" }, "require-dev": { diff --git a/composer.lock b/composer.lock index a0a5702d..9ac0a249 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": "9ee0315646917393a415716cc94540f1", + "content-hash": "45b505b766a1ebf1f7699cf19f2544ad", "packages": [ { "name": "asm89/stack-cors", @@ -8201,7 +8201,7 @@ }, { "name": "itk-dev/web_accessibility_statement", - "version": "dev-master", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/itk-dev/web_accessibility_statement.git", @@ -8213,7 +8213,6 @@ "reference": "b27f2ea237f0712896f7440727c17c47a543e3ea", "shasum": "" }, - "default-branch": true, "type": "drupal-module", "notification-url": "https://packagist.org/downloads/", "description": "Provides path for accessibility statement", @@ -21038,8 +21037,7 @@ "stability-flags": { "itk-dev/os2forms_digital_post": 20, "itk-dev/os2forms_nemlogin_openid_connect": 20, - "itk-dev/os2forms_user_field_lookup": 20, - "itk-dev/web_accessibility_statement": 20 + "itk-dev/os2forms_user_field_lookup": 20 }, "prefer-stable": true, "prefer-lowest": false, From 960b5048b525da1c315708050e86de0b5e1e9377 Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Wed, 29 Jun 2022 20:44:58 +0200 Subject: [PATCH 06/14] DW-560: Updated itk-dev/os2forms_digital_post version constraint --- composer.json | 2 +- composer.lock | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 9693bb14..c6f2198f 100644 --- a/composer.json +++ b/composer.json @@ -83,7 +83,7 @@ "itk-dev/getorganized-api-client-php": "^1.0", "itk-dev/os2forms_cpr_lookup": "^1.6.3", "itk-dev/os2forms_cvr_lookup": "^1.1", - "itk-dev/os2forms_digital_post": "dev-develop", + "itk-dev/os2forms_digital_post": "^1.0", "itk-dev/os2forms_nemlogin_openid_connect": "dev-develop", "itk-dev/os2forms_user_field_lookup": "dev-develop", "itk-dev/web_accessibility_statement": "^1.0", diff --git a/composer.lock b/composer.lock index 9ac0a249..93064113 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": "45b505b766a1ebf1f7699cf19f2544ad", + "content-hash": "a61deae95412c0a973b3fbcbccb84bb9", "packages": [ { "name": "asm89/stack-cors", @@ -8007,16 +8007,16 @@ }, { "name": "itk-dev/os2forms_digital_post", - "version": "dev-develop", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/itk-dev/os2forms_digital_post.git", - "reference": "a023e6a0311560dbbeefe55aceaea27a2abb38e4" + "reference": "d340703f412e2f33a946af1140ae866660f20491" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/itk-dev/os2forms_digital_post/zipball/a023e6a0311560dbbeefe55aceaea27a2abb38e4", - "reference": "a023e6a0311560dbbeefe55aceaea27a2abb38e4", + "url": "https://api.github.com/repos/itk-dev/os2forms_digital_post/zipball/d340703f412e2f33a946af1140ae866660f20491", + "reference": "d340703f412e2f33a946af1140ae866660f20491", "shasum": "" }, "require": { @@ -8035,7 +8035,6 @@ "drupal/coder": "^8.3", "wsdltophp/packagegenerator": "^4.0" }, - "default-branch": true, "type": "drupal-module", "autoload": { "Drupal\\os2forms_digital_post\\": "src/" @@ -8065,10 +8064,10 @@ ], "description": "Provides integration to Print service provided by Serviceplatformen.", "support": { - "source": "https://github.com/itk-dev/os2forms_digital_post/tree/develop", + "source": "https://github.com/itk-dev/os2forms_digital_post/tree/1.0.0", "issues": "https://github.com/itk-dev/os2forms_digital_post/issues" }, - "time": "2022-06-13T10:36:59+00:00" + "time": "2022-06-29T18:31:41+00:00" }, { "name": "itk-dev/os2forms_nemlogin_openid_connect", @@ -21035,7 +21034,6 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "itk-dev/os2forms_digital_post": 20, "itk-dev/os2forms_nemlogin_openid_connect": 20, "itk-dev/os2forms_user_field_lookup": 20 }, From d880d41748bd513ff1765381ccfab424e4e2ccf7 Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Wed, 29 Jun 2022 20:51:42 +0200 Subject: [PATCH 07/14] DW-560: Updated itk-dev/os2forms_nemlogin_openid_connect version constraint --- composer.json | 2 +- composer.lock | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index c6f2198f..20c29466 100644 --- a/composer.json +++ b/composer.json @@ -84,7 +84,7 @@ "itk-dev/os2forms_cpr_lookup": "^1.6.3", "itk-dev/os2forms_cvr_lookup": "^1.1", "itk-dev/os2forms_digital_post": "^1.0", - "itk-dev/os2forms_nemlogin_openid_connect": "dev-develop", + "itk-dev/os2forms_nemlogin_openid_connect": "^1.0", "itk-dev/os2forms_user_field_lookup": "dev-develop", "itk-dev/web_accessibility_statement": "^1.0", "os2forms/os2forms_forloeb_profile": "^1.8" diff --git a/composer.lock b/composer.lock index 93064113..2183b3fb 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": "a61deae95412c0a973b3fbcbccb84bb9", + "content-hash": "bb5c06d2965438ba67394b91c11fc0aa", "packages": [ { "name": "asm89/stack-cors", @@ -8071,16 +8071,16 @@ }, { "name": "itk-dev/os2forms_nemlogin_openid_connect", - "version": "dev-develop", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/itk-dev/os2forms_nemlogin_openid_connect.git", - "reference": "b223de1adb5653c08e26bccad516c4c548ae12f9" + "reference": "ea9896d8f088f1902be19397bc18b358e3de9991" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/itk-dev/os2forms_nemlogin_openid_connect/zipball/b223de1adb5653c08e26bccad516c4c548ae12f9", - "reference": "b223de1adb5653c08e26bccad516c4c548ae12f9", + "url": "https://api.github.com/repos/itk-dev/os2forms_nemlogin_openid_connect/zipball/ea9896d8f088f1902be19397bc18b358e3de9991", + "reference": "ea9896d8f088f1902be19397bc18b358e3de9991", "shasum": "" }, "require": { @@ -8109,10 +8109,10 @@ "description": "os2forms_nemlogin_openid_connect", "homepage": "https://www.drupal.org/project/os2forms_nemlogin_openid_connect", "support": { - "source": "https://github.com/itk-dev/os2forms_nemlogin_openid_connect/tree/develop", + "source": "https://github.com/itk-dev/os2forms_nemlogin_openid_connect/tree/1.0.0", "issues": "https://github.com/itk-dev/os2forms_nemlogin_openid_connect/issues" }, - "time": "2022-01-11T10:53:44+00:00" + "time": "2022-06-29T18:39:02+00:00" }, { "name": "itk-dev/os2forms_user_field_lookup", @@ -21034,7 +21034,6 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "itk-dev/os2forms_nemlogin_openid_connect": 20, "itk-dev/os2forms_user_field_lookup": 20 }, "prefer-stable": true, From 11ff4daa8956ad91c3a9cc92f7f017115798263d Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Wed, 29 Jun 2022 20:58:14 +0200 Subject: [PATCH 08/14] DW-560: Updated itk-dev/os2forms_user_field_lookup version constraint --- composer.json | 2 +- composer.lock | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 20c29466..81d41841 100644 --- a/composer.json +++ b/composer.json @@ -85,7 +85,7 @@ "itk-dev/os2forms_cvr_lookup": "^1.1", "itk-dev/os2forms_digital_post": "^1.0", "itk-dev/os2forms_nemlogin_openid_connect": "^1.0", - "itk-dev/os2forms_user_field_lookup": "dev-develop", + "itk-dev/os2forms_user_field_lookup": "^1.0", "itk-dev/web_accessibility_statement": "^1.0", "os2forms/os2forms_forloeb_profile": "^1.8" }, diff --git a/composer.lock b/composer.lock index 2183b3fb..57a148cd 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": "bb5c06d2965438ba67394b91c11fc0aa", + "content-hash": "676054b95d7e05d8e6c05c3a0dde13ba", "packages": [ { "name": "asm89/stack-cors", @@ -8116,16 +8116,16 @@ }, { "name": "itk-dev/os2forms_user_field_lookup", - "version": "dev-develop", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/itk-dev/os2forms_user_field_lookup.git", - "reference": "685e5b06d68c22f3aa772eaeb15b4d501689f555" + "reference": "2ccbcea20a0a762796d0ce16d9631a8558e344a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/itk-dev/os2forms_user_field_lookup/zipball/685e5b06d68c22f3aa772eaeb15b4d501689f555", - "reference": "685e5b06d68c22f3aa772eaeb15b4d501689f555", + "url": "https://api.github.com/repos/itk-dev/os2forms_user_field_lookup/zipball/2ccbcea20a0a762796d0ce16d9631a8558e344a6", + "reference": "2ccbcea20a0a762796d0ce16d9631a8558e344a6", "shasum": "" }, "require-dev": { @@ -8146,9 +8146,9 @@ "description": "Use user field data in webforms.", "support": { "issues": "https://github.com/itk-dev/os2forms_user_field_lookup/issues", - "source": "https://github.com/itk-dev/os2forms_user_field_lookup/tree/develop" + "source": "https://github.com/itk-dev/os2forms_user_field_lookup/tree/1.0.0" }, - "time": "2021-11-05T08:53:51+00:00" + "time": "2022-06-29T18:36:01+00:00" }, { "name": "itk-dev/serviceplatformen", @@ -21033,9 +21033,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "itk-dev/os2forms_user_field_lookup": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": { From 08612f1cac8cd01829263fd770ead3c1bf76d0f4 Mon Sep 17 00:00:00 2001 From: martinyde Date: Mon, 4 Jul 2022 12:47:00 +0200 Subject: [PATCH 09/14] Updated composer --- .docker/vhost.conf | 34 +++++----------------------------- .gitignore | 2 ++ docker-compose.dev.yml | 30 ++++++++++++++++++++++++++++++ docker-compose.redirect.yml | 17 +++++++++++++++++ docker-compose.server.yml | 24 +++++------------------- docker-compose.yml | 23 +++++++++++++++++++---- 6 files changed, 78 insertions(+), 52 deletions(-) create mode 100644 docker-compose.dev.yml create mode 100644 docker-compose.redirect.yml diff --git a/.docker/vhost.conf b/.docker/vhost.conf index 32c11a59..1e2e9e52 100644 --- a/.docker/vhost.conf +++ b/.docker/vhost.conf @@ -1,4 +1,3 @@ -# @see https://www.nginx.com/resources/wiki/start/topics/recipes/drupal/ server { listen 80; server_name localhost; @@ -16,9 +15,7 @@ server { access_log off; } - # Very rarely should these ever be accessed outside of your lan location ~* \.(txt|log)$ { - allow 192.168.0.0/16; deny all; } @@ -35,11 +32,6 @@ server { deny all; } - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - # Block access to "hidden" files and directories whose names begin with a # period. This includes directories used by version control systems such # as Subversion or Git to store control files. @@ -48,8 +40,7 @@ server { } location / { - # try_files $uri @rewrite; # For Drupal <= 6 - try_files $uri /index.php?$query_string; # For Drupal >= 7 + try_files $uri /index.php?$query_string; } location @rewrite { @@ -62,41 +53,26 @@ server { return 404; } - # In Drupal 8, we must also match new paths where the '.php' appears in - # the middle, such as update.php/selection. The rule we use is strict, - # and only allows this pattern with the update.php front controller. - # This allows legacy path aliases in the form of - # blog/index.php/legacy-path to continue to route to Drupal nodes. If - # you do not have any paths like that, then you might prefer to use a - # laxer rule, such as: - # location ~ \.php(/|$) { - # The laxer rule will continue to work if Drupal uses this new URL - # pattern with front controllers other than update.php in a future - # release. location ~ '\.php$|^/update.php' { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - # Security note: If you're running a version of PHP older than the - # latest 5.3, you should have "cgi.fix_pathinfo = 0;" in php.ini. - # See http://serverfault.com/q/627903/94922 for details. include fastcgi_params; - # Block httpoxy attacks. See https://httpoxy.org/. + fastcgi_param HTTP_PROXY ""; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param QUERY_STRING $query_string; + fastcgi_intercept_errors on; fastcgi_pass phpfpm:9000; } - # Fighting with Styles? This little gem is amazing. - # location ~ ^/sites/.*/files/imagecache/ { # For Drupal <= 6 - location ~ ^/sites/.*/files/styles/ { # For Drupal >= 7 + location ~ ^/sites/.*/files/styles/ { try_files $uri @rewrite; } # Handle private files through Drupal. Private file's path can come # with a language prefix. - location ~ ^(/[a-z\-]+)?/system/files/ { # For Drupal >= 7 + location ~ ^(/[a-z\-]+)?/system/files/ { try_files $uri /index.php?$query_string; } diff --git a/.gitignore b/.gitignore index 3e4dbe47..240fd773 100644 --- a/.gitignore +++ b/.gitignore @@ -146,6 +146,7 @@ /web/sites/*/private /web/sites/*/files-public /web/sites/*/files-private +/private # Ignore paths that may contain temporary files /web/sites/*/translations @@ -213,3 +214,4 @@ yarn-error.log config/sync/**/maestro.maestro_template.* config/sync/**/webform.webform_options.* config/sync/**/webform.webform.* + diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 00000000..16a21240 --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,30 @@ +# itk-version: 2.1.0 +version: "3" + +services: + phpfpm: + environment: + - PHP_MAILHOG_ENABLE=true + - PHP_MAILHOG_SERVER=mailhog + - PHP_MAILHOG_PORT=1025 + + nginx: + labels: + - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.middlewares=ITKBasicAuth@file" + + mailhog: + image: mailhog/mailhog + networks: + - app + - frontend + labels: + - "traefik.enable=true" + - "traefik.docker.network=frontend" + - "traefik.http.routers.mailhog_${COMPOSE_PROJECT_NAME}-http.rule=Host(`mailhog.${COMPOSE_SERVER_DOMAIN}`)" + - "traefik.http.routers.mailhog_${COMPOSE_PROJECT_NAME}-http.entrypoints=web" + - "traefik.http.routers.mailhog_${COMPOSE_PROJECT_NAME}-http.middlewares=redirect-to-https" + - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https" + - "traefik.http.routers.mailhog_${COMPOSE_PROJECT_NAME}.rule=Host(`mailhog.${COMPOSE_SERVER_DOMAIN}`)" + - "traefik.http.routers.mailhog_${COMPOSE_PROJECT_NAME}.entrypoints=websecure" + - "traefik.http.services.mailhog_${COMPOSE_PROJECT_NAME}.loadbalancer.server.port=8025" + - "traefik.http.routers.mailhog_${COMPOSE_PROJECT_NAME}.middlewares=ITKMailhogAuth@file" diff --git a/docker-compose.redirect.yml b/docker-compose.redirect.yml new file mode 100644 index 00000000..ee6568c3 --- /dev/null +++ b/docker-compose.redirect.yml @@ -0,0 +1,17 @@ +# itk-version: 2.1.0 +version: "3" + +services: + nginx: + labels: + # Add www before domain and set redirect to non-www + - "traefik.http.routers.www_${COMPOSE_PROJECT_NAME}-http.rule=Host(`www.${COMPOSE_SERVER_DOMAIN}`)" + - "traefik.http.routers.www_${COMPOSE_PROJECT_NAME}-http.entrypoints=web" + - "traefik.http.routers.www_${COMPOSE_PROJECT_NAME}-http.middlewares=redirect-to-https,non_www" + - "traefik.http.routers.www_${COMPOSE_PROJECT_NAME}.rule=Host(`www.${COMPOSE_SERVER_DOMAIN}`)" + - "traefik.http.routers.www_${COMPOSE_PROJECT_NAME}.entrypoints=websecure" + - "traefik.http.routers.www_${COMPOSE_PROJECT_NAME}.middlewares=non_www" + + - traefik.http.middlewares.non_www.redirectregex.regex=^(http|https)?://(?:www\.)?(.+) + - traefik.http.middlewares.non_www.redirectregex.replacement=https://$${2} + - traefik.http.middlewares.non_www.redirectregex.permanent=true diff --git a/docker-compose.server.yml b/docker-compose.server.yml index 3da25f9b..14c31b86 100644 --- a/docker-compose.server.yml +++ b/docker-compose.server.yml @@ -1,4 +1,4 @@ -# itk-version: 1.0.0 +# itk-version: 2.1.0 version: "3" networks: @@ -14,15 +14,16 @@ services: restart: unless-stopped networks: - app + extra_hosts: + - "host.docker.internal:host-gateway" environment: - PHP_MAX_EXECUTION_TIME=30 - PHP_MEMORY_LIMIT=128M - - COMPOSER_VERSION=1 + - COMPOSER_VERSION=2 depends_on: - memcached volumes: - .:/app:delegated - - drush-cache:/root/.drush nginx: image: nginx:stable-alpine @@ -45,8 +46,7 @@ services: - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-http.middlewares=redirect-to-https" - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https" - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host(`${COMPOSE_SERVER_DOMAIN}`)" - - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.entrypoints=websecure" - #- "traefik.http.routers.${COMPOSE_PROJECT_NAME}.middlewares=ITKBasicAuth@file" + - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.entrypoints=websecure" memcached: image: 'memcached:latest' @@ -55,17 +55,3 @@ services: - app environment: - MEMCACHED_CACHE_SIZE=64 - - drush: - image: itkdev/drush6:latest - networks: - - app - entrypoint: - - drush - volumes: - - drush-cache:/root/.drush - - ./:/app - -# Drush cache volume to persist cache between runs. -volumes: - drush-cache: diff --git a/docker-compose.yml b/docker-compose.yml index 72dff323..a810603e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -# itk-version: 1.0.1 +# itk-version: 2.0.1 version: "3" networks: @@ -21,7 +21,7 @@ services: - MYSQL_PASSWORD=db - MYSQL_DATABASE=db #- ENCRYPT=1 # Uncomment to enable database encryption. - # @see https://symfony.com/doc/current/setup/symfony_server.html#docker-integration + # https://symfony.com/doc/current/setup/symfony_server.html#docker-integration labels: com.symfony.server.service-prefix: 'DATABASE' @@ -41,7 +41,7 @@ services: - mariadb - memcached volumes: - - .:/app:delegated + - nfsApp:/app:delegated nginx: image: nginx:latest @@ -54,11 +54,14 @@ services: - '80' volumes: - ${PWD}/.docker/vhost.conf:/etc/nginx/conf.d/default.conf:ro - - ./:/app:delegated + - nfsApp:/app:delegated labels: - "traefik.enable=true" - "traefik.docker.network=frontend" - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host(`${COMPOSE_DOMAIN}`)" +# HTTPS config - uncomment to enable redirect from :80 to :443 +# - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.middlewares=redirect-to-https" +# - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https" memcached: image: 'memcached:latest' @@ -82,3 +85,15 @@ services: - "traefik.docker.network=frontend" - "traefik.http.routers.${COMPOSE_PROJECT_NAME}Mailhog.rule=Host(`mailhog-${COMPOSE_DOMAIN}`)" - "traefik.http.services.${COMPOSE_PROJECT_NAME}Mailhog.loadbalancer.server.port=8025" + +volumes: + # Named volume requires that you have NFS shares enabled (performance boost on Macs). + # Use `itkdev-docker-compose nfs:enable` to enable NFS shares. If you don't want to use it remove it from here and + # change the volume mapping to use normal shares in the containers. See + # https://sean-handley.medium.com/how-to-set-up-docker-for-mac-with-native-nfs-145151458adc + nfsApp: + driver: local + driver_opts: + type: nfs + o: addr=host.docker.internal,rw,nolock,hard,nointr,nfsvers=3 + device: ":$PWD" From b9b32ca331a479483a160354891b765ce70203d9 Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Mon, 4 Jul 2022 15:16:54 +0200 Subject: [PATCH 10/14] SUPP0RT-553: Allowed much longer authorization header values --- .../src/Plugin/WebformHandler/WebformHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/modules/custom/os2forms_api_request_handler/src/Plugin/WebformHandler/WebformHandler.php b/web/modules/custom/os2forms_api_request_handler/src/Plugin/WebformHandler/WebformHandler.php index c9019d05..b4c94e96 100644 --- a/web/modules/custom/os2forms_api_request_handler/src/Plugin/WebformHandler/WebformHandler.php +++ b/web/modules/custom/os2forms_api_request_handler/src/Plugin/WebformHandler/WebformHandler.php @@ -90,7 +90,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta ]; $form['api_authorization_header'] = [ - '#type' => 'textfield', + '#type' => 'textarea', '#title' => $this->t('API authorization header'), '#description' => $this->t('The API authorization header value. Will be sent in an authorization header: Authorization: «value».'), '#required' => TRUE, From c55014dacd376b552a86dcdb949df45f6dd6f037 Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Wed, 6 Jul 2022 15:39:13 +0200 Subject: [PATCH 11/14] DW-557: Updated drupal/maestro --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 57a148cd..70097c7f 100644 --- a/composer.lock +++ b/composer.lock @@ -4128,17 +4128,17 @@ }, { "name": "drupal/maestro", - "version": "3.0.1-rc3", + "version": "3.0.1-rc4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/maestro.git", - "reference": "3.0.1-rc3" + "reference": "3.0.1-rc4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/maestro-3.0.1-rc3.zip", - "reference": "3.0.1-rc3", - "shasum": "9b2344cfd2ea0d0175f1fa35c970c44881877305" + "url": "https://ftp.drupal.org/files/projects/maestro-3.0.1-rc4.zip", + "reference": "3.0.1-rc4", + "shasum": "79068c7b47cbce5a473031940ad551e6df7530c6" }, "require": { "drupal/core": "^8.8 || ^9" @@ -4150,8 +4150,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.1-rc3", - "datestamp": "1623431606", + "version": "3.0.1-rc4", + "datestamp": "1657119073", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." From 46cc742576bb3b0e6b8011cfb6e7fcf130c86b13 Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Thu, 7 Jul 2022 11:19:57 +0200 Subject: [PATCH 12/14] SUPP0RT-557: Allowed much longer API url values --- .../src/Plugin/WebformHandler/WebformHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/modules/custom/os2forms_api_request_handler/src/Plugin/WebformHandler/WebformHandler.php b/web/modules/custom/os2forms_api_request_handler/src/Plugin/WebformHandler/WebformHandler.php index b4c94e96..0f231ae3 100644 --- a/web/modules/custom/os2forms_api_request_handler/src/Plugin/WebformHandler/WebformHandler.php +++ b/web/modules/custom/os2forms_api_request_handler/src/Plugin/WebformHandler/WebformHandler.php @@ -82,7 +82,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta } $form['api_url'] = [ - '#type' => 'textfield', + '#type' => 'textarea', '#title' => $this->t('API url'), '#description' => $this->t('The API url. For testing, an api url can be obtained from Webhook.site.'), '#required' => TRUE, From 9398b1d802a3945cb030ec6df7ab84dbd3bfa1e2 Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Wed, 13 Jul 2022 15:56:27 +0200 Subject: [PATCH 13/14] SUPP0RT-544: Updated r4032login module --- composer.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index 70097c7f..cb6b3799 100644 --- a/composer.lock +++ b/composer.lock @@ -4838,26 +4838,26 @@ }, { "name": "drupal/r4032login", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/r4032login.git", - "reference": "2.1.0" + "reference": "2.2.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/r4032login-2.1.0.zip", - "reference": "2.1.0", - "shasum": "2004f3ea4a4d4e0f08cdcd75f6f89c3f58d903fa" + "url": "https://ftp.drupal.org/files/projects/r4032login-2.2.0.zip", + "reference": "2.2.0", + "shasum": "fc0e611d005d1040d19a3448a21875de65afb591" }, "require": { - "drupal/core": "^8.8 || ^9" + "drupal/core": "^9.3 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.0", - "datestamp": "1615710471", + "version": "2.2.0", + "datestamp": "1649051152", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" From 590f224a453f5839c1d42c830ccb54992b13578f Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Thu, 14 Jul 2022 10:27:59 +0200 Subject: [PATCH 14/14] SUPP0RT-544: Added Xdebug environment variable --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index a810603e..3ba4b463 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,6 +32,7 @@ services: environment: - XDEBUG_MODE=${XDEBUG_MODE:-off} - XDEBUG_SESSION=${XDEBUG_SESSION:-0} + - PHP_IDE_CONFIG=serverName=localhost - PHP_MAX_EXECUTION_TIME=30 - PHP_MEMORY_LIMIT=256M # - PHP_MAIL=1 # Uncomment to enable mailhog.