Verified Commit 56ced95a authored by godotislate's avatar godotislate
Browse files

task: #3579778 Removed modules should be included as a replace in composer.json 

By: pcambra
By: quietone
By: berdir
By: cmlara
By: dcam
By: smustgrave
By: catch
By: godotislate
By: drumm
By: longwave
parent d5f902b2

composer.lock

+12 −2
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ 
            "dist": {

                "type": "path",

                "url": "core",

                "reference": "738fad58e605901746f56a4a5949de11a3520e2e"

                "reference": "b8a3057150bd59934bfc911a3e7082a5cab672f9"

            },

            "require": {

                "asm89/stack-cors": "^2.3",
@@ -469,6 +469,8 @@ 
                "drush/drush": "<12.4.3"

            },

            "replace": {

                "drupal/ban": "*",

                "drupal/contact": "*",

                "drupal/core-annotation": "self.version",

                "drupal/core-assertion": "self.version",

                "drupal/core-class-finder": "self.version",
@@ -492,7 +494,15 @@ 
                "drupal/core-transliteration": "self.version",

                "drupal/core-utility": "self.version",

                "drupal/core-uuid": "self.version",

                "drupal/core-version": "self.version"

                "drupal/core-version": "self.version",

                "drupal/field_layout": "*",

                "drupal/history": "*",

                "drupal/search": "*",

                "drupal/settings_tray": "*",

                "drupal/shortcut": "*",

                "drupal/stable9": "*",

                "drupal/telephone": "*",

                "drupal/toolbar": "*"

            },

            "suggest": {

                "ext-zip": "Needed to extend the plugin.manager.archiver service capability with the handling of files in the ZIP format."

core/composer.json

+10 −0
Original line number Diff line number Diff line
@@ -53,6 +53,16 @@ 
        "dealerdirect/phpcodesniffer-composer-installer": "1.1.0"

    },

    "replace": {

        "drupal/ban": "*",

        "drupal/contact": "*",

        "drupal/field_layout": "*",

        "drupal/history": "*",

        "drupal/search": "*",

        "drupal/settings_tray": "*",

        "drupal/shortcut": "*",

        "drupal/stable9": "*",

        "drupal/telephone": "*",

        "drupal/toolbar": "*",

        "drupal/core-annotation": "self.version",

        "drupal/core-assertion": "self.version",

        "drupal/core-class-finder": "self.version",

core/tests/Drupal/Tests/ComposerIntegrationTest.php

+6 −1
Original line number Diff line number Diff line
@@ -101,6 +101,11 @@ public function testAllCoreComponentsReplaced(): void { 
    $json = json_decode(file_get_contents($this->root . '/core/composer.json'), FALSE);

    $composer_replace_packages = (array) $json->replace;



    // Filter out extensions removed from core.

    $composer_replace_packages_core = array_filter($composer_replace_packages, function ($k) {

      return (str_contains($k, "drupal/core"));

    }, ARRAY_FILTER_USE_KEY);



    // Get a list of all the composer.json files in the components path.

    $components_composer_json_files = [];
@@ -114,7 +119,7 @@ public function testAllCoreComponentsReplaced(): void { 
    }



    $this->assertNotEmpty($components_composer_json_files);

    $this->assertCount(count($composer_replace_packages), $components_composer_json_files);

    $this->assertCount(count($composer_replace_packages_core), $components_composer_json_files);



    // Assert that each core components has a corresponding 'replace' in

    // composer.json.