Skip to content

Commit 760ffe4

Browse files
committed
Merge branch 'f/d10_readiness' into develop
* f/d10_readiness: 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 Preparing for Drupal 10 # Conflicts: # composer.json # composer.lock
2 parents 26c3eb3 + 0e42c6c commit 760ffe4

14 files changed

Lines changed: 6185 additions & 12702 deletions

File tree

composer.json

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -87,51 +87,43 @@
8787
"composer/installers": "^1.9",
8888
"cweagans/composer-patches": "^1.7",
8989
"drupal/bootstrap": "^3.21",
90-
"drupal/cache_control_override": "^1.1",
91-
"drupal/console": "^1.0.2",
92-
"drupal/core-composer-scaffold": "^9.4",
93-
"drupal/core-project-message": "^9.4",
94-
"drupal/core-recommended": "^9.4",
90+
"drupal/coc_forms_auto_export": "^2.0@alpha",
91+
"drupal/color": "^1.0",
92+
"drupal/core-composer-scaffold": "^10",
93+
"drupal/core-project-message": "^10",
94+
"drupal/core-recommended": "^10",
9595
"drupal/core-vendor-hardening": "^9.4",
96-
"drupal/entity_export_csv": "^1.0@beta",
97-
"drupal/fontyourface": "^3.2",
98-
"drupal/header_and_footer_scripts": "^3.0",
96+
"drupal/entity_export_csv": "^2.0@beta",
97+
"drupal/fontyourface": "^4.0",
9998
"drupal/ldap": "^4.2",
10099
"drupal/maillog": "^1.0",
101100
"drupal/menu_link_attributes": "^1.3",
102-
"drupal/migrate_tools": "^5.0",
103-
"drupal/migrate_upgrade": "^4.0",
104-
"drupal/permissions_by_term": "3.1.21",
101+
"drupal/permissions_by_term": "^3.1",
105102
"drupal/queue_mail": "^1.3",
106-
"drupal/queue_ui": "^2.1",
103+
"drupal/queue_ui": "^3.1",
104+
"drupal/rdf": "^2.0",
107105
"drupal/restui": "^1.20",
108-
"drupal/simple_ldap": "^1.0@alpha",
109-
"drupal/straw": "^1.3",
110106
"drupal/telephone_validation": "^2.2",
111-
"drupal/upgrade_status": "^3.12",
112107
"drupal/webform_analysis": "^1.0@beta",
113108
"drupal/webform_composite": "^1.0@RC",
114-
"drupal/webform_migrate": "^1.2",
115-
"drupal/webform_node_element": "^1.1",
116-
"drupal/webform_permissions_by_term": "^1.2",
117-
"drupal/webform_scheduled_tasks": "^2.0",
109+
"drupal/webform_node_element": "^1.2",
118110
"drupal/webform_views": "^5.0@alpha",
119-
"drush/drush": "^11",
120-
"os2core/os2core": "^2.0",
121-
"os2forms/os2forms": "~3.1",
111+
"drush/drush": "^12",
112+
"mglaman/composer-drupal-lenient": "^1.0",
113+
"os2core/os2core": "^3.0",
114+
"os2forms/os2forms": "dev-f/d10_readiness",
122115
"os2forms/os2forms_egbolig": "dev-master",
123-
"os2forms/os2forms_forloeb_profile": "^1.9.0",
116+
"os2forms/os2forms_forloeb_profile": "dev-f/d10_readiness",
124117
"os2forms/os2forms_sync": "^1.1",
125118
"os2web/os2web_logging": "dev-master",
126-
"simplesamlphp/simplesamlphp": "^1.19",
119+
"simplesamlphp/simplesamlphp": "^2.0",
127120
"vlucas/phpdotenv": "^5.1",
128121
"webflo/drupal-finder": "^1.2",
129122
"webmozart/path-util": "^2.3"
130123
},
131124
"require-dev": {
132-
"drupal/core-dev": "^9.1",
133-
"zaporylie/composer-drupal-optimizations": "^1.2",
134-
"drupal/devel": "^4.1"
125+
"drupal/devel": "^5.0",
126+
"zaporylie/composer-drupal-optimizations": "^1.2"
135127
},
136128
"conflict": {
137129
"drupal/drupal": "*"
@@ -150,7 +142,8 @@
150142
"drupal/console-extend-plugin": true,
151143
"drupal/core-composer-scaffold": true,
152144
"drupal/core-project-message": true,
153-
"drupal/core-vendor-hardening": true
145+
"drupal/core-vendor-hardening": true,
146+
"mglaman/composer-drupal-lenient": true
154147
}
155148
},
156149
"autoload": {
@@ -209,12 +202,23 @@
209202
"Enabled D9 support": "./patches/webform_embed-d9.patch",
210203
"3170384 - Fixed D9 imcopatibility": "https://www.drupal.org/files/issues/2020-09-11/3170384-2.patch"
211204
},
212-
"drupal/webform_migrate": {
213-
"Set to support. Checkbox condition fixes": "./patches/setto-and-checkboxes-condition-fix-onlyD7.patch"
214-
},
215-
"drupal/coc_forms_auto_export" : {
205+
"drupal/coc_forms_auto_export": {
206+
"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",
207+
"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",
216208
"3259009 - PHP Warnings/Notices on Download Page" : "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/1.diff"
209+
},
210+
"drupal/webform_node_element": {
211+
"3290637 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2023-05-12/webform_node_element_d10-3290637-11.patch"
212+
},
213+
"drupal/webform": {
214+
"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"
217215
}
216+
},
217+
"drupal-lenient": {
218+
"allowed-list": [
219+
"drupal/coc_forms_auto_export",
220+
"drupal/webform_node_element"
221+
]
218222
}
219223
}
220224
}

0 commit comments

Comments
 (0)