[MAT-7230] Upgrade to Drupal 10

MeasureAuthoringTool · Oct 17, 2024 · c49dd58 · c49dd58
1 parent 26cbcd2
commit c49dd58
Show file tree

Hide file tree

Showing 89 changed files with 4,422 additions and 3,470 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@ RUN composer install \
   --no-dev \
   --prefer-dist
 
-FROM drupal:9
+FROM drupal:10
 
 # NewRelic
 #ARG PHP_AGENT_URL="https://download.newrelic.com/php_agent/release/newrelic-php5-10.19.0.9-linux.tar.gz"
@@ -48,10 +48,8 @@ RUN echo 'Acquire::http::timeout "300"; ' > /etc/apt/apt.conf.d/99timeouts   &&
 RUN rm /var/www/html
 COPY --from=vendor /app/ /var/www
 
-# Install Drush
-RUN wget -O drush.phar https://github.com/drush-ops/drush-launcher/releases/download/0.6.0/drush.phar && \
-	chmod +x drush.phar && \
-	mv drush.phar /usr/local/bin/drush
+# Add Drush to PATH
+ENV PATH="/var/www/vendor/bin:${PATH}"
 
 # Grab DB PEM from AWS.
 RUN wget -O /var/www/html/sites/default/us-east-1-bundle.pem https://truststore.pki.rds.amazonaws.com/us-east-1/us-east-1-bundle.pem

diff --git a/composer.json b/composer.json
@@ -24,13 +24,13 @@
         "drupal/components": "^3.0@beta",
         "drupal/config_filter": "^2.6",
         "drupal/config_split": "^2.0",
-        "drupal/core-composer-scaffold": "^9",
-        "drupal/core-project-message": "^9",
-        "drupal/core-recommended": "^9",
+        "drupal/core-composer-scaffold": "^10",
+        "drupal/core-project-message": "^10",
+        "drupal/core-recommended": "^10",
         "drupal/devel": "^5.0",
-        "drupal/emulsify_drupal": "^4.9",
+        "drupal/devel_entity_updates": "^4.2",
         "drupal/extlink": "^1.7",
-        "drupal/honeypot": "^2.0",
+        "drupal/honeypot": "2.1.4",
         "drupal/linkit": "^6.0",
         "drupal/mailsystem": "^4.2",
         "drupal/menu_trail_by_path": "^2.1",
@@ -44,12 +44,12 @@
         "drupal/upgrade_status": "^4.3",
         "drupal/views_infinite_scroll": "^2.0",
         "drupal/webform": "^6.2",
-        "drush/drush": "^11.0",
+        "drush/drush": "^12",
         "vlucas/phpdotenv": "^5.6",
         "webflo/drupal-finder": "^1.0.0"
     },
     "require-dev": {
-        "drupal/core-dev": "^9"
+        "drupal/core-dev": "^10"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -64,7 +64,10 @@
             "drupal/core-composer-scaffold": true,
             "drupal/console-extend-plugin": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "drupal/core-project-message": true
+            "drupal/core-project-message": true,
+            "php-http/discovery": true,
+            "phpstan/extension-installer": true,
+            "tbachert/spi": true
         }
     },
     "autoload": {
@@ -107,9 +110,6 @@
             "drush/Commands/contrib/{$name}": ["type:drupal-drush"]
         },
         "patches": {
-            "drupal/paragraphs": {
-                "Layout Builder + Paragraphs Langcode Issue #29": "https://www.drupal.org/files/issues/2019-07-10/paragraphs-set_langcode_widgets-2901390-29.patch"
-            }
         }
     }
 }