Make scaffold "extra" data key conform with plugin command name

I was initially going to suggest doing this in #3086081: Name of composer:scaffold command is awkward itself, but then I saw the number of files we have to change. I think a separate issue makes sense. Here's the first attempt.

Also, the change makes sense and it is better to do it now rather than after 8.8.x release when it will be much more difficult to change.

The documentation at https://www.drupal.org/docs/develop/using-composer/using-drupals-compose... should be updated once we commit this or just before.

The Drupal tests are passing but composer tests don't pass because it loads the scaffold plugin from here: https://github.com/drupal/core-composer-scaffold. How do we get past this failure?

The only idea I have is to define a path repository in those composer.json files, but I am not sure if that is an acceptable approach. It may not be acceptable if those composer.json is meant to be a template for users and not only for the testing script.

Another idea is that we make it support both composer-scaffold and drupal-scaffold for now (in this issue or a new one). Once that change is committed and mirrored in the Github repo, we can test this patch again.

Created #3086201: Support "drupal-scaffold" as the key for scaffolding plugin for the approach I mentioned in #5. I guess we should mark this as postponed on that issue unless there are other ways to do this?

@greg.1.anderson, it doesn't look like that. All I am doing is having an alternate of "drupal-scaffold" along with "composer-scaffold". It's just a few lines change.

Nice one. But I think you missed the patch. :)

Maybe we should be doing this for all Drupal repositories? Also, will this add the scaffold path repository at the top? I believe composer checks for a package in the order it is listed in the repositories key.

Nevermind my last comment. I believe Composer checks the official packagist last, so this should work (once you upload the patch as well).

1. +++ b/composer.lock
   @@ -716,7 +716,7 @@
   -                "symfony/psr-http-message-bridge": "^1.0",
   +                "symfony/psr-http-message-bridge": "^1.1.2",
   

   Why is this updating?

2. +++ b/composer.lock
   @@ -845,13 +845,13 @@
   +                        "[project-root]/.editorconfig": "assets/scaffold/files/editorconfig",
   +                        "[project-root]/.gitattributes": "assets/scaffold/files/gitattributes",
                            "[web-root]/.csslintrc": "assets/scaffold/files/csslintrc",
   -                        "[web-root]/.editorconfig": "assets/scaffold/files/editorconfig",
                            "[web-root]/.eslintignore": "assets/scaffold/files/eslintignore",
                            "[web-root]/.eslintrc.json": "assets/scaffold/files/eslintrc.json",
   -                        "[web-root]/.gitattributes": "assets/scaffold/files/gitattributes",
   

   Are these changes a result of the [project-root] patch, that should have also updated the lock file?

3. +++ b/core/tests/scripts/test_composer_project_templates.sh
   @@ -34,11 +34,13 @@
   +composer --working-dir="${SOURCE_DIR}/composer/Template/RecommendedProject" config repositories.scaffold path '../../Plugin/Scaffold'
   ...
   +composer --working-dir="${SOURCE_DIR}/composer/Template/LegacyProject" config repositories.scaffold path '../../Plugin/Scaffold'
   

   Are these fixing something with the tests?

+++ b/composer/Plugin/Scaffold/Handler.php
@@ -24,12 +24,12 @@ class Handler {
+  const PRE_COMPOSER_SCAFFOLD_CMD = 'pre-drupal-scaffold-cmd';
...
+  const POST_COMPOSER_SCAFFOLD_CMD = 'post-drupal-scaffold-cmd';

I think these were supposed to be renamed to PRE / POST_DRUPAL_SCAFFOLD_COMMAND.

If so, ensure to rename their usages too in line 151/180

Otherwise this is sensible and a better DX overall.

Would be nice to add a followup to convert #3 into one of the new build tests.

Great. This is much more betterer.

Regarding #16.1, the reason is the same as point 2 over there. I verified this by checking the package in core/composer.json as well.

Okay, I should have read the whole thread before commenting. This was already explained. :)

Ok, looks like this is just some straight-forward renaming along the lines of #3086081: Name of composer:scaffold command is awkward.

Except for these two hunks, that is:

diff --git a/core/tests/scripts/test_composer_project_templates.sh b/core/tests/scripts/test_composer_project_templates.sh
index 0d32ec90c5..620f6ad29d 100755
--- a/core/tests/scripts/test_composer_project_templates.sh
+++ b/core/tests/scripts/test_composer_project_templates.sh
@@ -34,11 +34,13 @@
 SOURCE_DIR=$(realpath $(dirname $0))/../../..
 
 info "Installing recommended project composer template"
+composer --working-dir="${SOURCE_DIR}/composer/Template/RecommendedProject" config repositories.scaffold path '../../Plugin/Scaffold'
 composer --working-dir="${SOURCE_DIR}/composer/Template/RecommendedProject" install --no-suggest --no-progress --no-interaction
 info "Recommended project composer template installed successfully."
 assertScaffold "${SOURCE_DIR}/composer/Template/RecommendedProject/web"
 
 info "Installing legacy project composer template"
+composer --working-dir="${SOURCE_DIR}/composer/Template/LegacyProject" config repositories.scaffold path '../../Plugin/Scaffold'
 composer --working-dir="${SOURCE_DIR}/composer/Template/LegacyProject" install --no-suggest --no-progress --no-interaction
 info "Legacy project composer template installed successfully."
 assertScaffold "${SOURCE_DIR}/composer/Template/LegacyProject"

Inquired with Greg about that, he pointed out that this is to make the tests pass; those lines set up a "path repository" that causes the code in the patch to be installed instead of what's in Packagist. (Good to test the actual code that's in the patch. ;))

Great!

Committed and pushed to 8.8.x. Thanks!

Oopsie, credit.