Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3477329 by phenaproxima, thejimbirch, b_sharpe: Recipe validation should always treat required modules as installed

merge-requests/8861/head
Alex Pott 2024-10-08 14:50:21 +01:00
parent f9d146518b
commit 81f055eb1c
No known key found for this signature in database
GPG Key ID: BDA67E7EE836E5CE
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/lib/Drupal/Core/Recipe/Recipe.php
View File

@ -383,14 +383,23 @@ final class Recipe {
$configurator = new RecipeConfigurator($recipe_being_validated['recipes'] ?? [], $include_path);
/** @var \Drupal\Core\Extension\ModuleExtensionList $module_list */
$module_list = \Drupal::service('extension.list.module');
// The config provider must either be an already-installed module or theme,
// or an extension being installed by this recipe or a recipe it depends on.
$all_extensions = [
...array_keys(\Drupal::service('extension.list.module')->getAllInstalledInfo()),
...array_keys($module_list->getAllInstalledInfo()),
...array_keys(\Drupal::service('extension.list.theme')->getAllInstalledInfo()),
...$recipe_being_validated['install'] ?? [],
...$configurator->listAllExtensions(),
];
// Explicitly treat required modules as installed, even if Drupal isn't
// installed yet, because we know they WILL be installed.
foreach ($module_list->getAllAvailableInfo() as $name => $info) {
if (!empty($info['required'])) {
$all_extensions[] = $name;
}
}
if (!in_array($config_provider, $all_extensions, TRUE)) {
$context->addViolation('Config actions cannot be applied to %config_name because the %config_provider extension is not installed, and is not installed by this recipe or any of the recipes it depends on.', [

18
core/tests/Drupal/KernelTests/Core/Recipe/RecipeTest.php
View File

@ -8,6 +8,7 @@ use Drupal\Core\Recipe\Recipe;
use Drupal\Core\Recipe\RecipeFileException;
use Drupal\Core\Recipe\RecipePreExistingConfigException;
use Drupal\Core\Recipe\RecipeRunner;
use Drupal\FunctionalTests\Core\Recipe\RecipeTestTrait;
use Drupal\KernelTests\KernelTestBase;
/**
@ -16,6 +17,8 @@ use Drupal\KernelTests\KernelTestBase;
*/
class RecipeTest extends KernelTestBase {
use RecipeTestTrait;
/**
* {@inheritdoc}
*/
@ -80,4 +83,19 @@ class RecipeTest extends KernelTestBase {
$this->assertSame($this->config('text.settings')->get('default_summary_length'), 700);
}
public function testImplicitlyRequiredModule(): void {
$this->disableModules(['user']);
$recipe = $this->createRecipe([
'name' => 'Actions on config from required module',
'config' => [
'actions' => [
'user.role.authenticated' => [
'grantPermission' => 'access administration pages',
],
],
],
]);
$this->assertIsObject($recipe);
}
}