diff --git a/composer/Metapackage/Generator/Builder/DrupalPinnedDevDependenciesBuilder.php b/composer/Metapackage/Generator/Builder/DrupalPinnedDevDependenciesBuilder.php index 0fa676a003..75d326fcdb 100644 --- a/composer/Metapackage/Generator/Builder/DrupalPinnedDevDependenciesBuilder.php +++ b/composer/Metapackage/Generator/Builder/DrupalPinnedDevDependenciesBuilder.php @@ -14,7 +14,6 @@ public function getPath() { return 'PinnedDevDependencies'; } - /** * {@inheritdoc} */ diff --git a/composer/Metapackage/Generator/PackageGenerator.php b/composer/Metapackage/Generator/PackageGenerator.php index 55b4403bce..63c098faec 100644 --- a/composer/Metapackage/Generator/PackageGenerator.php +++ b/composer/Metapackage/Generator/PackageGenerator.php @@ -92,11 +92,11 @@ protected function generateMetapackage(IOInterface $io, BuilderInterface $builde $original_composer_json = file_exists($composer_json_path) ? file_get_contents($composer_json_path) : ''; // Get the composer.json file from the builder. - $composer_json_data = $builder->getPackage(json_decode($original_composer_json,TRUE)); + $composer_json_data = $builder->getPackage(json_decode($original_composer_json, TRUE)); $updated_composer_json = json_encode($composer_json_data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n"; // Exit early if nothing changed. - if (trim($original_composer_json, " \t\r\0\x0B") == trim($updated_composer_json," \t\r\0\x0B")) { + if (trim($original_composer_json, " \t\r\0\x0B") == trim($updated_composer_json, " \t\r\0\x0B")) { return FALSE; } diff --git a/composer/Metapackage/Generator/Util/DrupalCoreComposer.php b/composer/Metapackage/Generator/Util/DrupalCoreComposer.php index 6f3eebf30c..030f5389fd 100644 --- a/composer/Metapackage/Generator/Util/DrupalCoreComposer.php +++ b/composer/Metapackage/Generator/Util/DrupalCoreComposer.php @@ -54,7 +54,6 @@ public function composerLock() { return $this->jsonData('composer.lock'); } - /** * Load the json data from the specified path. * diff --git a/core/tests/Drupal/Tests/Composer/Metapackage/BuilderTest.php b/core/tests/Drupal/Tests/Composer/Metapackage/BuilderTest.php index f4860dabb9..ab1522b2cd 100644 --- a/core/tests/Drupal/Tests/Composer/Metapackage/BuilderTest.php +++ b/core/tests/Drupal/Tests/Composer/Metapackage/BuilderTest.php @@ -5,7 +5,6 @@ use Drupal\Composer\Metapackage\Generator\Builder\DrupalCoreRecommendedBuilder; use Drupal\Composer\Metapackage\Generator\Builder\DrupalDevDependenciesBuilder; use Drupal\Composer\Metapackage\Generator\Builder\DrupalPinnedDevDependenciesBuilder; -use Drupal\Composer\Metapackage\Generator\Util\DrupalCoreComposer; use PHPUnit\Framework\TestCase; /** @@ -13,8 +12,7 @@ * * @group Metapackage */ -class BuilderTest extends TestCase -{ +class BuilderTest extends TestCase { /** * Test data for testBuilder diff --git a/core/tests/Drupal/Tests/Composer/Metapackage/Fixtures.php b/core/tests/Drupal/Tests/Composer/Metapackage/Fixtures.php index f38055dcf7..648472d736 100644 --- a/core/tests/Drupal/Tests/Composer/Metapackage/Fixtures.php +++ b/core/tests/Drupal/Tests/Composer/Metapackage/Fixtures.php @@ -39,6 +39,7 @@ public function projectPath($project_name = 'Drupal') { public function drupalCoreComposerFixture($project_name = 'Drupal') { return new DrupalCoreComposer($this->projectPath($project_name)); } + public function drupalCoreMetapackageFixture($metapackage_name = 'CoreRecommended') { return json_decode(file_get_contents($this->projectPath('Metapackage') . '/' . $metapackage_name . '/composer.json'), TRUE); diff --git a/core/tests/Drupal/Tests/Composer/Metapackage/fixtures/Metapackage/CoreRecommended/composer.json b/core/tests/Drupal/Tests/Composer/Metapackage/fixtures/Metapackage/CoreRecommended/composer.json index 63ef641cf1..b6f9298b8a 100644 --- a/core/tests/Drupal/Tests/Composer/Metapackage/fixtures/Metapackage/CoreRecommended/composer.json +++ b/core/tests/Drupal/Tests/Composer/Metapackage/fixtures/Metapackage/CoreRecommended/composer.json @@ -7,5 +7,6 @@ "webflo/drupal-core-strict": "*" }, "require": { + "vendor/package": "*" } } diff --git a/core/tests/Drupal/Tests/Composer/Metapackage/fixtures/Metapackage/DevDependencies/composer.json b/core/tests/Drupal/Tests/Composer/Metapackage/fixtures/Metapackage/DevDependencies/composer.json index e50bb4510e..d218e43471 100644 --- a/core/tests/Drupal/Tests/Composer/Metapackage/fixtures/Metapackage/DevDependencies/composer.json +++ b/core/tests/Drupal/Tests/Composer/Metapackage/fixtures/Metapackage/DevDependencies/composer.json @@ -7,5 +7,6 @@ "webflo/drupal-core-require-dev": "*" }, "require": { + "vendor/package": "*" } } diff --git a/core/tests/Drupal/Tests/Composer/Metapackage/fixtures/Metapackage/PinnedDevDependencies/composer.json b/core/tests/Drupal/Tests/Composer/Metapackage/fixtures/Metapackage/PinnedDevDependencies/composer.json index 0837d352cc..da51ed8484 100644 --- a/core/tests/Drupal/Tests/Composer/Metapackage/fixtures/Metapackage/PinnedDevDependencies/composer.json +++ b/core/tests/Drupal/Tests/Composer/Metapackage/fixtures/Metapackage/PinnedDevDependencies/composer.json @@ -7,5 +7,6 @@ "webflo/drupal-core-require-dev": "*" }, "require": { + "vendor/package": "*" } }