Skip to content

Commit 3fb01aa

Browse files
committed
chore: php 8.4 support and convert more packages to php-in-npm
- convert silverback_autosave, silverback_cloudinary, silverback_preview_link to php-in-npm - add php 8.4 patches for drupal/gutenberg, drupal/pate - apply php 8.4 fixes directly to silverback_campaign_urls, silverback modules - move default_content patch to amazeelabs/default-content package - update Dockerfile and devbox to php 8.4
1 parent 6003eb5 commit 3fb01aa

File tree

29 files changed

+869
-900
lines changed

29 files changed

+869
-900
lines changed

.lagoon/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# BUILDER IMAGE
33
# ====================================================================================================
44
FROM uselagoon/node-20-builder AS node
5-
FROM uselagoon/php-8.3-cli-drupal AS builder
5+
FROM uselagoon/php-8.4-cli-drupal AS builder
66

77
COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules
88
COPY --from=node /usr/local/bin/node /usr/local/bin/node
@@ -62,7 +62,7 @@ RUN --mount=type=cache,target=/tmp/cache pnpm deploy --filter "@custom/preview"
6262
# ====================================================================================================
6363
# CLI IMAGE
6464
# ====================================================================================================
65-
FROM uselagoon/php-8.3-cli-drupal AS cli
65+
FROM uselagoon/php-8.4-cli-drupal AS cli
6666

6767
RUN apk add --no-cache git qpdf imagemagick icu-dev && \
6868
docker-php-ext-install intl && \
@@ -78,7 +78,7 @@ ENV PHP_MEMORY_LIMIT=2048M
7878
# ====================================================================================================
7979
# PHP IMAGE
8080
# ====================================================================================================
81-
FROM uselagoon/php-8.3-fpm AS php
81+
FROM uselagoon/php-8.4-fpm AS php
8282
RUN apk add --no-cache imagemagick qpdf icu-dev && \
8383
docker-php-ext-install intl && \
8484
docker-php-ext-enable intl

apps/cms/composer.json

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@
3131
}
3232
],
3333
"require": {
34-
"php": "^8.3 <8.4",
34+
"php": "^8.4",
3535
"amazeeio/drupal_integrations": "^0.3.7",
3636
"amazeelabs/default-content": "*",
3737
"amazeelabs/silverback-cli": "^2.9.13",
3838
"amazeelabs/silverback_ai": "^1.1",
39-
"amazeelabs/silverback_autosave": "^1.1",
39+
"amazeelabs/silverback_autosave": "*",
4040
"amazeelabs/silverback_campaign_urls": "*",
41-
"amazeelabs/silverback_cloudinary": "^1.3.0",
41+
"amazeelabs/silverback_cloudinary": "*",
4242
"amazeelabs/silverback_external_preview": "^3.0",
4343
"amazeelabs/silverback_gatsby": "*",
4444
"amazeelabs/silverback_graphql_persisted": "^1.1.6",
4545
"amazeelabs/silverback_gutenberg": "*",
4646
"amazeelabs/silverback_iframe": "*",
4747
"amazeelabs/silverback_iframe_theme": "*",
48-
"amazeelabs/silverback_preview_link": "^1.6",
48+
"amazeelabs/silverback_preview_link": "*",
4949
"amazeelabs/silverback_publisher_monitor": "^2.3.2",
5050
"amazeelabs/silverback_search": "*",
5151
"amazeelabs/silverback_translations": "^1.0.4",
@@ -62,7 +62,7 @@
6262
"drupal/dropzonejs": "^2.8",
6363
"drupal/entity_usage": "^2.0@beta",
6464
"drupal/environment_indicator": "^4.0.14",
65-
"drupal/field_group": "^3.4",
65+
"drupal/field_group": "^4.0",
6666
"drupal/focal_point": "^2.1",
6767
"drupal/graphql": "^4.9",
6868
"drupal/graphql_directives": "1.0.x-dev@dev",
@@ -83,9 +83,9 @@
8383
"drupal/simple_oauth": "^5.2",
8484
"drupal/slack": "^1.4",
8585
"drupal/stage_file_proxy": "^3.0",
86-
"drupal/userprotect": "^1.2",
87-
"drupal/webform": "^6.1.5",
88-
"drush/drush": "^12.5",
86+
"drupal/userprotect": ">1.3 <2.0",
87+
"drupal/webform": "^6.3",
88+
"drush/drush": "^13",
8989
"enyo/dropzone": "^5.7.1"
9090
},
9191
"conflict": {
@@ -116,7 +116,8 @@
116116
},
117117
"drupal/gutenberg": {
118118
"Gutenberg enabled hook": "https://www.drupal.org/files/issues/2024-05-07/gutenberg_enabled_hook_3445677-2.patch",
119-
"Remove !important from sidebar": "./patches/gutenberg_remove-important-sidebar.patch"
119+
"Remove !important from sidebar": "./patches/gutenberg_remove-important-sidebar.patch",
120+
"#3536161 - PHP 8.4 nullable types": "https://www.drupal.org/files/issues/2026-01-20/3536161-10--for-v2.patch"
120121
},
121122
"drupal/graphql": {
122123
"Check if translation exists when loading an entity by its uuid": "./patches/graphql_load_by_uuid_translation_check.patch"
@@ -126,6 +127,9 @@
126127
},
127128
"drupal/field_group": {
128129
"#2969051 - Fix HTML5 validation prevents submission in tabs": "https://www.drupal.org/files/issues/2024-08-07/field-group-tabs-8.x-3.x.patch"
130+
},
131+
"drupal/pate": {
132+
"#3556035 - PHP 8.4 nullable types": "https://www.drupal.org/files/issues/2026-01-21/3556035-10.patch"
129133
}
130134
},
131135
"patchLevel": {

0 commit comments

Comments
 (0)