Issue #3292380 by Spokje, effulgentsia, larowlan, catch: Remove the "replace"... (8c170815) · Commits · project / drupal

composer.lock

+1 −115

Original line number	Diff line number	Diff line
		@@ -441,7 +441,7 @@
		"dist": {
		"type": "path",
		"url": "core",
		"reference": "7a14ac685e89051f02233b6122279d70570eab1a"
		"reference": "e2a0c8f35b82a821f3c5dafbd2c8951f1a86b49c"
		},
		"require": {
		"asm89/stack-cors": "^2.0.2",
		@@ -486,120 +486,6 @@
		"conflict": {
		"drush/drush": "<8.1.10"
		},
		"replace": {
		"drupal/action": "self.version",
		"drupal/automated_cron": "self.version",
		"drupal/ban": "self.version",
		"drupal/bartik": "self.version",
		"drupal/basic_auth": "self.version",
		"drupal/big_pipe": "self.version",
		"drupal/block": "self.version",
		"drupal/block_content": "self.version",
		"drupal/book": "self.version",
		"drupal/breakpoint": "self.version",
		"drupal/ckeditor": "self.version",
		"drupal/ckeditor5": "self.version",
		"drupal/claro": "self.version",
		"drupal/classy": "self.version",
		"drupal/color": "self.version",
		"drupal/comment": "self.version",
		"drupal/config": "self.version",
		"drupal/config_translation": "self.version",
		"drupal/contact": "self.version",
		"drupal/content_moderation": "self.version",
		"drupal/content_translation": "self.version",
		"drupal/contextual": "self.version",
		"drupal/core-annotation": "self.version",
		"drupal/core-assertion": "self.version",
		"drupal/core-bridge": "self.version",
		"drupal/core-class-finder": "self.version",
		"drupal/core-datetime": "self.version",
		"drupal/core-dependency-injection": "self.version",
		"drupal/core-diff": "self.version",
		"drupal/core-discovery": "self.version",
		"drupal/core-event-dispatcher": "self.version",
		"drupal/core-file-cache": "self.version",
		"drupal/core-file-security": "self.version",
		"drupal/core-filesystem": "self.version",
		"drupal/core-front-matter": "self.version",
		"drupal/core-gettext": "self.version",
		"drupal/core-graph": "self.version",
		"drupal/core-http-foundation": "self.version",
		"drupal/core-php-storage": "self.version",
		"drupal/core-plugin": "self.version",
		"drupal/core-proxy-builder": "self.version",
		"drupal/core-render": "self.version",
		"drupal/core-serialization": "self.version",
		"drupal/core-transliteration": "self.version",
		"drupal/core-utility": "self.version",
		"drupal/core-uuid": "self.version",
		"drupal/core-version": "self.version",
		"drupal/datetime": "self.version",
		"drupal/datetime_range": "self.version",
		"drupal/dblog": "self.version",
		"drupal/dynamic_page_cache": "self.version",
		"drupal/editor": "self.version",
		"drupal/field": "self.version",
		"drupal/field_layout": "self.version",
		"drupal/field_ui": "self.version",
		"drupal/file": "self.version",
		"drupal/filter": "self.version",
		"drupal/forum": "self.version",
		"drupal/help": "self.version",
		"drupal/help_topics": "self.version",
		"drupal/history": "self.version",
		"drupal/image": "self.version",
		"drupal/inline_form_errors": "self.version",
		"drupal/jsonapi": "self.version",
		"drupal/language": "self.version",
		"drupal/layout_builder": "self.version",
		"drupal/layout_discovery": "self.version",
		"drupal/link": "self.version",
		"drupal/locale": "self.version",
		"drupal/media": "self.version",
		"drupal/media_library": "self.version",
		"drupal/menu_link_content": "self.version",
		"drupal/menu_ui": "self.version",
		"drupal/migrate": "self.version",
		"drupal/migrate_drupal": "self.version",
		"drupal/migrate_drupal_ui": "self.version",
		"drupal/minimal": "self.version",
		"drupal/mysql": "self.version",
		"drupal/node": "self.version",
		"drupal/olivero": "self.version",
		"drupal/options": "self.version",
		"drupal/page_cache": "self.version",
		"drupal/path": "self.version",
		"drupal/path_alias": "self.version",
		"drupal/pgsql": "self.version",
		"drupal/quickedit": "self.version",
		"drupal/rdf": "self.version",
		"drupal/responsive_image": "self.version",
		"drupal/rest": "self.version",
		"drupal/search": "self.version",
		"drupal/serialization": "self.version",
		"drupal/settings_tray": "self.version",
		"drupal/seven": "self.version",
		"drupal/shortcut": "self.version",
		"drupal/sqlite": "self.version",
		"drupal/standard": "self.version",
		"drupal/stark": "self.version",
		"drupal/statistics": "self.version",
		"drupal/syslog": "self.version",
		"drupal/system": "self.version",
		"drupal/taxonomy": "self.version",
		"drupal/telephone": "self.version",
		"drupal/text": "self.version",
		"drupal/toolbar": "self.version",
		"drupal/tour": "self.version",
		"drupal/tracker": "self.version",
		"drupal/update": "self.version",
		"drupal/user": "self.version",
		"drupal/views": "self.version",
		"drupal/views_ui": "self.version",
		"drupal/workflows": "self.version",
		"drupal/workspaces": "self.version"
		},
		"type": "drupal-core",
		"extra": {
		"drupal-scaffold": {

core/composer.json

+0 −114

Original line number	Diff line number	Diff line
		@@ -46,120 +46,6 @@
		"conflict": {
		"drush/drush": "<8.1.10"
		},
		"replace": {
		"drupal/action": "self.version",
		"drupal/automated_cron": "self.version",
		"drupal/bartik": "self.version",
		"drupal/ban": "self.version",
		"drupal/basic_auth": "self.version",
		"drupal/big_pipe": "self.version",
		"drupal/block": "self.version",
		"drupal/block_content": "self.version",
		"drupal/book": "self.version",
		"drupal/breakpoint": "self.version",
		"drupal/ckeditor": "self.version",
		"drupal/ckeditor5": "self.version",
		"drupal/claro": "self.version",
		"drupal/classy": "self.version",
		"drupal/color": "self.version",
		"drupal/comment": "self.version",
		"drupal/config": "self.version",
		"drupal/config_translation": "self.version",
		"drupal/contact": "self.version",
		"drupal/content_moderation": "self.version",
		"drupal/content_translation": "self.version",
		"drupal/contextual": "self.version",
		"drupal/core-annotation": "self.version",
		"drupal/core-assertion": "self.version",
		"drupal/core-bridge": "self.version",
		"drupal/core-class-finder": "self.version",
		"drupal/core-datetime": "self.version",
		"drupal/core-dependency-injection": "self.version",
		"drupal/core-diff": "self.version",
		"drupal/core-discovery": "self.version",
		"drupal/core-event-dispatcher": "self.version",
		"drupal/core-file-cache": "self.version",
		"drupal/core-file-security": "self.version",
		"drupal/core-filesystem": "self.version",
		"drupal/core-front-matter": "self.version",
		"drupal/core-gettext": "self.version",
		"drupal/core-graph": "self.version",
		"drupal/core-http-foundation": "self.version",
		"drupal/core-php-storage": "self.version",
		"drupal/core-plugin": "self.version",
		"drupal/core-proxy-builder": "self.version",
		"drupal/core-render": "self.version",
		"drupal/core-serialization": "self.version",
		"drupal/core-transliteration": "self.version",
		"drupal/core-utility": "self.version",
		"drupal/core-uuid": "self.version",
		"drupal/core-version": "self.version",
		"drupal/datetime": "self.version",
		"drupal/datetime_range": "self.version",
		"drupal/dblog": "self.version",
		"drupal/dynamic_page_cache": "self.version",
		"drupal/editor": "self.version",
		"drupal/field": "self.version",
		"drupal/field_layout": "self.version",
		"drupal/field_ui": "self.version",
		"drupal/file": "self.version",
		"drupal/filter": "self.version",
		"drupal/forum": "self.version",
		"drupal/help": "self.version",
		"drupal/help_topics": "self.version",
		"drupal/history": "self.version",
		"drupal/image": "self.version",
		"drupal/inline_form_errors": "self.version",
		"drupal/jsonapi": "self.version",
		"drupal/language": "self.version",
		"drupal/layout_builder": "self.version",
		"drupal/layout_discovery": "self.version",
		"drupal/link": "self.version",
		"drupal/locale": "self.version",
		"drupal/minimal": "self.version",
		"drupal/media": "self.version",
		"drupal/media_library": "self.version",
		"drupal/menu_link_content": "self.version",
		"drupal/menu_ui": "self.version",
		"drupal/migrate": "self.version",
		"drupal/migrate_drupal": "self.version",
		"drupal/migrate_drupal_ui": "self.version",
		"drupal/mysql": "self.version",
		"drupal/node": "self.version",
		"drupal/olivero": "self.version",
		"drupal/options": "self.version",
		"drupal/page_cache": "self.version",
		"drupal/path": "self.version",
		"drupal/path_alias": "self.version",
		"drupal/pgsql": "self.version",
		"drupal/quickedit": "self.version",
		"drupal/rdf": "self.version",
		"drupal/responsive_image": "self.version",
		"drupal/rest": "self.version",
		"drupal/search": "self.version",
		"drupal/serialization": "self.version",
		"drupal/settings_tray": "self.version",
		"drupal/seven": "self.version",
		"drupal/shortcut": "self.version",
		"drupal/sqlite": "self.version",
		"drupal/standard": "self.version",
		"drupal/stark": "self.version",
		"drupal/statistics": "self.version",
		"drupal/syslog": "self.version",
		"drupal/system": "self.version",
		"drupal/taxonomy": "self.version",
		"drupal/telephone": "self.version",
		"drupal/text": "self.version",
		"drupal/toolbar": "self.version",
		"drupal/tour": "self.version",
		"drupal/tracker": "self.version",
		"drupal/update": "self.version",
		"drupal/user": "self.version",
		"drupal/views": "self.version",
		"drupal/views_ui": "self.version",
		"drupal/workflows": "self.version",
		"drupal/workspaces": "self.version"
		},
		"minimum-stability": "dev",
		"prefer-stable": true,
		"autoload": {

core/tests/Drupal/Tests/ComposerIntegrationTest.php

+0 −47

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@

		use Drupal\Composer\Plugin\VendorHardening\Config;
		use Drupal\Tests\Composer\ComposerIntegrationTrait;
		use Symfony\Component\Yaml\Yaml;

		/**
		* Tests Composer integration.
		@@ -85,52 +84,6 @@ public function providerTestComposerJson() {
		return $data;
		}

		/**
		* Tests core's composer.json replace section.
		*
		* Verify that all core modules are also listed in the 'replace' section of
		* core's composer.json.
		*/
		public function testAllModulesReplaced() {
		// Assemble a path to core modules.
		$module_path = $this->root . '/core/modules';

		// Grab the 'replace' section of the core composer.json file.
		$json = json_decode(file_get_contents($this->root . '/core/composer.json'));
		$composer_replace_packages = (array) $json->replace;

		// Get a list of all the files in the module path.
		$folders = scandir($module_path);

		// Make sure we only deal with directories that aren't . or ..
		$module_names = [];
		$discard = ['.', '..'];
		foreach ($folders as $file_name) {
		if ((!in_array($file_name, $discard)) && is_dir($module_path . '/' . $file_name)) {
		// Skip any modules marked as hidden.
		$info_yml = $module_path . '/' . $file_name . '/' . $file_name . '.info.yml';
		if (file_exists($info_yml)) {
		$info = Yaml::parseFile($info_yml);
		if (!empty($info['hidden'])) {
		continue;
		}
		}
		$module_names[] = $file_name;
		}
		}
		$this->assertNotEmpty($module_names);

		// Assert that each core module has a corresponding 'replace' in
		// composer.json.
		foreach ($module_names as $module_name) {
		$this->assertArrayHasKey(
		'drupal/' . $module_name,
		$composer_replace_packages,
		'Unable to find ' . $module_name . ' in replace list of composer.json'
		);
		}
		}

		/**
		* Data provider for the scaffold files test for Drupal core.
		*