diff --git a/core/lib/Drupal/Core/Extension/InfoParserDynamic.php b/core/lib/Drupal/Core/Extension/InfoParserDynamic.php index 484e0062d2..9ba7dfffe3 100644 --- a/core/lib/Drupal/Core/Extension/InfoParserDynamic.php +++ b/core/lib/Drupal/Core/Extension/InfoParserDynamic.php @@ -56,9 +56,8 @@ public function parse($filename) { if (!empty($missing_keys)) { throw new InfoParserException('Missing required keys (' . implode(', ', $missing_keys) . ') in ' . $filename); } - $is_testing_package = isset($parsed_info['package']) && $parsed_info['package'] === 'Testing'; if (!isset($parsed_info['core_version_requirement'])) { - if ($is_testing_package) { + if (isset($parsed_info['package']) && $parsed_info['package'] === 'Testing') { // Modules in the testing package are exempt as well. This makes it // easier for contrib to use test modules. $parsed_info['core_version_requirement'] = \Drupal::VERSION; @@ -85,7 +84,7 @@ public function parse($filename) { // Drupal 8 versions before 8.7.7 then 'core' cannot be set or it will // effectively support all versions of Drupal 8 because // 'core_version_requirement' will be ignored in previous versions. - if (!$is_testing_package && !$supports_pre_core_version_requirement_version && isset($parsed_info['core'])) { + if (!$supports_pre_core_version_requirement_version && isset($parsed_info['core'])) { throw new InfoParserException("The 'core_version_requirement' constraint ({$parsed_info['core_version_requirement']}) requires the 'core' key not be set in " . $filename); } // 'core_version_requirement' can not be used to specify Drupal 8 diff --git a/core/modules/system/tests/modules/database_statement_monitoring_test/database_statement_monitoring_test.info.yml b/core/modules/system/tests/modules/database_statement_monitoring_test/database_statement_monitoring_test.info.yml index 74b03a3b8a..894715d976 100644 --- a/core/modules/system/tests/modules/database_statement_monitoring_test/database_statement_monitoring_test.info.yml +++ b/core/modules/system/tests/modules/database_statement_monitoring_test/database_statement_monitoring_test.info.yml @@ -1,6 +1,5 @@ name: 'Database Statement Monitoring Test' type: module description: 'Support module for Database layer tests that need to monitor executed database statements.' -core: 8.x package: Testing version: VERSION diff --git a/core/modules/system/tests/modules/delay_cache_tags_invalidation/delay_cache_tags_invalidation.info.yml b/core/modules/system/tests/modules/delay_cache_tags_invalidation/delay_cache_tags_invalidation.info.yml index 5fe56c9d55..0777e09ca5 100644 --- a/core/modules/system/tests/modules/delay_cache_tags_invalidation/delay_cache_tags_invalidation.info.yml +++ b/core/modules/system/tests/modules/delay_cache_tags_invalidation/delay_cache_tags_invalidation.info.yml @@ -1,5 +1,4 @@ name: 'Delay Cache Tags Invalidation Test' type: module -core: 8.x package: Testing version: VERSION diff --git a/core/modules/system/tests/themes/test_legacy_stylesheets_remove/test_legacy_stylesheets_remove.info.yml b/core/modules/system/tests/themes/test_legacy_stylesheets_remove/test_legacy_stylesheets_remove.info.yml index 9cf9e1c68d..6cd835e4d5 100644 --- a/core/modules/system/tests/themes/test_legacy_stylesheets_remove/test_legacy_stylesheets_remove.info.yml +++ b/core/modules/system/tests/themes/test_legacy_stylesheets_remove/test_legacy_stylesheets_remove.info.yml @@ -2,7 +2,6 @@ name: 'Theme Legacy Test Stylesheets Remove' type: theme description: 'Test theme using legacy stylesheets-remove.' version: VERSION -core: 8.x base theme: classy package: Testing libraries: { } diff --git a/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.info.yml b/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.info.yml index 0f1331b092..e168af31c7 100644 --- a/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.info.yml +++ b/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.info.yml @@ -2,6 +2,5 @@ name: 'Test legacy theme' type: theme description: 'Test theme to test deprecated functionality.' version: VERSION -core: 8.x package: Testing base theme: test_theme diff --git a/core/modules/views_ui/tests/themes/views_test_classy_subtheme/views_test_classy_subtheme.info.yml b/core/modules/views_ui/tests/themes/views_test_classy_subtheme/views_test_classy_subtheme.info.yml index 8f20d604bd..70b9397b3b 100644 --- a/core/modules/views_ui/tests/themes/views_test_classy_subtheme/views_test_classy_subtheme.info.yml +++ b/core/modules/views_ui/tests/themes/views_test_classy_subtheme/views_test_classy_subtheme.info.yml @@ -2,6 +2,5 @@ name: 'Theme test subtheme' type: theme description: 'Test theme which uses test_basetheme as the base theme.' version: VERSION -core: 8.x base theme: classy package: Testing