Merge pull request #131 from OS2Forms/develop

3.16.0 - Drupal 10 deploy

Author: cableman

.github/workflows/pr.yml

@@ -46,6 +46,7 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
       - name: Validate composer files
         run: |
+          composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
           composer validate --strict composer.json
           # Check that dependencies resolve.
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
@@ -77,6 +78,7 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Dependencies
         run: |
+          composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
           composer install --no-interaction --no-progress
       - name: PHPCS
         run: |

CHANGELOG.md

@@ -11,6 +11,25 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+- [OS-119] Keeping value of CPR clean, not adding address protection text
+- Applied coding standards
+
+## [3.16.0-beta1] 2024-08-27
+
+[#110](https://github.com/OS2Forms/os2forms/pull/110)
+
+- Obsolete module removing - os2forms_consent
+- Obsolete module removing - webform_embed
+- Obsolete module removing - field_color
+- Obsolete patch removing - dynamic_entity_reference
+- Obsolete patch removing - user_default_page
+- Reduntand dependency removing - linkit
+- Reduntand dependency removing - chosen
+- Reduntand dependency removing - queue_ui
+- Reduntand dependency removing - simple_ldap
+- Reduntand dependency removing - webform_scheduled_tasks
+- Drupal 10 compability fixes
+
 ## [3.15.8] 2024-08-26
 
 - [#127](https://github.com/OS2Forms/os2forms/pull/127)
@@ -262,7 +281,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 - Security in case of vulnerabilities.
 ```
 
-[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.15.8...HEAD
+[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.16.0-beta1...HEAD
+[3.16.0-beta1]: https://github.com/OS2Forms/os2forms/compare/3.15.8...3.16.0-beta1
 [3.15.8]: https://github.com/OS2Forms/os2forms/compare/3.15.7...3.15.8
 [3.15.7]: https://github.com/OS2Forms/os2forms/compare/3.15.6...3.15.7
 [3.15.6]: https://github.com/OS2Forms/os2forms/compare/3.15.5...3.15.6

composer.json

@@ -23,68 +23,62 @@
         "dompdf/dompdf": "^2.0",
         "drupal/admin_toolbar": "^3.0",
         "drupal/advancedqueue": "^1.0",
-        "drupal/chosen": "^2.10",
-        "drupal/ckeditor_a11ychecker": "^2.0@alpha",
-        "drupal/clientside_validation": "^3.0",
+        "drupal/clientside_validation": "^4.0",
         "drupal/coc_forms_auto_export": "^2.0@alpha",
-        "drupal/config_entity_revisions": "^1.7.0",
+        "drupal/config_entity_revisions": "dev-2.0.x",
         "drupal/diff": "^1.0",
         "drupal/embed": "^1.4",
         "drupal/entity_print": "^2.1",
         "drupal/eu_cookie_compliance": "^1.8",
-        "drupal/events_logging": "^1.5",
-        "drupal/header_and_footer_scripts": "^3.0",
+        "drupal/events_logging": "^2.0@beta",
         "drupal/honeypot": "^2.0",
         "drupal/image_widget_crop": "^2.3",
         "drupal/ldap": "^4.2",
         "drupal/ldap_auth": "^1.17",
         "drupal/leaflet": "^10.0",
         "drupal/leaflet_layers": "^1.1",
-        "drupal/libraries": "^3.0@beta",
-        "drupal/linkit": "^5.0",
+        "drupal/libraries": "^4.0",
         "drupal/logging_alerts": "^2.0",
         "drupal/maestro": "^3.1",
         "drupal/mailsystem": "^4.1",
         "drupal/masquerade": "^2.0@RC",
         "drupal/pathauto": "^1.5",
         "drupal/permissions_by_term": "^3.1 || ^2.25",
         "drupal/queue_mail": "^1.4",
-        "drupal/queue_ui": "^2.1",
         "drupal/r4032login": "^2.1",
         "drupal/redirect": "^1.4",
-        "drupal/simple_ldap": "^1.0@alpha",
-        "drupal/simplesamlphp_auth": "^3.2",
+        "drupal/simplesamlphp_auth": "^4.0",
         "drupal/smtp": "^1.0@beta",
         "drupal/sodium": "^2.4",
         "drupal/switch_page_theme": "^4.0",
         "drupal/telephone_validation": "^2.2",
         "drupal/token": "^1.5",
         "drupal/ultimate_cron": "^2.0.0",
-        "drupal/user_default_page": "^2.1",
+        "drupal/user_default_page": "^9.0",
         "drupal/webform": "^6.1",
         "drupal/webform_composite": "^1.0@RC",
         "drupal/webform_encrypt": "^2.0@alpha",
-        "drupal/webform_migrate": "^1.1",
+        "drupal/webform_migrate": "^2.0@alpha",
         "drupal/webform_node_element": "^1.2",
-        "drupal/webform_remote_handlers": "^1.6.0",
+        "drupal/webform_remote_handlers": "^3.0",
         "drupal/webform_remote_select": "^1.0.6",
         "drupal/webform_rest": "^4.0.0-beta2",
-        "drupal/webform_scheduled_tasks": "^2.0",
         "drupal/webform_validation": "^2.0",
         "drupal/webform_views": "^5.0@alpha",
-        "drupal/workflow_participants": "^2.4",
+        "drupal/workflow_participants": "^3.0@RC",
         "http-interop/http-factory-guzzle": "^1.0.0",
         "itk-dev/beskedfordeler-drupal": "^1.0",
-        "itk-dev/serviceplatformen": "dev-feature/guzzle6-adapter as 1.5",
+        "itk-dev/serviceplatformen": "^1.5",
         "os2web/os2web_datalookup": "^1.5",
         "os2web/os2web_nemlogin": "^1.0",
-        "php-http/guzzle6-adapter": "^2.0",
+        "php-http/guzzle7-adapter": "^1.0",
         "phpoffice/phpword": "^0.18.2",
         "symfony/options-resolver": "^5.4 || ^6.0",
         "tecnickcom/tcpdf": "~6",
         "webmozart/path-util": "^2.3",
         "wsdltophp/packagebase": "^5.0",
-        "zaporylie/composer-drupal-optimizations": "^1.2"
+        "zaporylie/composer-drupal-optimizations": "^1.2",
+        "mglaman/composer-drupal-lenient": "^1.0"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
@@ -107,19 +101,24 @@
                 "Unlock possibility of using Entity print module export to Word": "https://www.drupal.org/files/issues/2020-02-29/3096552-6.patch",
                 "Webform computed element post save alter": "https://www.drupal.org/files/issues/2024-06-25/webform_computed_post_save_field_alter.patch"
             },
-            "drupal/user_default_page": {
-                "Warning: in_array() expects parameter 2 to be array, null given in user_default_page_user_logout() (https://www.drupal.org/node/3246986)": "https://www.drupal.org/files/issues/2021-11-01/user_default_page-3246986-2.patch"
-            },
             "drupal/coc_forms_auto_export": {
-                "3240592 - Problem with phpseclib requirement in 2.x (https://www.drupal.org/project/coc_forms_auto_export/issues/3240592)": "https://www.drupal.org/files/issues/2021-10-04/requirement-namespace-3240592-1.patch"
+                "3240592 - Problem with phpseclib requirement in 2.x (https://www.drupal.org/project/coc_forms_auto_export/issues/3240592)": "https://www.drupal.org/files/issues/2021-10-04/requirement-namespace-3240592-1.patch",
+                "3286562 - Automated Drupal 10 compatibility fixes" : "https://www.drupal.org/files/issues/2022-06-15/coc_forms_auto_export.2.0.x-dev.rector.patch",
+                "3259009 - PHP Warnings/Notices on Download Page" : "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/1.diff"
             },
-            "drupal/dynamic_entity_reference": {
-                "entityQuery reference JOINs should specify target_type (https://www.drupal.org/project/dynamic_entity_reference/issues/3120952#comment-14141038)": "https://www.drupal.org/files/issues/2021-06-22/entityquery-reference-joins-should-specify-target_type-3120952-24.patch"
+            "drupal/webform_node_element": {
+                "3290637 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2023-05-12/webform_node_element_d10-3290637-11.patch"
             },
             "drupal/webform_encrypt": {
                 "Ensure data is base64 encoded (https://www.drupal.org/project/webform_encrypt/issues/3399414)": "https://git.drupalcode.org/project/webform_encrypt/-/merge_requests/4.patch",
                 "PHP Warning if unserialize fails (https://www.drupal.org/project/webform_encrypt/issues/3292305)": "https://www.drupal.org/files/issues/2022-06-23/unserialize-php-notice.patch"
             }
+        },
+        "drupal-lenient": {
+            "allowed-list": [
+                "drupal/coc_forms_auto_export",
+                "drupal/webform_node_element"
+            ]
         }
     },
     "scripts": {
@@ -150,7 +149,8 @@
             "phpstan/extension-installer": true,
             "simplesamlphp/composer-module-installer": true,
             "vaimo/composer-patches": true,
-            "zaporylie/composer-drupal-optimizations": true
+            "zaporylie/composer-drupal-optimizations": true,
+            "mglaman/composer-drupal-lenient": true
         }
     }
 }

modules/os2forms_attachment/os2forms_attachment.info.yml

@@ -2,8 +2,7 @@ name: 'OS2forms Attachment'
 type: module
 description: 'Provides OS2forms attachment field'
 package: OS2Forms
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
 
 dependencies:
   - 'drupal:os2forms'

modules/os2forms_attachment/src/Form/AttachmentComponentForm.php

@@ -133,6 +133,7 @@ public function save(array $form, FormStateInterface $form_state) {
   public function exists($id) {
     $entity = $this->entityTypeManager->getStorage('os2forms_attachment_component')
       ->getQuery()
+      ->accessCheck(FALSE)
       ->condition('id', $id)
       ->execute();
     return (bool) $entity;

modules/os2forms_autocomplete/os2forms_autocomplete.info.yml

@@ -2,8 +2,7 @@ name: 'OS2forms Autocomplete'
 type: module
 description: 'Provides autocomplete field'
 package: OS2Forms
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
 
 dependencies:
   - 'drupal:os2forms'

modules/os2forms_autocomplete/src/Plugin/WebformElement/AutocompleteElement.php

@@ -38,7 +38,7 @@ protected function defineDefaultProperties() {
   /**
    * {@inheritdoc}
    */
-  public function prepare(array &$element, WebformSubmissionInterface $webform_submission = NULL) {
+  public function prepare(array &$element, ?WebformSubmissionInterface $webform_submission = NULL) {
     parent::prepare($element, $webform_submission);
 
     if (isset($element['#webform_key'])) {