Merge branch 'develop'

* develop: (21 commits) Updating os2forms/os2forms 3.16.0-beta1 Adding straw module Updating os2forms Adding missing module: entity_export_csv Updating os2web_logging Updating webform module, removing polyfill dependency D10 os2forms_egbolig update D10 os2core update OS-85 - result display D10 itk-dev/beskedfordeler-drupal update 1.2.0 OS-78 webform adding fix OS-78 webform adding fix D10 os2forms_sync update Drupal 10 upgrade Drupal 10 upgrade D10 Contrib modules updated D10 adding deprecated modules D10 local modules and themes update D10 contrib module updates Contrib modules D10 readiness ...
OS2Forms · Sep 2, 2024 · 7cf7f0a · 7cf7f0a
2 parents 1786fa4 + 62da896
commit 7cf7f0a
Show file tree

Hide file tree

Showing 14 changed files with 5,615 additions and 12,127 deletions.
diff --git a/composer.json b/composer.json
@@ -87,51 +87,44 @@
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.7",
         "drupal/bootstrap": "^3.21",
-        "drupal/cache_control_override": "^1.1",
-        "drupal/console": "^1.0.2",
-        "drupal/core-composer-scaffold": "^9.4",
-        "drupal/core-project-message": "^9.4",
-        "drupal/core-recommended": "^9.4",
+        "drupal/coc_forms_auto_export": "^2.0@alpha",
+        "drupal/color": "^1.0",
+        "drupal/core-composer-scaffold": "^10",
+        "drupal/core-project-message": "^10",
+        "drupal/core-recommended": "^10",
         "drupal/core-vendor-hardening": "^9.4",
-        "drupal/entity_export_csv": "^1.0@beta",
-        "drupal/fontyourface": "^3.2",
-        "drupal/header_and_footer_scripts": "^3.0",
+        "drupal/entity_export_csv": "^2.0@beta",
+        "drupal/fontyourface": "^4.0",
         "drupal/ldap": "^4.2",
         "drupal/maillog": "^1.0",
         "drupal/menu_link_attributes": "^1.3",
-        "drupal/migrate_tools": "^5.0",
-        "drupal/migrate_upgrade": "^4.0",
-        "drupal/permissions_by_term": "3.1.21",
+        "drupal/permissions_by_term": "^3.1",
         "drupal/queue_mail": "^1.3",
-        "drupal/queue_ui": "^2.1",
+        "drupal/queue_ui": "^3.1",
+        "drupal/rdf": "^2.0",
         "drupal/restui": "^1.20",
-        "drupal/simple_ldap": "^1.0@alpha",
-        "drupal/straw": "^1.3",
+        "drupal/straw": "^2.0@beta",
         "drupal/telephone_validation": "^2.2",
-        "drupal/upgrade_status": "^3.12",
         "drupal/webform_analysis": "^1.0@beta",
         "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_node_element": "^1.2",
         "drupal/webform_views": "^5.0@alpha",
-        "drush/drush": "^11",
-        "os2core/os2core": "^2.0",
-        "os2forms/os2forms": "~3.1",
+        "drush/drush": "^12",
+        "mglaman/composer-drupal-lenient": "^1.0",
+        "os2core/os2core": "^3.0",
+        "os2forms/os2forms": "3.16.0-beta1",
         "os2forms/os2forms_egbolig": "dev-master",
-        "os2forms/os2forms_forloeb_profile": "^1.9.0",
+        "os2forms/os2forms_forloeb_profile": "dev-f/d10_readiness",
         "os2forms/os2forms_sync": "^1.1",
         "os2web/os2web_logging": "dev-master",
-        "simplesamlphp/simplesamlphp": "^1.19",
+        "simplesamlphp/simplesamlphp": "^2.0",
         "vlucas/phpdotenv": "^5.1",
         "webflo/drupal-finder": "^1.2",
         "webmozart/path-util": "^2.3"
     },
     "require-dev": {
-        "drupal/core-dev": "^9.1",
-        "zaporylie/composer-drupal-optimizations": "^1.2",
-        "drupal/devel": "^4.1"
+        "drupal/devel": "^5.0",
+        "zaporylie/composer-drupal-optimizations": "^1.2"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -150,7 +143,8 @@
             "drupal/console-extend-plugin": true,
             "drupal/core-composer-scaffold": true,
             "drupal/core-project-message": true,
-            "drupal/core-vendor-hardening": true
+            "drupal/core-vendor-hardening": true,
+            "mglaman/composer-drupal-lenient": true
         }
     },
     "autoload": {
@@ -209,12 +203,23 @@
                 "Enabled D9 support": "./patches/webform_embed-d9.patch",
                 "3170384 - Fixed D9 imcopatibility": "https://www.drupal.org/files/issues/2020-09-11/3170384-2.patch"
             },
-            "drupal/webform_migrate": {
-                "Set to support. Checkbox condition fixes": "./patches/setto-and-checkboxes-condition-fix-onlyD7.patch"
-            },
-            "drupal/coc_forms_auto_export" : {
+            "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",
+                "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/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": {
+                "3458611 Removing the polyfill-fastly.io library of webform.libraries.yml": "https://www.drupal.org/files/issues/2024-07-02/3458611-removing-the-polyfill-io.patch"
             }
+        },
+        "drupal-lenient": {
+            "allowed-list": [
+                "drupal/coc_forms_auto_export",
+                "drupal/webform_node_element"
+            ]
         }
     }
 }