diff --git a/composer.json b/composer.json index 7b00ebb866a3cff782b6a48a12bd97ca16e85a09..18fa5270b204e9d0c9f715518fca1ca33d1639f7 100644 --- a/composer.json +++ b/composer.json @@ -58,6 +58,11 @@ "Drupal\\Core\\Composer\\": "core/lib/Drupal/Core/Composer" } }, + "autoload-dev": { + "psr-4": { + "Drupal\\Composer\\": "composer" + } + }, "scripts": { "pre-install-cmd": "Drupal\\Core\\Composer\\Composer::ensureComposerVersion", "pre-update-cmd": "Drupal\\Core\\Composer\\Composer::ensureComposerVersion", diff --git a/core/lib/Drupal/Component/Scaffold/AllowedPackages.php b/composer/Plugin/Scaffold/AllowedPackages.php similarity index 97% rename from core/lib/Drupal/Component/Scaffold/AllowedPackages.php rename to composer/Plugin/Scaffold/AllowedPackages.php index 8d05607078fb5b931c11527bd9f22877d7708d6d..ce34094c2574579579571830b505f5aba534ed81 100644 --- a/core/lib/Drupal/Component/Scaffold/AllowedPackages.php +++ b/composer/Plugin/Scaffold/AllowedPackages.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Component\Scaffold; +namespace Drupal\Composer\Plugin\Scaffold; use Composer\Composer; use Composer\Installer\PackageEvent; @@ -32,7 +32,7 @@ class AllowedPackages implements PostPackageEventListenerInterface { /** * Manager of the options in the top-level composer.json's 'extra' section. * - * @var \Drupal\Component\Scaffold\ManageOptions + * @var \Drupal\Composer\Plugin\Scaffold\ManageOptions */ protected $manageOptions; @@ -50,7 +50,7 @@ class AllowedPackages implements PostPackageEventListenerInterface { * The composer object. * @param \Composer\IO\IOInterface $io * IOInterface to write to. - * @param \Drupal\Component\Scaffold\ManageOptions $manage_options + * @param \Drupal\Composer\Plugin\Scaffold\ManageOptions $manage_options * Manager of the options in the top-level composer.json's 'extra' section. */ public function __construct(Composer $composer, IOInterface $io, ManageOptions $manage_options) { diff --git a/core/lib/Drupal/Component/Scaffold/CommandProvider.php b/composer/Plugin/Scaffold/CommandProvider.php similarity index 88% rename from core/lib/Drupal/Component/Scaffold/CommandProvider.php rename to composer/Plugin/Scaffold/CommandProvider.php index 9ec63b4a0d0783ba15b8d6049b4c1fec432af0b1..b13a48c5ed7479d3a9af838d573b978736cd4ac1 100644 --- a/core/lib/Drupal/Component/Scaffold/CommandProvider.php +++ b/composer/Plugin/Scaffold/CommandProvider.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Component\Scaffold; +namespace Drupal\Composer\Plugin\Scaffold; use Composer\Plugin\Capability\CommandProvider as CommandProviderCapability; diff --git a/core/lib/Drupal/Component/Scaffold/ComposerScaffoldCommand.php b/composer/Plugin/Scaffold/ComposerScaffoldCommand.php similarity index 97% rename from core/lib/Drupal/Component/Scaffold/ComposerScaffoldCommand.php rename to composer/Plugin/Scaffold/ComposerScaffoldCommand.php index ea93e82c79560443feb79490644c71e93b2fb22e..ef4bfc72385ad7e6321fd4d2a489eac58c342efe 100644 --- a/core/lib/Drupal/Component/Scaffold/ComposerScaffoldCommand.php +++ b/composer/Plugin/Scaffold/ComposerScaffoldCommand.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Component\Scaffold; +namespace Drupal\Composer\Plugin\Scaffold; use Composer\Command\BaseCommand; use Symfony\Component\Console\Input\InputInterface; diff --git a/core/lib/Drupal/Component/Scaffold/GenerateAutoloadReferenceFile.php b/composer/Plugin/Scaffold/GenerateAutoloadReferenceFile.php similarity index 93% rename from core/lib/Drupal/Component/Scaffold/GenerateAutoloadReferenceFile.php rename to composer/Plugin/Scaffold/GenerateAutoloadReferenceFile.php index 214163ab0934f4ed91b0312685ea78973936ef8d..9fde8b6c9c0792610a061f2d7fe55ff2734b9e57 100644 --- a/core/lib/Drupal/Component/Scaffold/GenerateAutoloadReferenceFile.php +++ b/composer/Plugin/Scaffold/GenerateAutoloadReferenceFile.php @@ -1,10 +1,10 @@ <?php -namespace Drupal\Component\Scaffold; +namespace Drupal\Composer\Plugin\Scaffold; use Composer\IO\IOInterface; use Composer\Util\Filesystem; -use Drupal\Component\Scaffold\Operations\ScaffoldResult; +use Drupal\Composer\Plugin\Scaffold\Operations\ScaffoldResult; /** * Generates an 'autoload.php' that includes the autoloader created by Composer. @@ -33,7 +33,7 @@ private function __construct() { * @param string $vendor * The path to the vendor directory. * - * @return \Drupal\Component\Scaffold\Operations\ScaffoldResult + * @return \Drupal\Composer\Plugin\Scaffold\Operations\ScaffoldResult * The result of the autoload file generation. */ public static function generateAutoload(IOInterface $io, $package_name, $web_root, $vendor) { @@ -78,7 +78,7 @@ public static function autoloadFileCommitted(IOInterface $io, $package_name, $we * @param string $web_root * The path to the web root. * - * @return \Drupal\Component\Scaffold\ScaffoldFilePath + * @return \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath * Object wrapping the relative and absolute path to the destination file. */ protected static function autoloadPath($package_name, $web_root) { diff --git a/core/lib/Drupal/Component/Scaffold/Git.php b/composer/Plugin/Scaffold/Git.php similarity index 97% rename from core/lib/Drupal/Component/Scaffold/Git.php rename to composer/Plugin/Scaffold/Git.php index 3c9e0fc0732ea92924c12f2f92ef4842011e695c..779b8f034b2013306f29c161433115597cae7f97 100644 --- a/core/lib/Drupal/Component/Scaffold/Git.php +++ b/composer/Plugin/Scaffold/Git.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Component\Scaffold; +namespace Drupal\Composer\Plugin\Scaffold; use Composer\IO\IOInterface; use Composer\Util\ProcessExecutor; diff --git a/core/lib/Drupal/Component/Scaffold/Handler.php b/composer/Plugin/Scaffold/Handler.php similarity index 92% rename from core/lib/Drupal/Component/Scaffold/Handler.php rename to composer/Plugin/Scaffold/Handler.php index 20c6962ca613e4639cbb3b36124d3cd401c90a3d..200fd7b7857aeb5b5a2da110e46986f39c723101 100644 --- a/core/lib/Drupal/Component/Scaffold/Handler.php +++ b/composer/Plugin/Scaffold/Handler.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Component\Scaffold; +namespace Drupal\Composer\Plugin\Scaffold; use Composer\Composer; use Composer\EventDispatcher\EventDispatcher; @@ -9,9 +9,9 @@ use Composer\Package\PackageInterface; use Composer\Plugin\CommandEvent; use Composer\Util\Filesystem; -use Drupal\Component\Scaffold\Operations\OperationData; -use Drupal\Component\Scaffold\Operations\OperationFactory; -use Drupal\Component\Scaffold\Operations\ScaffoldFileCollection; +use Drupal\Composer\Plugin\Scaffold\Operations\OperationData; +use Drupal\Composer\Plugin\Scaffold\Operations\OperationFactory; +use Drupal\Composer\Plugin\Scaffold\Operations\ScaffoldFileCollection; /** * Core class of the plugin. @@ -48,21 +48,21 @@ class Handler { /** * The scaffold options in the top-level composer.json's 'extra' section. * - * @var \Drupal\Component\Scaffold\ManageOptions + * @var \Drupal\Composer\Plugin\Scaffold\ManageOptions */ protected $manageOptions; /** * The manager that keeps track of which packages are allowed to scaffold. * - * @var \Drupal\Component\Scaffold\AllowedPackages + * @var \Drupal\Composer\Plugin\Scaffold\AllowedPackages */ protected $manageAllowedPackages; /** * The list of listeners that are notified after a package event. * - * @var \Drupal\Component\Scaffold\PostPackageEventListenerInterface[] + * @var \Drupal\Composer\Plugin\Scaffold\PostPackageEventListenerInterface[] */ protected $postPackageListeners = []; @@ -120,7 +120,7 @@ public function onPostPackageEvent(PackageEvent $event) { * The package file mappings array keyed by destination path and the values * are operation metadata arrays. * - * @return \Drupal\Component\Scaffold\Operations\OperationInterface[] + * @return \Drupal\Composer\Plugin\Scaffold\Operations\OperationInterface[] * A list of scaffolding operation objects */ protected function createScaffoldOperations(PackageInterface $package, array $package_file_mappings) { @@ -199,7 +199,7 @@ protected function getVendorPath() { * A multidimensional array of file mappings, as returned by * self::getAllowedPackages(). * - * @return \Drupal\Component\Scaffold\Operations\OperationInterface[] + * @return \Drupal\Composer\Plugin\Scaffold\Operations\OperationInterface[] * An array of destination paths => scaffold operation objects. */ protected function getFileMappingsFromPackages(array $allowed_packages) { @@ -216,7 +216,7 @@ protected function getFileMappingsFromPackages(array $allowed_packages) { * @param \Composer\Package\PackageInterface $package * The Composer package from which to get the file mappings. * - * @return \Drupal\Component\Scaffold\Operations\OperationInterface[] + * @return \Drupal\Composer\Plugin\Scaffold\Operations\OperationInterface[] * An array of destination paths => scaffold operation objects. */ protected function getPackageFileMappings(PackageInterface $package) { diff --git a/core/lib/Drupal/Component/Scaffold/Interpolator.php b/composer/Plugin/Scaffold/Interpolator.php similarity index 99% rename from core/lib/Drupal/Component/Scaffold/Interpolator.php rename to composer/Plugin/Scaffold/Interpolator.php index de94427fd9d1dc1270bdad647f2f829dc9b2a8ee..3c8cad839b78a76de56b43966e168175eeae67cb 100644 --- a/core/lib/Drupal/Component/Scaffold/Interpolator.php +++ b/composer/Plugin/Scaffold/Interpolator.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Component\Scaffold; +namespace Drupal\Composer\Plugin\Scaffold; /** * Injects config values from an associative array into a string. diff --git a/core/lib/Drupal/Component/Scaffold/LICENSE.txt b/composer/Plugin/Scaffold/LICENSE.txt similarity index 100% rename from core/lib/Drupal/Component/Scaffold/LICENSE.txt rename to composer/Plugin/Scaffold/LICENSE.txt diff --git a/core/lib/Drupal/Component/Scaffold/ManageGitIgnore.php b/composer/Plugin/Scaffold/ManageGitIgnore.php similarity index 92% rename from core/lib/Drupal/Component/Scaffold/ManageGitIgnore.php rename to composer/Plugin/Scaffold/ManageGitIgnore.php index d0714c9bd190a7666243ec25bc166b751a080c25..17e63e07a41e1cd3ade3847280d4399d1fe93029 100644 --- a/core/lib/Drupal/Component/Scaffold/ManageGitIgnore.php +++ b/composer/Plugin/Scaffold/ManageGitIgnore.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Component\Scaffold; +namespace Drupal\Composer\Plugin\Scaffold; use Composer\IO\IOInterface; @@ -37,10 +37,10 @@ public function __construct(IOInterface $io, $dir) { /** * Manages gitignore files. * - * @param \Drupal\Component\Scaffold\Operations\ScaffoldResult[] $files + * @param \Drupal\Composer\Plugin\Scaffold\Operations\ScaffoldResult[] $files * A list of scaffold results, each of which holds a path and whether * or not that file is managed. - * @param \Drupal\Component\Scaffold\ScaffoldOptions $options + * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldOptions $options * Configuration options from the composer.json extras section. */ public function manageIgnored(array $files, ScaffoldOptions $options) { @@ -72,7 +72,7 @@ public function manageIgnored(array $files, ScaffoldOptions $options) { /** * Determines whether we should manage gitignore files. * - * @param \Drupal\Component\Scaffold\ScaffoldOptions $options + * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldOptions $options * Configuration options from the composer.json extras section. * * @return bool diff --git a/core/lib/Drupal/Component/Scaffold/ManageOptions.php b/composer/Plugin/Scaffold/ManageOptions.php similarity index 90% rename from core/lib/Drupal/Component/Scaffold/ManageOptions.php rename to composer/Plugin/Scaffold/ManageOptions.php index 483de0e72af057df21c3781c4ff52305e82b2602..b9013b6ee1e5c51819f1d467df650db44a08bce1 100644 --- a/core/lib/Drupal/Component/Scaffold/ManageOptions.php +++ b/composer/Plugin/Scaffold/ManageOptions.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Component\Scaffold; +namespace Drupal\Composer\Plugin\Scaffold; use Composer\Composer; use Composer\Package\PackageInterface; @@ -35,7 +35,7 @@ public function __construct(Composer $composer) { /** * Gets the root-level scaffold options for this project. * - * @return \Drupal\Component\Scaffold\ScaffoldOptions + * @return \Drupal\Composer\Plugin\Scaffold\ScaffoldOptions * The scaffold options object. */ public function getOptions() { @@ -48,7 +48,7 @@ public function getOptions() { * @param \Composer\Package\PackageInterface $package * The package to fetch the scaffold options from. * - * @return \Drupal\Component\Scaffold\ScaffoldOptions + * @return \Drupal\Composer\Plugin\Scaffold\ScaffoldOptions * The scaffold options object. */ public function packageOptions(PackageInterface $package) { @@ -63,7 +63,7 @@ public function packageOptions(PackageInterface $package) { * * Note that only the root package may define locations. * - * @return \Drupal\Component\Scaffold\Interpolator + * @return \Drupal\Composer\Plugin\Scaffold\Interpolator * Interpolator that will do replacements in a string using tokens in * 'locations' element. */ diff --git a/core/lib/Drupal/Component/Scaffold/Operations/AppendOp.php b/composer/Plugin/Scaffold/Operations/AppendOp.php similarity index 86% rename from core/lib/Drupal/Component/Scaffold/Operations/AppendOp.php rename to composer/Plugin/Scaffold/Operations/AppendOp.php index 97fbfcb76ad14d5db5597509a5792483ae716615..1a3ecd2d86a965e76130821407b9a1babd50b858 100644 --- a/core/lib/Drupal/Component/Scaffold/Operations/AppendOp.php +++ b/composer/Plugin/Scaffold/Operations/AppendOp.php @@ -1,10 +1,10 @@ <?php -namespace Drupal\Component\Scaffold\Operations; +namespace Drupal\Composer\Plugin\Scaffold\Operations; use Composer\IO\IOInterface; -use Drupal\Component\Scaffold\ScaffoldFilePath; -use Drupal\Component\Scaffold\ScaffoldOptions; +use Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath; +use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions; /** * Scaffold operation to add to the beginning and/or end of a scaffold file. @@ -19,23 +19,23 @@ class AppendOp implements OperationInterface, ConjoinableInterface { /** * Path to the source file to prepend, if any. * - * @var \Drupal\Component\Scaffold\ScaffoldFilePath + * @var \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath */ protected $prepend; /** * Path to the source file to append, if any. * - * @var \Drupal\Component\Scaffold\ScaffoldFilePath + * @var \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath */ protected $append; /** * Constructs an AppendOp. * - * @param \Drupal\Component\Scaffold\ScaffoldFilePath $prepend_path + * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $prepend_path * The relative path to the prepend file. - * @param \Drupal\Component\Scaffold\ScaffoldFilePath $append_path + * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $append_path * The relative path to the append file. */ public function __construct(ScaffoldFilePath $prepend_path = NULL, ScaffoldFilePath $append_path = NULL) { diff --git a/core/lib/Drupal/Component/Scaffold/Operations/ConjoinableInterface.php b/composer/Plugin/Scaffold/Operations/ConjoinableInterface.php similarity index 86% rename from core/lib/Drupal/Component/Scaffold/Operations/ConjoinableInterface.php rename to composer/Plugin/Scaffold/Operations/ConjoinableInterface.php index e7528d24a8ce558077478c96a67e0d0b5cdd76a1..ca8d433971cae263c6139cd4ff5d23495aba59e3 100644 --- a/core/lib/Drupal/Component/Scaffold/Operations/ConjoinableInterface.php +++ b/composer/Plugin/Scaffold/Operations/ConjoinableInterface.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Component\Scaffold\Operations; +namespace Drupal\Composer\Plugin\Scaffold\Operations; /** * Marker interface indicating that operation is conjoinable. diff --git a/core/lib/Drupal/Component/Scaffold/Operations/ConjunctionOp.php b/composer/Plugin/Scaffold/Operations/ConjunctionOp.php similarity index 69% rename from core/lib/Drupal/Component/Scaffold/Operations/ConjunctionOp.php rename to composer/Plugin/Scaffold/Operations/ConjunctionOp.php index a7b035ef981c9a1731626f91bbed9bc3c8f5aa0e..f855e4e4dee83280073209de0e2e1f0aa8037cbf 100644 --- a/core/lib/Drupal/Component/Scaffold/Operations/ConjunctionOp.php +++ b/composer/Plugin/Scaffold/Operations/ConjunctionOp.php @@ -1,10 +1,10 @@ <?php -namespace Drupal\Component\Scaffold\Operations; +namespace Drupal\Composer\Plugin\Scaffold\Operations; use Composer\IO\IOInterface; -use Drupal\Component\Scaffold\ScaffoldFilePath; -use Drupal\Component\Scaffold\ScaffoldOptions; +use Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath; +use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions; /** * Joins two operations on the same file into a single operation. @@ -14,22 +14,22 @@ class ConjunctionOp implements OperationInterface { /** * The first operation. * - * @var \Drupal\Component\Scaffold\Operations\OperationInterface + * @var \Drupal\Composer\Plugin\Scaffold\Operations\OperationInterface */ protected $firstOperation; /** * The second operation. * - * @var \Drupal\Component\Scaffold\Operations\OperationInterface + * @var \Drupal\Composer\Plugin\Scaffold\Operations\OperationInterface */ protected $secondOperation; /** * ConjunctionOp constructor. * - * @param \Drupal\Component\Scaffold\Operations\OperationInterface $first_operation - * @param \Drupal\Component\Scaffold\Operations\OperationInterface $second_operation + * @param \Drupal\Composer\Plugin\Scaffold\Operations\OperationInterface $first_operation + * @param \Drupal\Composer\Plugin\Scaffold\Operations\OperationInterface $second_operation */ public function __construct(OperationInterface $first_operation, OperationInterface $second_operation) { $this->firstOperation = $first_operation; diff --git a/core/lib/Drupal/Component/Scaffold/Operations/OperationData.php b/composer/Plugin/Scaffold/Operations/OperationData.php similarity index 98% rename from core/lib/Drupal/Component/Scaffold/Operations/OperationData.php rename to composer/Plugin/Scaffold/Operations/OperationData.php index c400faa61fa06e815b3ebf2fc771f079ec737946..c98fe2c2ed84618b132941e6bf8ae235093e15b1 100644 --- a/core/lib/Drupal/Component/Scaffold/Operations/OperationData.php +++ b/composer/Plugin/Scaffold/Operations/OperationData.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Component\Scaffold\Operations; +namespace Drupal\Composer\Plugin\Scaffold\Operations; /** * Holds parameter data for operation objects during operation creation only. diff --git a/core/lib/Drupal/Component/Scaffold/Operations/OperationFactory.php b/composer/Plugin/Scaffold/Operations/OperationFactory.php similarity index 93% rename from core/lib/Drupal/Component/Scaffold/Operations/OperationFactory.php rename to composer/Plugin/Scaffold/Operations/OperationFactory.php index b517eda081e8f1d380272cab595493ec2aa1d879..4c0efa046291d884991fa49831a520f039ec35b0 100644 --- a/core/lib/Drupal/Component/Scaffold/Operations/OperationFactory.php +++ b/composer/Plugin/Scaffold/Operations/OperationFactory.php @@ -1,10 +1,10 @@ <?php -namespace Drupal\Component\Scaffold\Operations; +namespace Drupal\Composer\Plugin\Scaffold\Operations; use Composer\Composer; use Composer\Package\PackageInterface; -use Drupal\Component\Scaffold\ScaffoldFilePath; +use Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath; /** * Create Scaffold operation objects based on provided metadata. @@ -38,7 +38,7 @@ public function __construct(Composer $composer) { * @param OperationData $operation_data * The parameter data for this operation object; varies by operation type. * - * @return \Drupal\Component\Scaffold\Operations\OperationInterface + * @return \Drupal\Composer\Plugin\Scaffold\Operations\OperationInterface * The scaffolding operation object (skip, replace, etc.) * * @throws \RuntimeException @@ -69,7 +69,7 @@ public function create(PackageInterface $package, OperationData $operation_data) * @param OperationData $operation_data * The parameter data for this operation object, i.e. the relative 'path'. * - * @return \Drupal\Component\Scaffold\Operations\OperationInterface + * @return \Drupal\Composer\Plugin\Scaffold\Operations\OperationInterface * A scaffold replace operation object. */ protected function createReplaceOp(PackageInterface $package, OperationData $operation_data) { @@ -91,7 +91,7 @@ protected function createReplaceOp(PackageInterface $package, OperationData $ope * @param OperationData $operation_data * The parameter data for this operation object, i.e. the relative 'path'. * - * @return \Drupal\Component\Scaffold\Operations\OperationInterface + * @return \Drupal\Composer\Plugin\Scaffold\Operations\OperationInterface * A scaffold replace operation object. */ protected function createAppendOp(PackageInterface $package, OperationData $operation_data) { diff --git a/core/lib/Drupal/Component/Scaffold/Operations/OperationInterface.php b/composer/Plugin/Scaffold/Operations/OperationInterface.php similarity index 57% rename from core/lib/Drupal/Component/Scaffold/Operations/OperationInterface.php rename to composer/Plugin/Scaffold/Operations/OperationInterface.php index 8fa0cee2be39c2edea27338de6eb2c0601f58306..5c1d4506e8de4034b86819d394b68e788776a9ad 100644 --- a/core/lib/Drupal/Component/Scaffold/Operations/OperationInterface.php +++ b/composer/Plugin/Scaffold/Operations/OperationInterface.php @@ -1,10 +1,10 @@ <?php -namespace Drupal\Component\Scaffold\Operations; +namespace Drupal\Composer\Plugin\Scaffold\Operations; use Composer\IO\IOInterface; -use Drupal\Component\Scaffold\ScaffoldFilePath; -use Drupal\Component\Scaffold\ScaffoldOptions; +use Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath; +use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions; /** * Interface for scaffold operation objects. @@ -14,14 +14,14 @@ interface OperationInterface { /** * Process this scaffold operation. * - * @param \Drupal\Component\Scaffold\ScaffoldFilePath $destination + * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $destination * Scaffold file's destination path. * @param \Composer\IO\IOInterface $io * IOInterface to write to. - * @param \Drupal\Component\Scaffold\ScaffoldOptions $options + * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldOptions $options * Various options that may alter the behavior of the operation. * - * @return \Drupal\Component\Scaffold\Operations\ScaffoldResult + * @return \Drupal\Composer\Plugin\Scaffold\Operations\ScaffoldResult * Result of the scaffolding operation. */ public function process(ScaffoldFilePath $destination, IOInterface $io, ScaffoldOptions $options); diff --git a/core/lib/Drupal/Component/Scaffold/Operations/ReplaceOp.php b/composer/Plugin/Scaffold/Operations/ReplaceOp.php similarity index 85% rename from core/lib/Drupal/Component/Scaffold/Operations/ReplaceOp.php rename to composer/Plugin/Scaffold/Operations/ReplaceOp.php index 450c448bb60c75f4471d63326a6aac9a51eb694c..c2bf71c296a5dc7154e7f42ffed053db2e00298e 100644 --- a/core/lib/Drupal/Component/Scaffold/Operations/ReplaceOp.php +++ b/composer/Plugin/Scaffold/Operations/ReplaceOp.php @@ -1,11 +1,11 @@ <?php -namespace Drupal\Component\Scaffold\Operations; +namespace Drupal\Composer\Plugin\Scaffold\Operations; use Composer\IO\IOInterface; use Composer\Util\Filesystem; -use Drupal\Component\Scaffold\ScaffoldFilePath; -use Drupal\Component\Scaffold\ScaffoldOptions; +use Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath; +use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions; /** * Scaffold operation to copy or symlink from source to destination. @@ -20,7 +20,7 @@ class ReplaceOp implements OperationInterface { /** * The relative path to the source file. * - * @var \Drupal\Component\Scaffold\ScaffoldFilePath + * @var \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath */ protected $source; @@ -34,7 +34,7 @@ class ReplaceOp implements OperationInterface { /** * Constructs a ReplaceOp. * - * @param \Drupal\Component\Scaffold\ScaffoldFilePath $sourcePath + * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $sourcePath * The relative path to the source file. * @param bool $overwrite * Whether to allow this scaffold file to overwrite files already at @@ -72,12 +72,12 @@ public function process(ScaffoldFilePath $destination, IOInterface $io, Scaffold /** * Copies the scaffold file. * - * @param \Drupal\Component\Scaffold\ScaffoldFilePath $destination + * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $destination * Scaffold file to process. * @param \Composer\IO\IOInterface $io * IOInterface to writing to. * - * @return \Drupal\Component\Scaffold\Operations\ScaffoldResult + * @return \Drupal\Composer\Plugin\Scaffold\Operations\ScaffoldResult * The scaffold result. */ protected function copyScaffold(ScaffoldFilePath $destination, IOInterface $io) { @@ -95,12 +95,12 @@ protected function copyScaffold(ScaffoldFilePath $destination, IOInterface $io) /** * Symlinks the scaffold file. * - * @param \Drupal\Component\Scaffold\ScaffoldFilePath $destination + * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $destination * Scaffold file to process. * @param \Composer\IO\IOInterface $io * IOInterface to writing to. * - * @return \Drupal\Component\Scaffold\Operations\ScaffoldResult + * @return \Drupal\Composer\Plugin\Scaffold\Operations\ScaffoldResult * The scaffold result. */ protected function symlinkScaffold(ScaffoldFilePath $destination, IOInterface $io) { diff --git a/core/lib/Drupal/Component/Scaffold/Operations/ScaffoldFileCollection.php b/composer/Plugin/Scaffold/Operations/ScaffoldFileCollection.php similarity index 84% rename from core/lib/Drupal/Component/Scaffold/Operations/ScaffoldFileCollection.php rename to composer/Plugin/Scaffold/Operations/ScaffoldFileCollection.php index 422316d0b1fe4ce397d236dc480fd9d880318a19..ea97cb873446830a4c0a07ab8dc3eb5d2b0a23bf 100644 --- a/core/lib/Drupal/Component/Scaffold/Operations/ScaffoldFileCollection.php +++ b/composer/Plugin/Scaffold/Operations/ScaffoldFileCollection.php @@ -1,12 +1,12 @@ <?php -namespace Drupal\Component\Scaffold\Operations; +namespace Drupal\Composer\Plugin\Scaffold\Operations; use Composer\IO\IOInterface; -use Drupal\Component\Scaffold\Interpolator; -use Drupal\Component\Scaffold\ScaffoldFileInfo; -use Drupal\Component\Scaffold\ScaffoldFilePath; -use Drupal\Component\Scaffold\ScaffoldOptions; +use Drupal\Composer\Plugin\Scaffold\Interpolator; +use Drupal\Composer\Plugin\Scaffold\ScaffoldFileInfo; +use Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath; +use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions; /** * Collection of scaffold files. @@ -20,7 +20,7 @@ class ScaffoldFileCollection implements \IteratorAggregate { * scaffold files provided by that package. Each collection of scaffold files * is keyed by destination path. * - * @var \Drupal\Component\Scaffold\ScaffoldFileInfo[][] + * @var \Drupal\Composer\Plugin\Scaffold\ScaffoldFileInfo[][] */ protected $scaffoldFilesByProject = []; @@ -29,7 +29,7 @@ class ScaffoldFileCollection implements \IteratorAggregate { * * @param array $file_mappings * A multidimensional array of file mappings. - * @param \Drupal\Component\Scaffold\Interpolator $location_replacements + * @param \Drupal\Composer\Plugin\Scaffold\Interpolator $location_replacements * An object with the location mappings (e.g. [web-root]). */ public function __construct(array $file_mappings, Interpolator $location_replacements) { @@ -74,14 +74,14 @@ public function getIterator() { /** * Processes the iterator created by ScaffoldFileCollection::create(). * - * @param \Drupal\Component\Scaffold\Operations\ScaffoldFileCollection $collection + * @param \Drupal\Composer\Plugin\Scaffold\Operations\ScaffoldFileCollection $collection * The iterator to process. * @param \Composer\IO\IOInterface $io * The Composer IO object. - * @param \Drupal\Component\Scaffold\ScaffoldOptions $scaffold_options + * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldOptions $scaffold_options * The scaffold options. * - * @return \Drupal\Component\Scaffold\Operations\ScaffoldResult[] + * @return \Drupal\Composer\Plugin\Scaffold\Operations\ScaffoldResult[] * The results array. */ public static function process(ScaffoldFileCollection $collection, IOInterface $io, ScaffoldOptions $scaffold_options) { diff --git a/core/lib/Drupal/Component/Scaffold/Operations/ScaffoldResult.php b/composer/Plugin/Scaffold/Operations/ScaffoldResult.php similarity index 78% rename from core/lib/Drupal/Component/Scaffold/Operations/ScaffoldResult.php rename to composer/Plugin/Scaffold/Operations/ScaffoldResult.php index b542b1e1a3b37aa196a0912c8b02b1305cde0e3e..3fc1699777a09eae7b7143699e4927aa548abf3e 100644 --- a/core/lib/Drupal/Component/Scaffold/Operations/ScaffoldResult.php +++ b/composer/Plugin/Scaffold/Operations/ScaffoldResult.php @@ -1,8 +1,8 @@ <?php -namespace Drupal\Component\Scaffold\Operations; +namespace Drupal\Composer\Plugin\Scaffold\Operations; -use Drupal\Component\Scaffold\ScaffoldFilePath; +use Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath; /** * Record the result of a scaffold operation. @@ -12,7 +12,7 @@ class ScaffoldResult { /** * The path to the scaffold file that was processed. * - * @var \Drupal\Component\Scaffold\ScaffoldFilePath + * @var \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath */ protected $destination; @@ -26,7 +26,7 @@ class ScaffoldResult { /** * ScaffoldResult constructor. * - * @param \Drupal\Component\Scaffold\ScaffoldFilePath $destination + * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $destination * The path to the scaffold file that was processed. * @param bool $isManaged * (optional) Whether this result is managed. Defaults to FALSE. @@ -49,7 +49,7 @@ public function isManaged() { /** * Gets the destination scaffold file that this result refers to. * - * @return \Drupal\Component\Scaffold\ScaffoldFilePath + * @return \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath * The destination path for the scaffold result. */ public function destination() { diff --git a/core/lib/Drupal/Component/Scaffold/Operations/SkipOp.php b/composer/Plugin/Scaffold/Operations/SkipOp.php similarity index 84% rename from core/lib/Drupal/Component/Scaffold/Operations/SkipOp.php rename to composer/Plugin/Scaffold/Operations/SkipOp.php index 5d88ad870b156b1391ce339655d64b4b3c460327..10b0ec9bbc35ed980f3a64a7591cc63b3f31c43f 100644 --- a/core/lib/Drupal/Component/Scaffold/Operations/SkipOp.php +++ b/composer/Plugin/Scaffold/Operations/SkipOp.php @@ -1,10 +1,10 @@ <?php -namespace Drupal\Component\Scaffold\Operations; +namespace Drupal\Composer\Plugin\Scaffold\Operations; use Composer\IO\IOInterface; -use Drupal\Component\Scaffold\ScaffoldFilePath; -use Drupal\Component\Scaffold\ScaffoldOptions; +use Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath; +use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions; /** * Scaffold operation to skip a scaffold file (do nothing). diff --git a/core/lib/Drupal/Component/Scaffold/Plugin.php b/composer/Plugin/Scaffold/Plugin.php similarity index 92% rename from core/lib/Drupal/Component/Scaffold/Plugin.php rename to composer/Plugin/Scaffold/Plugin.php index 9a4c045a190d182ef6c3fa21d239aba918261f0f..4e22d7e0fb0fa0273196e5ea478fefd2aba52c9b 100644 --- a/core/lib/Drupal/Component/Scaffold/Plugin.php +++ b/composer/Plugin/Scaffold/Plugin.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Component\Scaffold; +namespace Drupal\Composer\Plugin\Scaffold; use Composer\Composer; use Composer\EventDispatcher\EventSubscriberInterface; @@ -14,7 +14,7 @@ use Composer\Plugin\PluginInterface; use Composer\Script\Event; use Composer\Script\ScriptEvents; -use Drupal\Component\Scaffold\CommandProvider as ScaffoldCommandProvider; +use Drupal\Composer\Plugin\Scaffold\CommandProvider as ScaffoldCommandProvider; /** * Composer plugin for handling drupal scaffold. @@ -24,7 +24,7 @@ class Plugin implements PluginInterface, EventSubscriberInterface, Capable { /** * The Composer Scaffold handler. * - * @var \Drupal\Component\Scaffold\Handler + * @var \Drupal\Composer\Plugin\Scaffold\Handler */ protected $handler; diff --git a/core/lib/Drupal/Component/Scaffold/PostPackageEventListenerInterface.php b/composer/Plugin/Scaffold/PostPackageEventListenerInterface.php similarity index 77% rename from core/lib/Drupal/Component/Scaffold/PostPackageEventListenerInterface.php rename to composer/Plugin/Scaffold/PostPackageEventListenerInterface.php index 2285146f27f4673d919bc9c28c4159a84a583be9..702ab0f54ba5f287467358b28008a5c944e1ec1b 100644 --- a/core/lib/Drupal/Component/Scaffold/PostPackageEventListenerInterface.php +++ b/composer/Plugin/Scaffold/PostPackageEventListenerInterface.php @@ -1,13 +1,13 @@ <?php -namespace Drupal\Component\Scaffold; +namespace Drupal\Composer\Plugin\Scaffold; use Composer\Installer\PackageEvent; /** * Interface for post package event listeners. * - * @see \Drupal\Component\Scaffold\Handler::onPostPackageEvent + * @see \Drupal\Composer\Plugin\Scaffold\Handler::onPostPackageEvent */ interface PostPackageEventListenerInterface { diff --git a/core/lib/Drupal/Component/Scaffold/README.md b/composer/Plugin/Scaffold/README.md similarity index 100% rename from core/lib/Drupal/Component/Scaffold/README.md rename to composer/Plugin/Scaffold/README.md diff --git a/core/lib/Drupal/Component/Scaffold/ScaffoldFileInfo.php b/composer/Plugin/Scaffold/ScaffoldFileInfo.php similarity index 81% rename from core/lib/Drupal/Component/Scaffold/ScaffoldFileInfo.php rename to composer/Plugin/Scaffold/ScaffoldFileInfo.php index a085179afe61cacc6f1bb59e8b3a2c0e3a11aa16..95cba8ba2d89ce7e2e802d73b273bd76454292b2 100644 --- a/core/lib/Drupal/Component/Scaffold/ScaffoldFileInfo.php +++ b/composer/Plugin/Scaffold/ScaffoldFileInfo.php @@ -1,9 +1,9 @@ <?php -namespace Drupal\Component\Scaffold; +namespace Drupal\Composer\Plugin\Scaffold; use Composer\IO\IOInterface; -use Drupal\Component\Scaffold\Operations\OperationInterface; +use Drupal\Composer\Plugin\Scaffold\Operations\OperationInterface; /** * Data object that keeps track of one scaffold file. @@ -18,24 +18,24 @@ class ScaffoldFileInfo { /** * The path to the destination. * - * @var \Drupal\Component\Scaffold\ScaffoldFilePath + * @var \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath */ protected $destination; /** * The operation used to create the destination. * - * @var \Drupal\Component\Scaffold\Operations\OperationInterface + * @var \Drupal\Composer\Plugin\Scaffold\Operations\OperationInterface */ protected $op; /** * Constructs a ScaffoldFileInfo object. * - * @param \Drupal\Component\Scaffold\ScaffoldFilePath $destination + * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $destination * The full and relative paths to the destination file and the package * defining it. - * @param \Drupal\Component\Scaffold\Operations\OperationInterface $op + * @param \Drupal\Composer\Plugin\Scaffold\Operations\OperationInterface $op * Operations object that will handle scaffolding operations. */ public function __construct(ScaffoldFilePath $destination, OperationInterface $op) { @@ -46,7 +46,7 @@ public function __construct(ScaffoldFilePath $destination, OperationInterface $o /** * Gets the Scaffold operation. * - * @return \Drupal\Component\Scaffold\Operations\OperationInterface + * @return \Drupal\Composer\Plugin\Scaffold\Operations\OperationInterface * Operations object that handles scaffolding (copy, make symlink, etc). */ public function op() { @@ -66,7 +66,7 @@ public function packageName() { /** * Gets the destination. * - * @return \Drupal\Component\Scaffold\ScaffoldFilePath + * @return \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath * The scaffold path to the destination file. */ public function destination() { @@ -110,11 +110,11 @@ public function interpolate($message, array $extra = [], $default = FALSE) { * * @param \Composer\IO\IOInterface $io * The scaffold file to be processed. - * @param \Drupal\Component\Scaffold\ScaffoldOptions $options + * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldOptions $options * Assorted operational options, e.g. whether the destination should be a * symlink. * - * @return \Drupal\Component\Scaffold\Operations\ScaffoldResult + * @return \Drupal\Composer\Plugin\Scaffold\Operations\ScaffoldResult * The scaffold result. */ public function process(IOInterface $io, ScaffoldOptions $options) { diff --git a/core/lib/Drupal/Component/Scaffold/ScaffoldFilePath.php b/composer/Plugin/Scaffold/ScaffoldFilePath.php similarity index 95% rename from core/lib/Drupal/Component/Scaffold/ScaffoldFilePath.php rename to composer/Plugin/Scaffold/ScaffoldFilePath.php index 8e842a68e1e7ee04165b3151c3309565dc61e36a..b8ecd77dec5cb29e30043542712298aa9d1541ab 100644 --- a/core/lib/Drupal/Component/Scaffold/ScaffoldFilePath.php +++ b/composer/Plugin/Scaffold/ScaffoldFilePath.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Component\Scaffold; +namespace Drupal\Composer\Plugin\Scaffold; /** * Manage the path to a file to scaffold. @@ -138,7 +138,7 @@ public static function sourcePath($package_name, $package_path, $destination, $s * The name of the package defining the destination path. * @param string $destination * The relative path to the destination file being scaffolded. - * @param \Drupal\Component\Scaffold\Interpolator $location_replacements + * @param \Drupal\Composer\Plugin\Scaffold\Interpolator $location_replacements * Interpolator that includes the [web-root] and any other available * placeholder replacements. * @@ -153,7 +153,7 @@ public static function destinationPath($package_name, $destination, Interpolator /** * Adds data about the relative and full path to the provided interpolator. * - * @param \Drupal\Component\Scaffold\Interpolator $interpolator + * @param \Drupal\Composer\Plugin\Scaffold\Interpolator $interpolator * Interpolator to add data to. * @param string $name_prefix * (optional) Prefix to add before -rel-path and -full-path item names. @@ -178,7 +178,7 @@ public function addInterpolationData(Interpolator $interpolator, $name_prefix = * (optional) Prefix to add before -rel-path and -full-path item names. * Defaults to path type provided when constructing this object. * - * @return \Drupal\Component\Scaffold\Interpolator + * @return \Drupal\Composer\Plugin\Scaffold\Interpolator * An interpolator for making string replacements. */ public function getInterpolator($name_prefix = '') { diff --git a/core/lib/Drupal/Component/Scaffold/ScaffoldOptions.php b/composer/Plugin/Scaffold/ScaffoldOptions.php similarity index 99% rename from core/lib/Drupal/Component/Scaffold/ScaffoldOptions.php rename to composer/Plugin/Scaffold/ScaffoldOptions.php index 9d8e2be273e175e378e4d35606ef7250a8610586..0cd792f16191f8647273e7846e19f4c349288ec7 100644 --- a/core/lib/Drupal/Component/Scaffold/ScaffoldOptions.php +++ b/composer/Plugin/Scaffold/ScaffoldOptions.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Component\Scaffold; +namespace Drupal\Composer\Plugin\Scaffold; /** * Per-project options from the 'extras' section of the composer.json file. diff --git a/core/lib/Drupal/Component/Scaffold/TESTING.txt b/composer/Plugin/Scaffold/TESTING.txt similarity index 57% rename from core/lib/Drupal/Component/Scaffold/TESTING.txt rename to composer/Plugin/Scaffold/TESTING.txt index 3186f0f90110114b68ce14ade9eff717c0ea9969..429c3f7a4514e63d70c8d656c32eb6f2dcd0a151 100644 --- a/core/lib/Drupal/Component/Scaffold/TESTING.txt +++ b/composer/Plugin/Scaffold/TESTING.txt @@ -1,9 +1,9 @@ -HOW-TO: Test this Drupal component +HOW-TO: Test this Drupal composer plugin -In order to test this component, you'll need to get the entire Drupal repo and +In order to test this plugin, you'll need to get the entire Drupal repo and run the tests there. -You'll find the tests under core/tests/Drupal/Tests/Component. +You'll find the tests under core/tests/Drupal/Tests/Composer/Plugin. You can get the full Drupal repo here: https://www.drupal.org/project/drupal/git-instructions @@ -11,7 +11,7 @@ https://www.drupal.org/project/drupal/git-instructions You can find more information about running PHPUnit tests with Drupal here: https://www.drupal.org/node/2116263 -Each component in the Drupal\Component namespace has its own annotated test +Each component in the Drupal\Composer\Plugin namespace has its own annotated test group. You can use this group to run only the tests for this component. Like this: diff --git a/core/lib/Drupal/Component/Scaffold/composer.json b/composer/Plugin/Scaffold/composer.json similarity index 83% rename from core/lib/Drupal/Component/Scaffold/composer.json rename to composer/Plugin/Scaffold/composer.json index e826f21d365b4c5609ad1d47e348209f344f7699..3a75947695f86e9f8e2e8f8c191cf7139209491e 100644 --- a/core/lib/Drupal/Component/Scaffold/composer.json +++ b/composer/Plugin/Scaffold/composer.json @@ -11,11 +11,11 @@ }, "autoload": { "psr-4": { - "Drupal\\Component\\Scaffold\\": "" + "Drupal\\Composer\\Plugin\\Scaffold\\": "" } }, "extra": { - "class": "Drupal\\Component\\Scaffold\\Plugin", + "class": "Drupal\\Composer\\Plugin\\Scaffold\\Plugin", "branch-alias": { "dev-master": "1.0.x-dev" } diff --git a/core/tests/Drupal/Tests/Component/Scaffold/AssertUtilsTrait.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php similarity index 93% rename from core/tests/Drupal/Tests/Component/Scaffold/AssertUtilsTrait.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php index 28041c69ff69130433f2a668240e1bd49aba958d..5634f492dd88661284580c4ba52513aae15252af 100644 --- a/core/tests/Drupal/Tests/Component/Scaffold/AssertUtilsTrait.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Tests\Component\Scaffold; +namespace Drupal\Tests\Composer\Plugin\Scaffold; /** * Convenience class for creating fixtures. diff --git a/core/tests/Drupal/Tests/Component/Scaffold/ExecTrait.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/ExecTrait.php similarity index 95% rename from core/tests/Drupal/Tests/Component/Scaffold/ExecTrait.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/ExecTrait.php index 65681d7b6f1ce72030f8a84b3036329fff5ad926..972ac31e7b512014a1632576d926bad54d2ffb7b 100644 --- a/core/tests/Drupal/Tests/Component/Scaffold/ExecTrait.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/ExecTrait.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Tests\Component\Scaffold; +namespace Drupal\Tests\Composer\Plugin\Scaffold; use Symfony\Component\Process\Process; diff --git a/core/tests/Drupal/Tests/Component/Scaffold/Fixtures.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Fixtures.php similarity index 91% rename from core/tests/Drupal/Tests/Component/Scaffold/Fixtures.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Fixtures.php index 5abc1828dab3d49830d18d1eb99bd092ca4e0e91..156a4a0dd58b19625fe84b226b098a11b5bfec67 100644 --- a/core/tests/Drupal/Tests/Component/Scaffold/Fixtures.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Fixtures.php @@ -1,16 +1,16 @@ <?php -namespace Drupal\Tests\Component\Scaffold; +namespace Drupal\Tests\Composer\Plugin\Scaffold; use Composer\Console\Application; use Composer\Factory; use Composer\IO\BufferIO; use Composer\Util\Filesystem; -use Drupal\Component\Scaffold\Handler; -use Drupal\Component\Scaffold\Interpolator; -use Drupal\Component\Scaffold\Operations\AppendOp; -use Drupal\Component\Scaffold\Operations\ReplaceOp; -use Drupal\Component\Scaffold\ScaffoldFilePath; +use Drupal\Composer\Plugin\Scaffold\Handler; +use Drupal\Composer\Plugin\Scaffold\Interpolator; +use Drupal\Composer\Plugin\Scaffold\Operations\AppendOp; +use Drupal\Composer\Plugin\Scaffold\Operations\ReplaceOp; +use Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath; use Symfony\Component\Console\Input\StringInput; use Symfony\Component\Console\Output\BufferedOutput; @@ -93,7 +93,7 @@ public function getOutput() { * Path to the root of this project. */ public function projectRoot() { - return realpath(__DIR__) . '/../../../../../../core/lib/Drupal/Component/Scaffold'; + return realpath(__DIR__) . '/../../../../../../../composer/Plugin/Scaffold'; } /** @@ -151,10 +151,10 @@ public function binFixtureDir($bin_name) { * @param string $source * The name of the asset; path is "assets/$source". * - * @return \Drupal\Component\Scaffold\ScaffoldFilePath + * @return \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath * The full and relative path to the desired asset * - * @see \Drupal\Component\Scaffold\ScaffoldFilePath::sourcePath() + * @see \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath::sourcePath() */ public function sourcePath($project_name, $source) { $package_name = "fixtures/{$project_name}"; @@ -168,10 +168,10 @@ public function sourcePath($project_name, $source) { * * Use in place of ManageOptions::getLocationReplacements(). * - * @return \Drupal\Component\Scaffold\Interpolator + * @return \Drupal\Composer\Plugin\Scaffold\Interpolator * An interpolator with location replacements, including 'web-root'. * - * @see \Drupal\Component\Scaffold\ManageOptions::getLocationReplacements() + * @see \Drupal\Composer\Plugin\Scaffold\ManageOptions::getLocationReplacements() */ public function getLocationReplacements() { $destinationTmpDir = $this->mkTmpDir('location-replacements'); @@ -189,7 +189,7 @@ public function getLocationReplacements() { * @param string $source * The name of the asset; path is "assets/$source". * - * @return \Drupal\Component\Scaffold\Operations\ReplaceOp + * @return \Drupal\Composer\Plugin\Scaffold\Operations\ReplaceOp * A replace operation object. */ public function replaceOp($project_name, $source) { @@ -206,7 +206,7 @@ public function replaceOp($project_name, $source) { * @param string $source * The name of the asset; path is "assets/$source". * - * @return \Drupal\Component\Scaffold\Operations\AppendOp + * @return \Drupal\Composer\Plugin\Scaffold\Operations\AppendOp * An append operation object. */ public function appendOp($project_name, $source) { @@ -223,17 +223,17 @@ public function appendOp($project_name, $source) { * Destination path; should be in the form '[web-root]/robots.txt', where * '[web-root]' is always literally '[web-root]', with any arbitrarily * desired filename following. - * @param \Drupal\Component\Scaffold\Interpolator $interpolator + * @param \Drupal\Composer\Plugin\Scaffold\Interpolator $interpolator * Location replacements. Obtain via Fixtures::getLocationReplacements() * when creating multiple scaffold destinations. * @param string $package_name * (optional) The name of the fixture package that this path came from. * Taken from interpolator if not provided. * - * @return \Drupal\Component\Scaffold\ScaffoldFilePath + * @return \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath * A destination scaffold file backed by temporary storage. * - * @see \Drupal\Component\Scaffold\ScaffoldFilePath::destinationPath() + * @see \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath::destinationPath() */ public function destinationPath($destination, Interpolator $interpolator = NULL, $package_name = NULL) { $interpolator = $interpolator ?: $this->getLocationReplacements(); diff --git a/core/tests/Drupal/Tests/Component/Scaffold/Functional/ComposerHookTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php similarity index 95% rename from core/tests/Drupal/Tests/Component/Scaffold/Functional/ComposerHookTest.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php index 7b5165646fc3fc73edbd7cafb3d0325d0f6ba28a..60cbf0e5110bfd5c63fffce396c0ae5b8eb17129 100644 --- a/core/tests/Drupal/Tests/Component/Scaffold/Functional/ComposerHookTest.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php @@ -1,11 +1,11 @@ <?php -namespace Drupal\Tests\Component\Scaffold\Functional; +namespace Drupal\Tests\Composer\Plugin\Scaffold\Functional; use Composer\Util\Filesystem; -use Drupal\Tests\Component\Scaffold\AssertUtilsTrait; -use Drupal\Tests\Component\Scaffold\ExecTrait; -use Drupal\Tests\Component\Scaffold\Fixtures; +use Drupal\Tests\Composer\Plugin\Scaffold\AssertUtilsTrait; +use Drupal\Tests\Composer\Plugin\Scaffold\ExecTrait; +use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures; use PHPUnit\Framework\TestCase; /** @@ -53,7 +53,7 @@ class ComposerHookTest extends TestCase { /** * The Fixtures object. * - * @var \Drupal\Tests\Component\Scaffold\Fixtures + * @var \Drupal\Tests\Composer\Plugin\Scaffold\Fixtures */ protected $fixtures; diff --git a/core/tests/Drupal/Tests/Component/Scaffold/Functional/ManageGitIgnoreTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ManageGitIgnoreTest.php similarity index 96% rename from core/tests/Drupal/Tests/Component/Scaffold/Functional/ManageGitIgnoreTest.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ManageGitIgnoreTest.php index 9556868e2ad5d74a1324329fa1c57a72ffe7deaf..400f786838f17cf23d489dffa72d7321931e5163 100644 --- a/core/tests/Drupal/Tests/Component/Scaffold/Functional/ManageGitIgnoreTest.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ManageGitIgnoreTest.php @@ -1,11 +1,11 @@ <?php -namespace Drupal\Tests\Component\Scaffold\Functional; +namespace Drupal\Tests\Composer\Plugin\Scaffold\Functional; use Composer\Util\Filesystem; -use Drupal\Tests\Component\Scaffold\Fixtures; -use Drupal\Tests\Component\Scaffold\AssertUtilsTrait; -use Drupal\Tests\Component\Scaffold\ExecTrait; +use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures; +use Drupal\Tests\Composer\Plugin\Scaffold\AssertUtilsTrait; +use Drupal\Tests\Composer\Plugin\Scaffold\ExecTrait; use PHPUnit\Framework\TestCase; /** @@ -48,7 +48,7 @@ class ManageGitIgnoreTest extends TestCase { /** * The Fixtures object. * - * @var \Drupal\Tests\Component\Scaffold\Fixtures + * @var \Drupal\Tests\Composer\Plugin\Scaffold\Fixtures */ protected $fixtures; diff --git a/core/tests/Drupal/Tests/Component/Scaffold/Functional/ScaffoldTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php similarity index 97% rename from core/tests/Drupal/Tests/Component/Scaffold/Functional/ScaffoldTest.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php index 5d837774b5ae5ce3c347dbdd6eb8dbb43817bd33..52bd9f8c1e5b5d7c8f8e75a4da4d667d9fbf947f 100644 --- a/core/tests/Drupal/Tests/Component/Scaffold/Functional/ScaffoldTest.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php @@ -1,11 +1,11 @@ <?php -namespace Drupal\Tests\Component\Scaffold\Functional; +namespace Drupal\Tests\Composer\Plugin\Scaffold\Functional; use Composer\Util\Filesystem; -use Drupal\Tests\Component\Scaffold\AssertUtilsTrait; -use Drupal\Tests\Component\Scaffold\Fixtures; -use Drupal\Tests\Component\Scaffold\ScaffoldTestResult; +use Drupal\Tests\Composer\Plugin\Scaffold\AssertUtilsTrait; +use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures; +use Drupal\Tests\Composer\Plugin\Scaffold\ScaffoldTestResult; use PHPUnit\Framework\TestCase; /** @@ -46,7 +46,7 @@ class ScaffoldTest extends TestCase { /** * The Fixtures object. * - * @var \Drupal\Tests\Component\Scaffold\Fixtures + * @var \Drupal\Tests\Composer\Plugin\Scaffold\Fixtures */ protected $fixtures; diff --git a/core/tests/Drupal/Tests/Component/Scaffold/Integration/AppendOpTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php similarity index 87% rename from core/tests/Drupal/Tests/Component/Scaffold/Integration/AppendOpTest.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php index e381cd59cee7e07e627e99ad15250e4f708f95d5..d5fadedec12ed5b01709883537a5d20b0cfafff0 100644 --- a/core/tests/Drupal/Tests/Component/Scaffold/Integration/AppendOpTest.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php @@ -1,14 +1,14 @@ <?php -namespace Drupal\Tests\Component\Scaffold\Integration; +namespace Drupal\Tests\Composer\Plugin\Scaffold\Integration; -use Drupal\Component\Scaffold\Operations\AppendOp; -use Drupal\Component\Scaffold\ScaffoldOptions; -use Drupal\Tests\Component\Scaffold\Fixtures; +use Drupal\Composer\Plugin\Scaffold\Operations\AppendOp; +use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions; +use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures; use PHPUnit\Framework\TestCase; /** - * @coversDefaultClass \Drupal\Component\Scaffold\Operations\AppendOp + * @coversDefaultClass \Drupal\Composer\Plugin\Scaffold\Operations\AppendOp * * @group Scaffold */ diff --git a/core/tests/Drupal/Tests/Component/Scaffold/Integration/ReplaceOpTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php similarity index 79% rename from core/tests/Drupal/Tests/Component/Scaffold/Integration/ReplaceOpTest.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php index a45d25635e17580cdcdd8b292885d95f72a7b9fb..ee6bb73a8d8ea03ab24ae4e2d90789ed5529b96d 100644 --- a/core/tests/Drupal/Tests/Component/Scaffold/Integration/ReplaceOpTest.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php @@ -1,14 +1,14 @@ <?php -namespace Drupal\Tests\Component\Scaffold\Integration; +namespace Drupal\Tests\Composer\Plugin\Scaffold\Integration; -use Drupal\Component\Scaffold\Operations\ReplaceOp; -use Drupal\Component\Scaffold\ScaffoldOptions; -use Drupal\Tests\Component\Scaffold\Fixtures; +use Drupal\Composer\Plugin\Scaffold\Operations\ReplaceOp; +use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions; +use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures; use PHPUnit\Framework\TestCase; /** - * @coversDefaultClass \Drupal\Component\Scaffold\Operations\ReplaceOp + * @coversDefaultClass \Drupal\Composer\Plugin\Scaffold\Operations\ReplaceOp * * @group Scaffold */ diff --git a/core/tests/Drupal/Tests/Component/Scaffold/Integration/ScaffoldFileCollectionTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ScaffoldFileCollectionTest.php similarity index 87% rename from core/tests/Drupal/Tests/Component/Scaffold/Integration/ScaffoldFileCollectionTest.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ScaffoldFileCollectionTest.php index 2e70872254ec7cc40d3a0bd2bfd48c99d97c998c..b97079886207ac2414141842c47e6157ef249d06 100644 --- a/core/tests/Drupal/Tests/Component/Scaffold/Integration/ScaffoldFileCollectionTest.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ScaffoldFileCollectionTest.php @@ -1,15 +1,15 @@ <?php -namespace Drupal\Tests\Component\Scaffold\Integration; +namespace Drupal\Tests\Composer\Plugin\Scaffold\Integration; use PHPUnit\Framework\TestCase; -use Drupal\Tests\Component\Scaffold\Fixtures; -use Drupal\Component\Scaffold\Operations\ConjunctionOp; -use Drupal\Component\Scaffold\Operations\SkipOp; -use Drupal\Component\Scaffold\Operations\ScaffoldFileCollection; +use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures; +use Drupal\Composer\Plugin\Scaffold\Operations\ConjunctionOp; +use Drupal\Composer\Plugin\Scaffold\Operations\SkipOp; +use Drupal\Composer\Plugin\Scaffold\Operations\ScaffoldFileCollection; /** - * @coversDefaultClass \Drupal\Component\Scaffold\Operations\ScaffoldFileCollection + * @coversDefaultClass \Drupal\Composer\Plugin\Scaffold\Operations\ScaffoldFileCollection * * @group Scaffold */ diff --git a/core/tests/Drupal/Tests/Component/Scaffold/Integration/SkipOpTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php similarity index 74% rename from core/tests/Drupal/Tests/Component/Scaffold/Integration/SkipOpTest.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php index 27e358e6bf24cb80626b21450ee733c3d1780cee..75c07a1f6ef5e4ed68f0f722e791bb28a5e08cd4 100644 --- a/core/tests/Drupal/Tests/Component/Scaffold/Integration/SkipOpTest.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php @@ -1,14 +1,14 @@ <?php -namespace Drupal\Tests\Component\Scaffold\Integration; +namespace Drupal\Tests\Composer\Plugin\Scaffold\Integration; -use Drupal\Component\Scaffold\Operations\SkipOp; -use Drupal\Component\Scaffold\ScaffoldOptions; -use Drupal\Tests\Component\Scaffold\Fixtures; +use Drupal\Composer\Plugin\Scaffold\Operations\SkipOp; +use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions; +use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures; use PHPUnit\Framework\TestCase; /** - * @coversDefaultClass \Drupal\Component\Scaffold\Operations\SkipOp + * @coversDefaultClass \Drupal\Composer\Plugin\Scaffold\Operations\SkipOp * * @group Scaffold */ diff --git a/core/tests/Drupal/Tests/Component/Scaffold/ScaffoldTestResult.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/ScaffoldTestResult.php similarity index 93% rename from core/tests/Drupal/Tests/Component/Scaffold/ScaffoldTestResult.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/ScaffoldTestResult.php index 3841cccb69d590a6dab7978acf167b0195f3a6bd..c68322a2d73d69e75575151d76b8e4234afd2cb3 100644 --- a/core/tests/Drupal/Tests/Component/Scaffold/ScaffoldTestResult.php +++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/ScaffoldTestResult.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\Tests\Component\Scaffold; +namespace Drupal\Tests\Composer\Plugin\Scaffold; /** * Holds result of a scaffold test. diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/README.md b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/README.md similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/README.md rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/README.md diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/composer-hooks-fixture/assets/robots-default.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/composer-hooks-fixture/assets/robots-default.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/composer-hooks-fixture/assets/robots-default.txt rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/composer-hooks-fixture/assets/robots-default.txt diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/composer-hooks-fixture/composer.json.tmpl b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/composer-hooks-fixture/composer.json.tmpl similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/composer-hooks-fixture/composer.json.tmpl rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/composer-hooks-fixture/composer.json.tmpl diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/composer-hooks-nothing-allowed-fixture/assets/robots-default.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/composer-hooks-nothing-allowed-fixture/assets/robots-default.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/composer-hooks-nothing-allowed-fixture/assets/robots-default.txt rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/composer-hooks-nothing-allowed-fixture/assets/robots-default.txt diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/composer-hooks-nothing-allowed-fixture/composer.json.tmpl b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/composer-hooks-nothing-allowed-fixture/composer.json.tmpl similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/composer-hooks-nothing-allowed-fixture/composer.json.tmpl rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/composer-hooks-nothing-allowed-fixture/composer.json.tmpl diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/.csslintrc b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/.csslintrc similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/.csslintrc rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/.csslintrc diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/.editorconfig b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/.editorconfig similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/.editorconfig rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/.editorconfig diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/.eslintignore b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/.eslintignore similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/.eslintignore rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/.eslintignore diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/.eslintrc.json b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/.eslintrc.json similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/.eslintrc.json rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/.eslintrc.json diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/.gitattributes b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/.gitattributes similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/.gitattributes rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/.gitattributes diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/.ht.router.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/.ht.router.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/.ht.router.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/.ht.router.php diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/.htaccess b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/.htaccess similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/.htaccess rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/.htaccess diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/default.services.yml b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/default.services.yml similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/default.services.yml rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/default.services.yml diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/default.settings.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/default.settings.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/default.settings.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/default.settings.php diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/example.settings.local.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/example.settings.local.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/example.settings.local.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/example.settings.local.php diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/example.sites.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/example.sites.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/example.sites.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/example.sites.php diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/index.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/index.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/index.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/index.php diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/robots.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/robots.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/robots.txt rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/robots.txt diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/update.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/update.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/update.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/update.php diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/web.config b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/web.config similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/assets/web.config rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/assets/web.config diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/composer.json b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/composer.json similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-assets-fixture/composer.json rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-assets-fixture/composer.json diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-composer-drupal-project/.gitignore b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-composer-drupal-project/.gitignore similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-composer-drupal-project/.gitignore rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-composer-drupal-project/.gitignore diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-composer-drupal-project/assets/robots-default.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-composer-drupal-project/assets/robots-default.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-composer-drupal-project/assets/robots-default.txt rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-composer-drupal-project/assets/robots-default.txt diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-composer-drupal-project/composer.json.tmpl b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-composer-drupal-project/composer.json.tmpl similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-composer-drupal-project/composer.json.tmpl rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-composer-drupal-project/composer.json.tmpl diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-composer-drupal-project/docroot/.gitignore b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-composer-drupal-project/docroot/.gitignore similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-composer-drupal-project/docroot/.gitignore rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-composer-drupal-project/docroot/.gitignore diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-composer-drupal-project/docroot/README.md b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-composer-drupal-project/docroot/README.md similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-composer-drupal-project/docroot/README.md rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-composer-drupal-project/docroot/README.md diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-composer-drupal-project/docroot/sites/default/README.md b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-composer-drupal-project/docroot/sites/default/README.md similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-composer-drupal-project/docroot/sites/default/README.md rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-composer-drupal-project/docroot/sites/default/README.md diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-core-fixture/composer.json b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-core-fixture/composer.json similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-core-fixture/composer.json rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-core-fixture/composer.json diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-append-to-append/assets/append-to-robots.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-append-to-append/assets/append-to-robots.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-append-to-append/assets/append-to-robots.txt rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-append-to-append/assets/append-to-robots.txt diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-append-to-append/assets/prepend-to-robots.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-append-to-append/assets/prepend-to-robots.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-append-to-append/assets/prepend-to-robots.txt rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-append-to-append/assets/prepend-to-robots.txt diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-append-to-append/composer.json.tmpl b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-append-to-append/composer.json.tmpl similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-append-to-append/composer.json.tmpl rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-append-to-append/composer.json.tmpl diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-missing-scaffold-file/composer.json.tmpl b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-missing-scaffold-file/composer.json.tmpl similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-missing-scaffold-file/composer.json.tmpl rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-missing-scaffold-file/composer.json.tmpl diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-append/assets/append-to-robots.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-append/assets/append-to-robots.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-append/assets/append-to-robots.txt rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-append/assets/append-to-robots.txt diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-append/assets/prepend-to-robots.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-append/assets/prepend-to-robots.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-append/assets/prepend-to-robots.txt rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-append/assets/prepend-to-robots.txt diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-append/composer.json.tmpl b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-append/composer.json.tmpl similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-append/composer.json.tmpl rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-append/composer.json.tmpl diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-overwrite/assets/replacement.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-overwrite/assets/replacement.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-overwrite/assets/replacement.txt rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-overwrite/assets/replacement.txt diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-overwrite/assets/robots-default.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-overwrite/assets/robots-default.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-overwrite/assets/robots-default.txt rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-overwrite/assets/robots-default.txt diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-overwrite/composer.json.tmpl b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-overwrite/composer.json.tmpl similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-overwrite/composer.json.tmpl rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-overwrite/composer.json.tmpl diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-overwrite/keep-me.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-overwrite/keep-me.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-overwrite/keep-me.txt rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-overwrite/keep-me.txt diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-overwrite/replace-me.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-overwrite/replace-me.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal-test-overwrite/replace-me.txt rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal-test-overwrite/replace-me.txt diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal/assets/robots-default.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal/assets/robots-default.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal/assets/robots-default.txt rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal/assets/robots-default.txt diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal/composer.json.tmpl b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal/composer.json.tmpl similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-drupal/composer.json.tmpl rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal/composer.json.tmpl diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-profile/assets/profile.default.services.yml b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-profile/assets/profile.default.services.yml similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-profile/assets/profile.default.services.yml rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-profile/assets/profile.default.services.yml diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-profile/composer.json.tmpl b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-profile/composer.json.tmpl similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/drupal-profile/composer.json.tmpl rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-profile/composer.json.tmpl diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/empty-fixture-allowing-core/composer.json b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/empty-fixture-allowing-core/composer.json similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/empty-fixture-allowing-core/composer.json rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/empty-fixture-allowing-core/composer.json diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/empty-fixture/composer.json b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/empty-fixture/composer.json similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/empty-fixture/composer.json rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/empty-fixture/composer.json diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/packages.json b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/packages.json similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/packages.json rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/packages.json diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/profile-with-append/assets/append-to-robots.txt b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/profile-with-append/assets/append-to-robots.txt similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/profile-with-append/assets/append-to-robots.txt rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/profile-with-append/assets/append-to-robots.txt diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/profile-with-append/composer.json.tmpl b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/profile-with-append/composer.json.tmpl similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/profile-with-append/composer.json.tmpl rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/profile-with-append/composer.json.tmpl diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/project-allowing-empty-fixture/composer.json.tmpl b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/project-allowing-empty-fixture/composer.json.tmpl similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/project-allowing-empty-fixture/composer.json.tmpl rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/project-allowing-empty-fixture/composer.json.tmpl diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/project-with-empty-scaffold-path/composer.json b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/project-with-empty-scaffold-path/composer.json similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/project-with-empty-scaffold-path/composer.json rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/project-with-empty-scaffold-path/composer.json diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/project-with-illegal-dir-scaffold/assets/README.md b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/project-with-illegal-dir-scaffold/assets/README.md similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/project-with-illegal-dir-scaffold/assets/README.md rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/project-with-illegal-dir-scaffold/assets/README.md diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/project-with-illegal-dir-scaffold/composer.json b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/project-with-illegal-dir-scaffold/composer.json similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/project-with-illegal-dir-scaffold/composer.json rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/project-with-illegal-dir-scaffold/composer.json diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/scaffold-override-fixture/assets/override-settings.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/scaffold-override-fixture/assets/override-settings.php similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/scaffold-override-fixture/assets/override-settings.php rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/scaffold-override-fixture/assets/override-settings.php diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/scaffold-override-fixture/composer.json b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/scaffold-override-fixture/composer.json similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/scaffold-override-fixture/composer.json rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/scaffold-override-fixture/composer.json diff --git a/core/tests/Drupal/Tests/Component/Scaffold/fixtures/scripts/disable-git-bin/git b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/scripts/disable-git-bin/git similarity index 100% rename from core/tests/Drupal/Tests/Component/Scaffold/fixtures/scripts/disable-git-bin/git rename to core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/scripts/disable-git-bin/git