Merge branch 'SLB-480-global-search' into dev

.gitpod.Dockerfile

@@ -6,13 +6,13 @@ RUN bash -c 'VERSION="18.19.0" \
 
 RUN echo "nvm use default &>/dev/null" >> ~/.bashrc.d/51-nvm-fix
 
-RUN sudo update-alternatives --set php $(which php8.2)
-RUN sudo install-packages php8.2-gd php8.2-mbstring php8.2-curl php8.2-sqlite3 php8.2-zip php8.2-xdebug php8.2-imagick
+RUN sudo update-alternatives --set php $(which php8.3)
+RUN sudo install-packages php8.3-gd php8.3-mbstring php8.3-curl php8.3-sqlite3 php8.3-zip php8.3-xdebug php8.3-imagick
 RUN pnpx [email protected] install-deps
 RUN pnpx [email protected] install
 RUN npm install -g [email protected] @withgraphite/graphite-cli
 
-COPY .gitpod/xdebug.ini /etc/php/8.2/mods-available/xdebug.ini
+COPY .gitpod/xdebug.ini /etc/php/8.3/mods-available/xdebug.ini
 RUN curl -fsSL https://deno.land/x/install/install.sh | sh
 RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-deno && \
   echo 'export DENO_INSTALL="/home/gitpod/.deno"' >> /home/gitpod/.bashrc.d/90-deno && \

.lagoon/Dockerfile

@@ -2,7 +2,7 @@
 # BUILDER IMAGE
 # ====================================================================================================
 FROM uselagoon/node-18-builder as node
-FROM uselagoon/php-8.2-cli-drupal as builder
+FROM uselagoon/php-8.3-cli-drupal as builder
 
 COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules
 COPY --from=node /usr/local/bin/node /usr/local/bin/node
@@ -55,7 +55,7 @@ RUN --mount=type=cache,target=/tmp/cache pnpm deploy --filter "@custom/preview"
 # ====================================================================================================
 # CLI IMAGE
 # ====================================================================================================
-FROM uselagoon/php-8.2-cli-drupal as cli
+FROM uselagoon/php-8.3-cli-drupal as cli
 
 RUN apk add --no-cache git qpdf imagemagick icu-dev && \
   docker-php-ext-install intl && \
@@ -70,7 +70,7 @@ ENV PHP_MEMORY_LIMIT=2048
 # ====================================================================================================
 # PHP IMAGE
 # ====================================================================================================
-FROM uselagoon/php-8.2-fpm as php
+FROM uselagoon/php-8.3-fpm as php
 RUN apk add --no-cache imagemagick qpdf icu-dev && \
   docker-php-ext-install intl && \
   docker-php-ext-enable intl

apps/cms/composer.json

@@ -27,7 +27,7 @@
     }
   ],
   "require": {
-    "php": "^8.2 <8.3",
+    "php": "^8.3 <8.4",
     "amazeeio/drupal_integrations": "^0.3.7",
     "amazeelabs/default-content": "^1.2.11",
     "amazeelabs/graphql_directives": "^2.4",
@@ -47,13 +47,12 @@
     "composer/installers": "^2.2",
     "drupal/admin_toolbar": "^3.4.1",
     "drupal/coffee": "^1.4",
-    "drupal/config_filter": "*",
     "drupal/config_ignore": "^3.2",
     "drupal/config_notify": "^1.10",
     "drupal/config_pages": "^2.14",
     "drupal/core-composer-scaffold": "^10",
     "drupal/core-recommended": "^10",
-    "drupal/default_content": "2.0.0-alpha2",
+    "drupal/default_content": "^2.0.0-alpha2",
     "drupal/dropzonejs": "^2.8",
     "drupal/entity_usage": "^2.0@beta",
     "drupal/environment_indicator": "^4.0.14",
@@ -76,7 +75,7 @@
     "drupal/search_api": "^1.35",
     "drupal/simple_oauth": "^5.2",
     "drupal/slack": "^1.4",
-    "drupal/stage_file_proxy": "^2.0.2",
+    "drupal/stage_file_proxy": "^3.0",
     "drupal/userprotect": "^1.2",
     "drupal/webform": "^6.1.5",
     "drush/drush": "^12.5",
@@ -95,17 +94,15 @@
       "drupal/core-composer-scaffold": true,
       "dealerdirect/phpcodesniffer-composer-installer": true,
       "phpstan/extension-installer": false,
-      "php-http/discovery": true
+      "php-http/discovery": true,
+      "tbachert/spi": true
     }
   },
   "extra": {
     "patches": {
       "drupal/core": {
         "Multilingual-route-resolution-in-graphql": "./patches/multilingual-route-resolution-in-graphql.patch"
       },
-      "drupal/userprotect": {
-        "Fix site install": "https://www.drupal.org/files/issues/2023-07-28/3349663-8.patch"
-      },
       "drupal/gutenberg": {
         "Gutenberg enabled hook": "https://www.drupal.org/files/issues/2024-05-07/gutenberg_enabled_hook_3445677-2.patch",
         "Remove !important from sidebar": "./patches/gutenberg_remove-important-sidebar.patch"
@@ -171,7 +168,6 @@
   },
   "require-dev": {
     "drupal/core-dev": "^10",
-    "drupal/devel": "^5.2",
     "phpspec/prophecy-phpunit": "^2.0.2"
   }
 }