From 30b49372f5b210eac1acf211cffd3d3ff8ae60c9 Mon Sep 17 00:00:00 2001
From: David Valdez <david.valdez210@gmail.com>
Date: Mon, 6 Jul 2020 23:20:43 +0000
Subject: [PATCH] First step to move the site to Drupal 9

---
 .ddev/.gitignore                                         | 4 +++-
 .ddev/config.yaml                                        | 3 ++-
 composer.json                                            | 9 ++++++---
 .../custom/agaric_migration/agaric_migration.info.yml    | 2 +-
 .../drutopia_case_study/drutopia_case_study.info.yml     | 2 +-
 .../drutopia_creative_license.info.yml                   | 2 +-
 web/themes/custom/agarica/agarica.info.yml               | 3 +--
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.ddev/.gitignore b/.ddev/.gitignore
index 9989216..bf003b6 100644
--- a/.ddev/.gitignore
+++ b/.ddev/.gitignore
@@ -4,12 +4,14 @@
 /commands/*/*.example
 /commands/*/README.txt
 /commands/host/launch
+/commands/web/xdebug
 /commands/db/mysql
 /homeadditions/*.example
 /homeadditions/README.txt
 /.gitignore
 /import.yaml
-/docker-compose.yaml
+/.ddev-docker-compose-base.yaml
+/.ddev-docker-compose-full.yaml
 /db_snapshots
 /sequelpro.spf
 /import-db
diff --git a/.ddev/config.yaml b/.ddev/config.yaml
index d67847c..dfdd40d 100644
--- a/.ddev/config.yaml
+++ b/.ddev/config.yaml
@@ -9,11 +9,12 @@ router_https_port: "443"
 xdebug_enabled: true
 additional_hostnames: []
 additional_fqdns: []
-mariadb_version: "10.2"
+mariadb_version: "10.3"
 nfs_mount_enabled: false
 provider: default
 webimage_extra_packages: [rake, sassc]
 use_dns_when_possible: false
+php_version: "7.3"
 timezone: ""
 
 
diff --git a/composer.json b/composer.json
index dc70ea0..75f8d40 100644
--- a/composer.json
+++ b/composer.json
@@ -47,11 +47,12 @@
         "drupal/textarea_widget_for_text": "^1.1",
         "drupal/twigsuggest": "1.x-dev",
         "drupal/ui_patterns": "^1.0@RC",
+        "drupal/upgrade_status": "^2.0",
         "drupal/viewsreference": "^1.2",
         "drupal/webform": "^5.0@RC",
         "drupal/webform_mailchimp": "^5.4",
         "drupal/wysiwyg_linebreaks": "^1.9",
-        "drush/drush": "^9.0",
+        "drush/drush": "^10.0",
         "drutopia/drutopia": "^1.0-beta1",
         "wikimedia/composer-merge-plugin": "^1.4",
         "zaporylie/composer-drupal-optimizations": "^1.0"
@@ -59,7 +60,8 @@
     "require-dev": {
         "behat/behat": "^3.4",
         "behat/mink": "^1.7",
-        "behat/mink-goutte-driver": "^1.2"
+        "behat/mink-goutte-driver": "^1.2",
+        "phpunit/phpunit": "^7"
     },
     "repositories": {
         "drupal": {
@@ -108,7 +110,8 @@
               "Allow user to specify keyboard shortcut.": "https://www.drupal.org/files/issues/2018-11-11/1734898-14.coffee-hotkeys-plus-g.patch"
             },
             "drupal/wysiwyg_linebreaks": {
-                  "Excess line breaks keep getting added": "https://www.drupal.org/files/issues/2018-11-18/excess-line-breaks-keep-getting-added-3013853-5.patch"
+                "Excess line breaks keep getting added": "https://www.drupal.org/files/issues/2018-11-18/excess-line-breaks-keep-getting-added-3013853-5.patch",
+                "Drupal 9 readiness and code standars": "https://www.drupal.org/files/issues/2020-04-21/drupal_9_readiness_and_code_standarts_3129608-7.patch"
             }
         }
     },
diff --git a/web/modules/custom/agaric_migration/agaric_migration.info.yml b/web/modules/custom/agaric_migration/agaric_migration.info.yml
index 9799ebe..df45326 100644
--- a/web/modules/custom/agaric_migration/agaric_migration.info.yml
+++ b/web/modules/custom/agaric_migration/agaric_migration.info.yml
@@ -2,7 +2,7 @@ name: Agaric Migration
 description: Migrate the content from the D7 version of the site.
 package: Custom
 type: module
-core: 8.x
+core_version_requirement: ^8 || ^9
 dependencies:
   - drupal:migrate
   - drupal:migrate_drupal
diff --git a/web/modules/custom/drutopia_case_study/drutopia_case_study.info.yml b/web/modules/custom/drutopia_case_study/drutopia_case_study.info.yml
index e264ea3..cf0e384 100644
--- a/web/modules/custom/drutopia_case_study/drutopia_case_study.info.yml
+++ b/web/modules/custom/drutopia_case_study/drutopia_case_study.info.yml
@@ -1,7 +1,7 @@
 name: 'Drutopia Case Study'
 description: 'A Case Study highlights work done on a project.'
 type: module
-core: 8.x
+core_version_requirement: ^8 || ^9
 dependencies:
   - config_snapshot
   - drutopia_case_study
diff --git a/web/modules/custom/drutopia_creative_license/drutopia_creative_license.info.yml b/web/modules/custom/drutopia_creative_license/drutopia_creative_license.info.yml
index bb4db06..4b2ffe1 100644
--- a/web/modules/custom/drutopia_creative_license/drutopia_creative_license.info.yml
+++ b/web/modules/custom/drutopia_creative_license/drutopia_creative_license.info.yml
@@ -1,7 +1,7 @@
 name: 'Creative License'
 type: module
-core: 8.x
 package: Drutopia
+core_version_requirement: ^8 || ^9
 dependencies:
   - config_actions
   - config_snapshot
diff --git a/web/themes/custom/agarica/agarica.info.yml b/web/themes/custom/agarica/agarica.info.yml
index 61abfd8..7f05091 100644
--- a/web/themes/custom/agarica/agarica.info.yml
+++ b/web/themes/custom/agarica/agarica.info.yml
@@ -3,8 +3,7 @@ description: An Octavia-based subtheme.
 type: theme
 base theme: octavia
 package: Custom
-core: 8.x
-
+core_version_requirement: ^8 || ^9
 regions:
   header: 'Header'
   navbar_branding: 'Branding'