USAGOV-1092 drupal 10 upgrade

.circleci/config.yml

@@ -540,6 +540,7 @@ workflows:
                 - dev
                 - stage
                 - prod
+                - USAGOV-1032-drupal-10-upgrade
       - build-and-push-container:
           requires:
             - approve-build-and-push-container
@@ -549,6 +550,7 @@ workflows:
                 - dev
                 - stage
                 - prod
+                - USAGOV-1032-drupal-10-upgrade
       - approve-dev-deployment:
           type: approval
           requires:

.docker/Dockerfile-cms

@@ -99,7 +99,7 @@ RUN npm install --production=false --prefix /var/www/web/themes/custom/usagov \
 ###############################################################
 
 
-FROM alpine:3.17 AS cms
+FROM alpine:3.18 AS cms
 LABEL MAINTAINER=dan@mobomo.com
 
 ARG S6_VERSION
@@ -148,54 +148,54 @@ RUN sed -E -i "s/:x:${BUID}:/:x:1919:/g" /etc/passwd \
       mariadb-connector-c \
       nginx \
       nginx-mod-http-lua \
-      php81 \
-      php81-fpm \
-      php81-bcmath \
-      php81-bz2 \
-      php81-calendar \
-      php81-curl \
-      php81-ctype \
-      php81-dom \
-      php81-fileinfo \
-      php81-ftp \
-      php81-gd \
-      php81-intl \
-      php81-iconv \
-      php81-imap \
-      php81-intl \
-      php81-json \
-      php81-ldap \
-      php81-mbstring \
-      php81-mysqlnd \
-      php81-openssl \
-      php81-opcache \
-      php81-pcntl \
-      php81-pdo \
-      php81-pdo_mysql \
-      php81-pdo_sqlite \
-      php81-pear \
-      php81-pecl-imagick \
-      php81-pecl-xdebug \
-      php81-phar \
-      php81-posix \
-      php81-session \
-      php81-simplexml \
-      php81-shmop \
-      php81-soap \
-      php81-sockets \
-      php81-sodium \
-      php81-sqlite3 \
-      php81-sysvmsg \
-      php81-sysvsem \
-      php81-sysvshm \
-      php81-tokenizer \
-      php81-tidy \
-      php81-xsl \
-      php81-xml \
-      php81-xmlreader \
-      php81-xmlwriter \
-      php81-zip \
-      php81-zlib \
+      php82 \
+      php82-fpm \
+      php82-bcmath \
+      php82-bz2 \
+      php82-calendar \
+      php82-curl \
+      php82-ctype \
+      php82-dom \
+      php82-fileinfo \
+      php82-ftp \
+      php82-gd \
+      php82-intl \
+      php82-iconv \
+      php82-imap \
+      php82-intl \
+      php82-json \
+      php82-ldap \
+      php82-mbstring \
+      php82-mysqlnd \
+      php82-openssl \
+      php82-opcache \
+      php82-pcntl \
+      php82-pdo \
+      php82-pdo_mysql \
+      php82-pdo_sqlite \
+      php82-pear \
+      php82-pecl-imagick \
+      php82-pecl-xdebug \
+      php82-phar \
+      php82-posix \
+      php82-session \
+      php82-simplexml \
+      php82-shmop \
+      php82-soap \
+      php82-sockets \
+      php82-sodium \
+      php82-sqlite3 \
+      php82-sysvmsg \
+      php82-sysvsem \
+      php82-sysvshm \
+      php82-tokenizer \
+      php82-tidy \
+      php82-xsl \
+      php82-xml \
+      php82-xmlreader \
+      php82-xmlwriter \
+      php82-zip \
+      php82-zlib \
     && mkdir -p /var/www/web/sites/default/files \
     # s6 supervisor setup
     && tar xzf /tmp/s6overlay.tar.gz -C / \
@@ -212,11 +212,12 @@ RUN sed -E -i "s/:x:${BUID}:/:x:1919:/g" /etc/passwd \
     && mkdir -p /run/nginx/ \
     && touch /run/nginx/nginx.pid \
     # php setup
-    && ln -s /usr/sbin/php-fpm81 /usr/sbin/php-fpm
+    && ln -s /usr/bin/php82 /usr/bin/php \
+    && ln -s /usr/sbin/php-fpm82 /usr/sbin/php-fpm
 
     # new relic setup
-COPY bin/src/newrelic.sh /local/newrelic.sh
-RUN . /local/newrelic.sh
+# COPY bin/src/newrelic.sh /local/newrelic.sh
+# RUN . /local/newrelic.sh
 
     # cron setup
 RUN mkdir -p /etc/periodic/1min \

.docker/src-cms/etc/php81/php-fpm.conf → .docker/src-cms/etc/php82/php-fpm.conf

@@ -13,4 +13,4 @@ daemonize = no
 
 events.mechanism = epoll
 
-include=/etc/php81/php-fpm.d/*.conf
+include=/etc/php82/php-fpm.d/*.conf

.docker/src-cms/etc/php81/php.ini → .docker/src-cms/etc/php82/php.ini

@@ -29,7 +29,7 @@ report_memleaks = On
 track_errors    = Off
 html_errors     = On
 
-auto_prepend_file = /etc/php81/auto_prepend.php
+auto_prepend_file = /etc/php82/auto_prepend.php
 auto_append_file  =
 
 default_mimetype  = "text/html"

bin/php

@@ -3,4 +3,4 @@
 docker exec -it \
   --workdir /var/www \
   cms \
-  /usr/bin/php "$@"
+  /usr/bin/php82 "$@"

bin/src/newrelic.sh

@@ -17,5 +17,5 @@ if [ $(uname -m) != 'aarch64' ]; then
       -e 's/;\?newrelic.framework =.*/newrelic.framework = "drupal8"/' \
       -e 's/;\?newrelic.loglevel =.*/newrelic.loglevel = "warning"/' \
       -e 's/;\?newrelic.enabled =.*/newrelic.enabled = false/' \
-      /etc/php81/conf.d/newrelic.ini
+      /etc/php82/conf.d/newrelic.ini
 fi

composer.json

@@ -15,80 +15,73 @@
         }
     ],
     "require": {
-        "composer/installers": "^1.9",
+        "composer/installers": "^2.2",
         "cweagans/composer-patches": "^1.7",
-        "drupal/address": "^1.9",
-        "drupal/admin_content_notification": "^3.8",
-        "drupal/admin_toolbar": "3.x-dev",
-        "drupal/allowed_formats": "^1.5",
-        "drupal/autologout": "^1.3",
-        "drupal/autosave_form": "^1.2",
+        "drupal/address": "^1.10",
+        "drupal/admin_content_notification": "^4.1",
+        "drupal/admin_toolbar": "^3.4",
+        "drupal/allowed_formats": "^2.0",
+        "drupal/autologout": "^1.4",
+        "drupal/autosave_form": "^1.4",
         "drupal/bigmenu": "^2.0@RC",
-        "drupal/block_content_revision_ui": "^2.127",
-        "drupal/ckeditor_media_oembed_plugin": "^1.0",
-        "drupal/clientside_validation": "3.0.x-dev",
+        "drupal/block_content_revision_ui": "^2.280",
+        "drupal/ckeditor": "^1.0",
         "drupal/conditional_fields": "^4.0@alpha",
-        "drupal/console": "^1.9",
-        "drupal/content_lock": "^2.2",
-        "drupal/content_moderation_notifications": "^3.4",
-        "drupal/core-composer-scaffold": "9.5.10",
-        "drupal/core-project-message": "9.5.10",
-        "drupal/core-recommended": "9.5.10",
-        "drupal/ctools": "^3.7",
-        "drupal/devel": "^4.1",
-        "drupal/devel_entity_updates": "^3.0",
-        "drupal/diff": "^1.0",
-        "drupal/entity_reference_revisions": "^1.9",
-        "drupal/externalauth": "^2",
+        "drupal/content_lock": "^2.3",
+        "drupal/content_moderation_notifications": "^3.5",
+        "drupal/core-composer-scaffold": "^10.1",
+        "drupal/core-project-message": "^10.1",
+        "drupal/core-recommended": "^10",
+        "drupal/ctools": "^4.0",
+        "drupal/devel": "^5.1",
+        "drupal/diff": "^1.1",
+        "drupal/entity_reference_revisions": "^1.10",
+        "drupal/externalauth": "^2.0",
         "drupal/faqfield": "^7.0",
         "drupal/feeds": "^3.0@beta",
-        "drupal/field_permissions": "^1.1",
-        "drupal/image_style_warmer": "^1.1",
-        "drupal/jquery_ui_accordion": "^1.1",
-        "drupal/language_switcher_extended": "^1.0",
-        "drupal/linkit": "^6.0@beta",
-        "drupal/log_stdout": "^1.3",
-        "drupal/mail_safety": "^1.2",
-        "drupal/mailsystem": "^4.3",
-        "drupal/menu_block": "^1.7",
+        "drupal/field_permissions": "^1.2",
+        "drupal/image_style_warmer": "^1.2",
+        "drupal/language_switcher_extended": "^1.1",
+        "drupal/linkit": "^6.0",
+        "drupal/mail_safety": "^2.0",
+        "drupal/mailsystem": "^4.4",
+        "drupal/menu_block": "^1.10",
         "drupal/menu_breadcrumb": "^1.16",
-        "drupal/message_notify": "^1.2",
-        "drupal/metatag": "^1.16",
-        "drupal/mmf_core_fields": "^2.0",
-        "drupal/module_filter": "^3.1",
+        "drupal/message_notify": "^1.3",
+        "drupal/metatag": "^2.0",
+        "drupal/module_filter": "^4.0",
         "drupal/new_relic_rpm": "^2.1",
-        "drupal/node_menus": "^3.0@alpha",
-        "drupal/paragraphs_collapsible": "^1.2",
-        "drupal/paragraphs_entity_embed": "^2.0@alpha",
-        "drupal/pathauto": "^1.8",
-        "drupal/redirect": "^1.6",
-        "drupal/remove_http_headers": "^1.0",
-        "drupal/s3fs": "^3.0@alpha",
+        "drupal/node_menus": "^3.0",
+        "drupal/paragraphs_collapsible": "^1.4",
+        "drupal/paragraphs_entity_embed": "2.x-dev@dev",
+        "drupal/pathauto": "^1.11",
+        "drupal/redirect": "^1.8",
+        "drupal/remove_http_headers": "^2.0",
+        "drupal/s3fs": "^3.3",
         "drupal/scanner": "^1.0@RC",
-        "drupal/scheduled_publish": "^3.9",
-        "drupal/scheduled_transitions": "^2.0",
-        "drupal/scheduler": "^1.3",
-        "drupal/schema_metatag": "^2.1",
-        "drupal/simplify_menu": "^2.1",
-        "drupal/siteimprove": "^1.10",
-        "drupal/smtp": "^1.0",
-        "drupal/stepbystep": "^2.0@beta",
-        "drupal/taxonomy_menu": "^3.4",
-        "drupal/term_reference_fancytree": "^2.0@RC",
-        "drupal/term_reference_tree": "^1.0",
-        "drupal/tome": "^1.6",
-        "drupal/twig_tweak": "^3.1",
-        "drupal/uswds_base": "^2.4",
-        "drupal/uswds_ckeditor_integration": "^1.0@beta",
+        "drupal/scheduled_publish": "^3.10",
+        "drupal/scheduled_transitions": "^2.3",
+        "drupal/scheduler": "^2.0",
+        "drupal/schema_metatag": "^3.0",
+        "drupal/simplify_menu": "^3.0@beta",
+        "drupal/siteimprove": "^2.0",
+        "drupal/smtp": "^1.2",
+        "drupal/stepbystep": "^2.0",
+        "drupal/taxonomy_menu": "^3.6",
+        "drupal/term_reference_tree": "^2.0",
+        "drupal/tome": "^1.11",
+        "drupal/uswds_base": "^3.3",
+        "drupal/uswds_ckeditor_integration": "^2.0",
         "drupal/uswds_paragraph_components": "^2.2",
-        "drupal/views_menu_children_filter": "^1.0@RC",
-        "drupal/webform": "^6.0",
-        "drupal/workbench_email": "^2.2",
-        "drush/drush": "^10.3",
-        "nyholm/psr7": "^1.4",
+        "drupal/views_menu_children_filter": "^3.0@RC",
+        "drupal/webform": "^6.1",
+        "drupal/workbench_email": "^3.0",
+        "drush/drush": "^12",
+        "mglaman/composer-drupal-lenient": "^1.0",
+        "nyholm/psr7": "^1.6",
         "nyholm/psr7-server": "^1.0",
-        "onelogin/php-saml": "^4",
-        "wikimedia/composer-merge-plugin": "^2.0.0"
+        "onelogin/php-saml": "^4.1",
+        "wikimedia/composer-merge-plugin": "^2.1"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -106,13 +99,19 @@
             "drupal/core-project-message": true,
             "wikimedia/composer-merge-plugin": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "cweagans/composer-patches": true
+            "cweagans/composer-patches": true,
+            "mglaman/composer-drupal-lenient": true
         }
     },
     "extra": {
         "drupal-scaffold": {
             "locations": {
                 "web-root": "web/"
+            },
+        "drupal-lenient": {
+                "allowed-list": [
+                    "drupal/log_stdout"
+                ]
             }
         },
         "installer-paths": {
@@ -145,25 +144,24 @@
             ]
         },
         "patches": {
-            "drupal/mmf_core_fields": {
-                "Issue #3198426: Working with Paragraphs": "https://git.drupalcode.org/project/mmf_core_fields/-/merge_requests/1.diff"
+            "drupal/conditional_fields": {
+              "Fix PHP 8.2 deprecation issue with DependencyHelper-class": "https://www.drupal.org/files/issues/2023-05-09/3345459-Fix-PHP-8.2-deprecation-issue.diff"
+            },
+            "drupal/content_lock": {
+                "PHP 8.2 issue": "https://www.drupal.org/files/issues/2023-05-22/3343964-5.patch"
             },
             "drupal/tome": {
                 "CSS on Amazon S3 via Flysystem not processing properly": "https://www.drupal.org/files/issues/2020-08-06/3161384-4.patch",
                 "De-duplicate invoke paths in StaticCommand's exportPaths": "./patches/drupal/deduplicateTomeInvokePaths.patch"
-                },
-            "drupal/paragraphs_entity_embed": {
-                "Paragraph Embed Preview Update": "https://www.drupal.org/files/issues/2022-05-27/paragraphs_entity_embed_csrf_token.patch"
             },
             "drupal/core": {
-                "Enable MenuActiveTrail to find the original menu item created by node_menus": "./patches/drupal/correctActiveTrail.patch",
                 "Make BaseFieldOverride inherit internal property from the base field": "https://www.drupal.org/files/issues/2023-01-20/3274419-42.patch"
             },
             "drupal/views_menu_children_filter": {
                 "Use the technique from correctActiveTrail.patch to return the original menu item": "./patches/drupal/correctMenuChildren.patch"
             },
-            "drupal/uswds_ckeditor_integration": {
-                "Remove linting dependencies from USWDS CKEditor module that have security issues": "./patches/drupal/removeDependencies.patch"
+            "drupal/log_stdout": {
+                "Drupal 10 compatibility": "https://www.drupal.org/files/issues/2023-05-26/log_stdout_d10_3339853_8.patch"
             }
         }
     }