Merge branch 'convert-site-recipe' of github.com:frees-au/ce into con…

…vert-site-recipe

.ddev/commands/host/scratch

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-ddev drush site:install minimal --yes
-ddev drush config:set system.site uuid '67893125-a67c-49fe-ab82-c1e0fd0dc8f9' --yes
-ddev drush config:import --yes
+# Install the site directly from the config.
+ddev drush si minimal --existing-config -y
+
+# Install additional functionality which is not part of the captured config.
 ddev drush pm:install fs_test default_content --yes

composer.json

@@ -16,6 +16,7 @@
     ],
     "require": {
         "composer/installers": "^2.0",
+        "cweagans/composer-patches": "~2.0",
         "drupal/admin_toolbar": "^3.4",
         "drupal/ckeditor5_template": "^1.0",
         "drupal/config_ignore": "^3.2",
@@ -119,6 +120,10 @@
         "patchLevel": {
             "drupal/core": "-p2"
         },
-        "patches": {}
+        "patches": {
+            "drupal/webform": {
+                "[#3345590] Drush 12 moved the namespace": "./config/patches/webform_3345590_3.patch"
+            }
+        }
     }
 }

config/patches/webform_3345590_3.patch

@@ -0,0 +1,13 @@
+diff --git a/src/Commands/WebformSanitizeSubmissionsCommands.php b/src/Commands/WebformSanitizeSubmissionsCommands.php
+index 0db7d1bff..d8aca13e2 100644
+--- a/src/Commands/WebformSanitizeSubmissionsCommands.php
++++ b/src/Commands/WebformSanitizeSubmissionsCommands.php
+@@ -7,7 +7,7 @@ use Drupal\Core\Database\Connection;
+ use Drupal\Core\Entity\EntityTypeManagerInterface;
+ use Drupal\Core\Extension\ModuleHandlerInterface;
+ use Drush\Commands\DrushCommands;
+-use Drush\Drupal\Commands\sql\SanitizePluginInterface;
++use Drush\Commands\sql\sanitize\SanitizePluginInterface;
+ use Symfony\Component\Console\Input\InputInterface;
+
+ /**

patches.lock.json

@@ -0,0 +1,17 @@
+{
+    "_hash": "ea346eeeedcaab70908859ee2839e9cf92cd26ba1f3d73731e887dfb6c56fb56",
+    "patches": {
+        "drupal/webform": [
+            {
+                "package": "drupal/webform",
+                "description": "[#3345590] Drush 12 moved the namespace",
+                "url": "./config/patches/webform_3345590_3.patch",
+                "sha256": "5742d76928b8b2ddcd4a3acdda52661f03b40207a9afd2835fd7ccd711bd9ca9",
+                "depth": 1,
+                "extra": {
+                    "provenance": "root"
+                }
+            }
+        ]
+    }
+}