Skip to content

Commit 96d3940

Browse files
authored
Merge pull request #1276 from dof-dss/D8NID-1713
D8 nid 1713
2 parents 96e1b1d + ebe5bef commit 96d3940

File tree

120 files changed

+1635
-1707
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+1635
-1707
lines changed

.ddev/commands/web/drupal-check

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
## Aliases: drck
66
## Example: "ddev <drupal-check|drck> web/modules/custom"
77

8-
/app/vendor/bin/drupal-check --memory-limit=256M $1
8+
/var/www/html/vendor/bin/drupal-check --memory-limit=256M $1

.ddev/commands/web/phpcs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
## Usage: phpcs
55
## Example: "ddev phpcs"
66

7-
/app/phpcs.sh "/var/www/html" "/var/www/html/web/modules/origins /var/www/html/web/modules/custom /var/www/html/web/themes/custom"
7+
/var/www/html/phpcs.sh "/var/www/html" "/var/www/html/web/modules/origins /var/www/html/web/modules/custom /var/www/html/web/themes/custom"

.platform.app.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
name: 'nidirect'
88

99
# The runtime the application uses.
10-
type: 'php:8.2'
10+
type: 'php:8.3'
1111

1212
# Application variables.
1313
# Set non-sensitive variables here only.

composer.json

+39-37
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
"drupal/address": "^2.0",
5050
"drupal/admin_toolbar": "^3.2",
5151
"drupal/adminimal_theme": "^1.7",
52-
"drupal/advban": "^1.5",
52+
"drupal/advban": "^1.6",
5353
"drupal/antibot": "2.0.2",
54-
"drupal/autoban": "^1.8",
54+
"drupal/autoban": "^1.10",
5555
"drupal/block_content_permissions": "^1.10",
5656
"drupal/block_field": "^1.0@RC",
5757
"drupal/block_list_override": "^1.0",
@@ -61,26 +61,28 @@
6161
"drupal/clientside_validation": "^4.0",
6262
"drupal/config_filter": "^2.5",
6363
"drupal/config_ignore": "^3.2",
64-
"drupal/config_readonly": "^1.0@beta",
64+
"drupal/config_readonly": "^1.0",
6565
"drupal/config_split": "^2.0-beta",
6666
"drupal/config_update": "^2.0@alpha",
67-
"drupal/cookie_content_blocker": "^2.3",
67+
"drupal/cookie_content_blocker": "^2.4",
6868
"drupal/core-composer-scaffold": "^10.2",
6969
"drupal/core-dev": "^10.2",
7070
"drupal/core-project-message": "^10.2",
7171
"drupal/core-recommended": "^10.2",
72-
"drupal/csp": "^1.15",
72+
"drupal/csp": "^1.33",
7373
"drupal/csv_serialization": "^4.0",
7474
"drupal/ctools": "^4.0",
7575
"drupal/diff": "^1.0",
7676
"drupal/dynamic_entity_reference": "^3.2",
7777
"drupal/easy_google_analytics_counter": "^3.0",
78-
"drupal/entity_browser": "^2.6",
78+
"drupal/embed": "^1.9",
79+
"drupal/entity_browser": "^2.11",
7980
"drupal/entity_embed": "^1.2",
81+
"drupal/entity_reference_revisions": "^1.12",
8082
"drupal/entity_reference_unpublished": "^2.0",
8183
"drupal/entityqueue": "^1.0",
8284
"drupal/eu_cookie_compliance": "^1.20",
83-
"drupal/facets": "^2.0",
85+
"drupal/facets": "^2.0.9",
8486
"drupal/facets_pretty_paths": "^1.1",
8587
"drupal/fastly": "^4.0",
8688
"drupal/feeds": "3.x-dev@dev",
@@ -89,35 +91,35 @@
8991
"drupal/feeds_tamper": "^2.0@beta",
9092
"drupal/field_group": "^3.6",
9193
"drupal/file_delete_ui": "^1.0@alpha",
92-
"drupal/filelog": "^2.1",
94+
"drupal/filelog": "^3.0",
9395
"drupal/flag": "4.x-dev",
94-
"drupal/geocoder": "^4.10",
95-
"drupal/geolocation": "^4.0@alpha",
96+
"drupal/geocoder": "^4.24",
97+
"drupal/geolocation": "4.x-dev@dev",
9698
"drupal/google_tag": "^2.0",
9799
"drupal/handy_cache_tags": "^1.0",
98100
"drupal/honeypot": "^2.0",
99-
"drupal/http_cache_control": "^2.0",
100-
"drupal/inline_entity_form": "^3.0",
101+
"drupal/http_cache_control": "^2.2",
102+
"drupal/inline_entity_form": "^3.0@RC",
101103
"drupal/jquery_ui": "^1.6",
102104
"drupal/jquery_ui_autocomplete": "^2.0",
103105
"drupal/jquery_ui_menu": "^2.0",
104106
"drupal/layout_builder_modal": "^1.0@alpha",
105107
"drupal/layout_builder_restrictions": "^2.9",
106108
"drupal/linkit": "^6.0.0",
107-
"drupal/media_file_delete": "^1.1",
109+
"drupal/media_file_delete": "^1.3",
108110
"drupal/media_library_edit": "^3.0",
109111
"drupal/metatag": "^2.0",
110112
"drupal/migrate_plus": "^6.0",
111113
"drupal/migrate_tools": "^6.0",
112-
"drupal/moderation_sidebar": "^1.3",
114+
"drupal/moderation_sidebar": "^1.8",
113115
"drupal/node_edit_protection": "^1.0",
114116
"drupal/noreferrer": "^1.7",
115-
"drupal/paragraphs": "^1.8",
116-
"drupal/pathauto": "^1.12",
117+
"drupal/paragraphs": "^1.18",
118+
"drupal/pathauto": "^1.13",
117119
"drupal/permissions_filter": "^1.2",
118-
"drupal/redirect": "^1.9",
119-
"drupal/redis": "^1.5",
120-
"drupal/scheduled_transitions": "^2.4",
120+
"drupal/redirect": "^1.10",
121+
"drupal/redis": "^1.8",
122+
"drupal/scheduled_transitions": "^2.5",
121123
"drupal/scheduler": "^2.0",
122124
"drupal/schema_metatag": "^3.0",
123125
"drupal/search_api": "^1.26",
@@ -128,26 +130,27 @@
128130
"drupal/seven": "^1.0",
129131
"drupal/shs": "^2.0@RC",
130132
"drupal/silktide": "^10.3",
131-
"drupal/simple_sitemap": "^4.1",
133+
"drupal/simple_sitemap": "^4.2",
132134
"drupal/simplei": "^2.1",
133135
"drupal/sitewide_alert": "^2.1",
134-
"drupal/smart_trim": "^2.1",
135-
"drupal/stable": "^2.0",
136+
"drupal/smart_trim": "^2.2",
137+
"drupal/stable": "^2.1",
136138
"drupal/structure_sync": "^2.0",
137139
"drupal/taxonomy_access_fix": "^4.0",
138-
"drupal/taxonomy_entity_index": "^1.7",
140+
"drupal/taxonomy_entity_index": "^1.17",
139141
"drupal/telephone_plus": "2.0.x-dev@dev",
140-
"drupal/token": "^1.13",
141-
"drupal/token_filter": "^2.1",
142+
"drupal/token": "^1.15",
143+
"drupal/token_filter": "^2.2",
142144
"drupal/twig_field_value": "^2.0",
143-
"drupal/twig_tweak": "^3.2",
145+
"drupal/twig_tweak": "^3.4",
144146
"drupal/ultimate_cron": "^2.0@alpha",
147+
"drupal/upgrade_status": "^4.3",
145148
"drupal/views_contextual_filters_or": "^1.1",
146149
"drupal/views_custom_cache_tag": "^1.1",
147150
"drupal/views_data_export": "^1.0",
148-
"drupal/webform": "^6.2@RC",
151+
"drupal/webform": "^6.2",
149152
"drupal/whatlinkshere": "^2.1",
150-
"drupal/xls_serialization": "^1.2",
153+
"drupal/xls_serialization": "^1.4",
151154
"drush/drush": "^12.5",
152155
"geocoder-php/google-maps-provider": "^4.6",
153156
"harvesthq/chosen": "^1.8",
@@ -161,13 +164,13 @@
161164
},
162165
"require-dev": {
163166
"drupal/coder": "^8.3",
164-
"drupal/devel": "^5.0",
167+
"drupal/devel": "^5.3",
165168
"drupal/easy_install_d10": "^10.0@dev",
166169
"drupal/fpa": "^4.0",
167-
"drupal/masquerade": "^2.0@beta",
170+
"drupal/masquerade": "^2.0",
168171
"drupal/multiline_config": "1.x-dev",
169172
"drupal/restui": "^1.17",
170-
"drupal/stage_file_proxy": "^2.1",
173+
"drupal/stage_file_proxy": "^3.1",
171174
"kint-php/kint": "^4.2",
172175
"mglaman/drupal-check": "^1.4",
173176
"phpspec/prophecy-phpunit": "^2.1",
@@ -207,7 +210,6 @@
207210
"drupal/core": {
208211
"Cannot save unpublished versions of published content for users without manage book privileges": "https://www.drupal.org/files/issues/2022-12-14/2918537-92.patch",
209212
"Layout builder fails to assign inline block access dependencies for the overrides section storage on entities with pending revisions": "https://www.drupal.org/files/issues/2021-03-22/3047022-71.patch",
210-
"Remove invalid iframe attributes from oembed field formatter": "https://www.drupal.org/files/issues/2019-07-31/remove-iframe-attributes-3071446-4.patch",
211213
"Determine if there is a better message for AJAX errors": "https://www.drupal.org/files/issues/2023-12-11/core-ajax-error-3349901-2.patch"
212214
},
213215
"drupal/easy_install": {
@@ -216,17 +218,17 @@
216218
"drupal/eu_cookie_compliance": {
217219
"JS Aggregation breaks in 10.1 when disabling other javascripts": "https://git.drupalcode.org/issue/eu_cookie_compliance-3412431/-/commit/3433c67b039e2319206ab68fd83a32cd161a99cb.diff"
218220
},
219-
"drupal/filelog": {
220-
"Circular refernce detected for service": "https://www.drupal.org/files/issues/2024-01-25/filelog_with_tests.patch"
221-
},
222221
"drupal/feeds": {
223222
"Use uuid as GUID for Drupal entities": "https://www.drupal.org/files/issues/2022-09-23/feeds-3306725-18.patch"
224223
},
224+
"drupal/filelog": {
225+
"Circular reference detected for service #3416342": "https://www.drupal.org/files/issues/2024-08-01/3416342-12.patch"
226+
},
225227
"drupal/flag": {
226228
"Fix-WSOD-when-click-scheduled-transitions-from-moderation-sidebar": "https://gist.githubusercontent.com/omahm/6448dbf36a93cdb8761f8c030e5836fc/raw/d5f150a3fb8627184b829688b1ea7740eba3efc9/Fix-WSOD-when-click-scheduled-transitions-from-moderation-sidebar.patch"
227229
},
228230
"drupal/paragraphs": {
229-
"Integrity constraint violation: 1048 Column 'langcode' cannot be null": "https://www.drupal.org/files/issues/2020-06-25/paragraphs-2901390-51.patch",
231+
"Integrity constraint violation: 1048 Column 'langcode' cannot be null": "https://www.drupal.org/files/issues/2023-07-20/2901390-9-109.patch",
230232
"Paragraphs do not render: access check for \"view\" fail when using layout builder + custom blocks & content revisions because the incorrect parent revision ID is being passed in ParagraphAccessControlHandler::checkAccess()": "https://www.drupal.org/files/issues/2020-07-08/access-controll-issue-3090200-22.patch"
231233
},
232234
"drupal/password_policy": {
@@ -247,7 +249,7 @@
247249
},
248250
"drupal/redirect": {
249251
"Add URL Redirects tab to taxonomy term edit form": "https://www.drupal.org/files/issues/2021-03-26/redirect_provide_redirect_tab_on_taxonomy_terms_3205896.patch",
250-
"Fix ajax error when creating redirects": "https://www.drupal.org/files/issues/2020-12-14/validation-issue-3057250-29.patch",
252+
"Fix ajax error when creating redirects": "https://www.drupal.org/files/issues/2024-08-11/redirect--2024-08-11--3057250-79.patch",
251253
"Empty query params on source cause TypeError": "https://www.drupal.org/files/issues/2022-10-25/3315928-7-redirect-empty-source-query-options.patch"
252254
},
253255
"drupal/scheduled_transitions": {

0 commit comments

Comments
 (0)