From 0b25233bb44d62e6e024cb98c3e03eee5e1f67c7 Mon Sep 17 00:00:00 2001
From: Ken Rickard <agentrickard@gmail.com>
Date: Fri, 13 Jan 2023 16:44:18 -0500
Subject: [PATCH 1/7] Prefix ddev config file location.

---
 targets/install.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/install.xml b/targets/install.xml
index c9491490..9a3ad322 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -169,7 +169,7 @@
     <!-- Target: setup-templates -->
     <target name="setup-templates" depends="set-site">
         <!-- Set the project name in the ddev config. -->
-        <replaceregexp match="name: .*" replace="name: ${projectname}" file=".ddev/config.yaml" />
+        <replaceregexp match="name: .*" replace="name: ${projectname}" file="${application.startdir}/.ddev/config.yaml" />
 
         <!-- Copy the build file template.
 

From a190f6f4d3f9510f37b63ac8ae3b53a2cdf3b7a3 Mon Sep 17 00:00:00 2001
From: Ken Rickard <agentrickard@gmail.com>
Date: Fri, 13 Jan 2023 16:46:22 -0500
Subject: [PATCH 2/7] Update to pear/http_request2 v2.5

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index aafcec7c..6cc02a89 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         "drush/drush": ">=9",
         "mglaman/drupal-check": "^1.2",
         "palantirnet/phing-drush-task": "^1.1",
-        "pear/http_request2": "^2.3",
+        "pear/http_request2": "^2.5",
         "pear/versioncontrol_git": "@dev",
         "phing/phing": "^2.14",
         "phpmd/phpmd": "^2.4",

From 5adf0fe3f0c33622e066b25b4d5dd6056f837ebd Mon Sep 17 00:00:00 2001
From: byrond <duvall@palantir.net>
Date: Fri, 13 Jan 2023 21:38:06 -0500
Subject: [PATCH 3/7] test with the minimum-stability-dev branch of the
 skeleton

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7ba305d9..be370465 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,7 +72,7 @@ jobs:
       # Create a new project using the drupal-skeleton project
       - run:
           name: Create a new Drupal project
-          command: composer create-project palantirnet/drupal-skeleton example dev-develop --no-interaction
+          command: composer create-project palantirnet/drupal-skeleton example dev-minimum-stability-dev --no-interaction
           working_directory: ~/
 
       # Use this copy of the-build

From 5e098ea3ac657a5246e27758d32ce7302dddeb0f Mon Sep 17 00:00:00 2001
From: byrond <duvall@palantir.net>
Date: Mon, 16 Jan 2023 12:49:01 -0500
Subject: [PATCH 4/7] remove config_ignore until there is a stable release that
 supports drupal 10, and I'll make my commit messages as long as I want,
 GitHub; thank you very much

---
 targets/drupal.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/targets/drupal.xml b/targets/drupal.xml
index aea607e8..19161f98 100644
--- a/targets/drupal.xml
+++ b/targets/drupal.xml
@@ -275,7 +275,6 @@ Or, you can specify the export file directly:
         <composer command="require" composer="${composer.composer}">
             <arg value="drupal/admin_toolbar" />
             <arg value="drupal/config_split" />
-            <arg value="drupal/config_ignore" />
             <arg value="drupal/devel" />
             <arg value="drupal/workbench" />
             <arg value="drupal/workbench_tabs" />

From 37072f3d533ab9fe81e60e91ea5ee4007d386890 Mon Sep 17 00:00:00 2001
From: byrond <duvall@palantir.net>
Date: Mon, 16 Jan 2023 12:50:12 -0500
Subject: [PATCH 5/7] revert pear/http_request2 update until we can test it

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 6cc02a89..aafcec7c 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         "drush/drush": ">=9",
         "mglaman/drupal-check": "^1.2",
         "palantirnet/phing-drush-task": "^1.1",
-        "pear/http_request2": "^2.5",
+        "pear/http_request2": "^2.3",
         "pear/versioncontrol_git": "@dev",
         "phing/phing": "^2.14",
         "phpmd/phpmd": "^2.4",

From 035f00045cc461713dc8b57fd56e7c183792911f Mon Sep 17 00:00:00 2001
From: byrond <duvall@palantir.net>
Date: Mon, 16 Jan 2023 13:01:26 -0500
Subject: [PATCH 6/7] revert change of drupal skeleton version to test with

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index be370465..7ba305d9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,7 +72,7 @@ jobs:
       # Create a new project using the drupal-skeleton project
       - run:
           name: Create a new Drupal project
-          command: composer create-project palantirnet/drupal-skeleton example dev-minimum-stability-dev --no-interaction
+          command: composer create-project palantirnet/drupal-skeleton example dev-develop --no-interaction
           working_directory: ~/
 
       # Use this copy of the-build

From 67aff1968f41eff24744aca43b72cef79dc92628 Mon Sep 17 00:00:00 2001
From: byrond <duvall@palantir.net>
Date: Mon, 16 Jan 2023 15:13:06 -0500
Subject: [PATCH 7/7] copy settings.ddev.php to old drupal root if it doesn't
 exist

---
 targets/install.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/targets/install.xml b/targets/install.xml
index 9a3ad322..e4b3782b 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -142,6 +142,16 @@
                 <!-- The one that's available is the location we're moving from. -->
                 <available file="${build.dir}/web/core" type="dir" property="drupal.root.old" value="web" />
                 <available file="${build.dir}/docroot/core" type="dir" property="drupal.root.old" value="docroot" />
+                <available file="${build.dir}/${drupal.root.old}/sites/default/settings.ddev.php" type="file" property="ddev_settings_exists" value="true" />
+
+                <!-- Copy settings.ddev.php if it doesn't exist in the old drupal root. -->
+                <if>
+                    <not><equals arg1="${ddev_settings_exists}" arg2="1" /></not>
+                    <then>
+                        <echo msg="Copying settings.ddev.php to old drupal root." />
+                        <exec command="cp ${drupal.root}/sites/default/settings.ddev.php ${drupal.root.old}/sites/default" dir="${build.dir}" checkreturn="true" logoutput="true" />
+                    </then>
+                </if>
 
                 <echo msg="Moving the ${drupal.root.old}/ directory to ${drupal.root}/" />
                 <exec command="rm -rf ${drupal.root}" dir="${build.dir}" />