diff --git a/.ddev/commands/host/scratch b/.ddev/commands/host/scratch index ea55aca..1546ba3 100755 --- a/.ddev/commands/host/scratch +++ b/.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 diff --git a/composer.json b/composer.json index fea9971..0c523fb 100644 --- a/composer.json +++ b/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" + } + } } } diff --git a/composer.lock b/composer.lock index 8f7d2e4..1fda756 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f4019abebc98cdf999415938003ac404", + "content-hash": "56db5ab1f1682a4f76252b5d15fae3f6", "packages": [ { "name": "asm89/stack-cors", @@ -864,6 +864,129 @@ }, "time": "2024-04-06T00:00:28+00:00" }, + { + "name": "cweagans/composer-configurable-plugin", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/cweagans/composer-configurable-plugin.git", + "reference": "15433906511a108a1806710e988629fd24b89974" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweagans/composer-configurable-plugin/zipball/15433906511a108a1806710e988629fd24b89974", + "reference": "15433906511a108a1806710e988629fd24b89974", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "require-dev": { + "codeception/codeception": "~4.0", + "codeception/module-asserts": "^2.0", + "composer/composer": "~2.0", + "php-coveralls/php-coveralls": "~2.0", + "php-parallel-lint/php-parallel-lint": "^1.0.0", + "phpro/grumphp": "^1.8.0", + "sebastian/phpcpd": "^6.0", + "squizlabs/php_codesniffer": "^3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "cweagans\\Composer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Cameron Eagans", + "email": "me@cweagans.net" + } + ], + "description": "Provides a lightweight configuration system for Composer plugins.", + "support": { + "issues": "https://github.com/cweagans/composer-configurable-plugin/issues", + "source": "https://github.com/cweagans/composer-configurable-plugin/tree/2.0.0" + }, + "funding": [ + { + "url": "https://github.com/cweagans", + "type": "github" + } + ], + "time": "2023-02-12T04:58:58+00:00" + }, + { + "name": "cweagans/composer-patches", + "version": "2.0.0-beta2", + "source": { + "type": "git", + "url": "https://github.com/cweagans/composer-patches.git", + "reference": "ac383664c9456e63774c7c58626ba8665574d314" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/ac383664c9456e63774c7c58626ba8665574d314", + "reference": "ac383664c9456e63774c7c58626ba8665574d314", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^2.0", + "cweagans/composer-configurable-plugin": "^2.0", + "ext-json": "*", + "php": ">=8.0.0" + }, + "require-dev": { + "codeception/codeception": "~4.0", + "codeception/module-asserts": "^2.0", + "codeception/module-cli": "^2.0", + "codeception/module-filesystem": "^2.0", + "composer/composer": "~2.0", + "php-coveralls/php-coveralls": "~2.0", + "php-parallel-lint/php-parallel-lint": "^1.0.0", + "phpro/grumphp": "^1.8.0", + "sebastian/phpcpd": "^6.0", + "squizlabs/php_codesniffer": "^3.0" + }, + "type": "composer-plugin", + "extra": { + "class": "cweagans\\Composer\\Plugin\\Patches", + "_": "The following two lines ensure that composer-patches is loaded as early as possible.", + "plugin-modifies-downloads": true, + "plugin-modifies-install-path": true + }, + "autoload": { + "psr-4": { + "cweagans\\Composer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Cameron Eagans", + "email": "me@cweagans.net" + } + ], + "description": "Provides a way to patch Composer packages.", + "support": { + "issues": "https://github.com/cweagans/composer-patches/issues", + "source": "https://github.com/cweagans/composer-patches/tree/2.0.0-beta2" + }, + "funding": [ + { + "url": "https://github.com/cweagans", + "type": "github" + } + ], + "time": "2024-02-14T03:42:12+00:00" + }, { "name": "dflydev/dot-access-data", "version": "v3.0.2", diff --git a/config/patches/webform_3345590_3.patch b/config/patches/webform_3345590_3.patch new file mode 100644 index 0000000..842f2a5 --- /dev/null +++ b/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; + + /** diff --git a/patches.lock.json b/patches.lock.json new file mode 100644 index 0000000..4e10721 --- /dev/null +++ b/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" + } + } + ] + } +}