Merge pull request #523 from UN-OCHA/develop

Drupal 9

.docksal/docksal.env

@@ -28,4 +28,5 @@ MYSQL_PORT_MAPPING='0:3306'
 # Enable/disable xdebug
 # To override locally, copy the two lines below into .docksal/docksal-local.env and adjust as necessary
 XDEBUG_ENABLED=0
-CLI_IMAGE="docksal/cli:2.13-php7.3"
+#CLI_IMAGE="docksal/cli:php7.4-3.0"
+CLI_IMAGE="docksal/cli:php8.0-3.0"

.github/workflows/docker-build-image.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - develop
-      - master
+      - main
       - feature/**
   release:
     types: [published]

.travis.yml

@@ -9,7 +9,7 @@ cache:
 #   chrome: stable
 
 php:
-  - 7.4
+  - 8.0
 
 mysql:
   database: drupal

composer.json

@@ -20,47 +20,39 @@
         }
     ],
     "require": {
-        "php": ">=7.4",
-        "composer/composer": "^1.10.22",
-        "composer/installers": "^1.7",
-        "cweagans/composer-patches": "^1.7",
-        "drupal-composer/preserve-paths": "^0.1.6",
+        "php": ">=8.0",
+        "cweagans/composer-patches": "^1.6.5",
         "drupal/address": "^1.6",
         "drupal/admin_denied": "^1.0",
         "drupal/chosen": "^2.7",
         "drupal/colorbox": "^1.4",
         "drupal/colors": "1.x-dev",
-        "drupal/comment_alter": "1.x-dev",
-        "drupal/components": "^1.1",
-        "drupal/conditional_fields": "^1.0@alpha",
-        "drupal/conditional_styles": "^1.0",
+        "drupal/components": "^2.4",
+        "drupal/conditional_fields": "^4.0@alpha",
         "drupal/config_split": "^1.4",
-        "drupal/console": "^1.0.2",
-        "drupal/core-composer-scaffold": "^8.9",
-        "drupal/core-dev": "^8.9",
-        "drupal/core-recommended": "^8.9.17",
+        "drupal/core-composer-scaffold": "^9.2.6",
+        "drupal/core-project-message": "^9.2.6",
+        "drupal/core-recommended": "^9.2.6",
         "drupal/ctools": "^3.7",
-        "drupal/date_recur": "^2.0@beta",
-        "drupal/date_recur_modular": "^2.0.0",
+        "drupal/date_recur": "^3.0",
+        "drupal/date_recur_modular": "^3.0",
         "drupal/diff": "^1.0@RC",
         "drupal/dream_block_manager": "^1.0",
         "drupal/dynamic_entity_reference": "^1.7",
         "drupal/entityqueue": "^1.0",
         "drupal/facets": "^1.8",
         "drupal/facets_pretty_paths": "^1.0@beta",
-        "drupal/fasttoggle": "^2.0@alpha",
-        "drupal/field_collection": "^1.0@alpha",
         "drupal/field_group": "^3.0",
         "drupal/field_permissions": "^1.0@RC",
         "drupal/file_entity": "^2.0@beta",
         "drupal/flag": "^4.0@alpha",
-        "drupal/geocoder": "^2.7",
+        "drupal/geocoder": "^3.20",
         "drupal/geofield": "^1.3",
         "drupal/geofield_map": "^2.38",
         "drupal/geophp": "^1.0@beta",
         "drupal/google_tag": "^1.2",
         "drupal/group": "^1.0.0",
-        "drupal/linkit": "^4.3",
+        "drupal/linkit": "^6.0@beta",
         "drupal/maintenance200": "^1.0",
         "drupal/media_entity_file_replace": "^1.0",
         "drupal/migrate_upgrade": "^3",
@@ -70,14 +62,14 @@
         "drupal/paragraphs_modal_edit": "^1.0@alpha",
         "drupal/paragraphs_viewmode": "^1.0@alpha",
         "drupal/pathauto": "^1.4",
-        "drupal/realname": "^1.0@RC",
+        "drupal/realname": "^2.0@beta",
         "drupal/redirect": "^1.4",
         "drupal/redis": "^1.4",
         "drupal/search_api": "^1.14",
         "drupal/search_api_attachments": "^1.0@beta",
         "drupal/search_api_solr": "^4.1",
         "drupal/select2": "^1.6",
-        "drupal/select_or_other": "^1.0@alpha",
+        "drupal/select_or_other": "^4.0",
         "drupal/social_auth_hid": "^2.2",
         "drupal/spamspan": "^1.2",
         "drupal/stage_file_proxy": "^1.0",
@@ -87,28 +79,25 @@
         "drupal/twig_tweak": "^2.8",
         "drupal/variationcache": "^1.0",
         "drupal/viewsreference": "^2.0.0",
-        "drupal/webform": "^5.25",
-        "drush/drush": "^9.0.0",
+        "drupal/webform": "^6.1@beta",
+        "drush/drush": "^10.0.0",
         "npm-asset/select2": "^4.0",
         "oomphinc/composer-installers-extender": "^2.0",
         "phpoffice/phpspreadsheet": "^1.16",
-        "symfony/event-dispatcher": "4.3.3 as 3.4.41",
-        "symfony/filesystem": "^3.4",
-        "symfony/finder": "^3.4",
-        "unocha/common_design": "^4.1.0",
+        "unocha/common_design": "^5.0.0",
         "unocha/ocha_integrations": "^1.0",
         "unocha/un_date": "^1.0.1",
         "vlucas/phpdotenv": "^2.4",
         "webflo/drupal-finder": "^1.0.0",
-        "webmozart/path-util": "^2.3",
-        "weitzman/drupal-test-traits": "^1.5"
+        "webmozart/path-util": "^2.3"
     },
     "require-dev": {
         "drupal/coder": "^8.3",
-        "drupal/devel": "^2.1",
-        "drupal/devel_php": "^1.1",
+        "drupal/core-dev": "^9.2.6",
+        "drupal/upgrade_rector": "1.x-dev@dev",
+        "drupal/upgrade_status": "^3.8",
         "phpmd/phpmd": "^2.6",
-        "phpunit/phpunit": "^7",
+        "weitzman/drupal-test-traits": "^1.5",
         "weitzman/logintrait": "^1.1"
     },
     "conflict": {