Merge branch '5.0' into 5

This commit is contained in:
github-actions 2023-10-28 14:22:47 +00:00
commit b834b5964f
2 changed files with 1 additions and 3 deletions

View File

@ -299,7 +299,6 @@ class FixtureContext implements Context
{
$class = $this->convertTypeToClass($type);
// TODO Support more than one record
$fields = $this->convertFields($class, $fieldsTable->getRowsHash());
$fields = $this->prepareFixture($class, $id, $fields);
@ -522,7 +521,6 @@ class FixtureContext implements Context
$yaml = implode("\n ", $yaml);
// Save fixtures into database
// TODO Run prepareAsset() for each File and Folder record
$yamlFixture = new YamlFixture($yaml);
$yamlFixture->writeInto($this->getFixtureFactory());
}

View File

@ -186,7 +186,7 @@ class ModuleSuiteLocator implements Controller
// Resolve variables
$resolvedConfig = $this->container->getParameterBag()->resolveValue($suiteConfig);
return [
'type' => null, // @todo figure out what this is for
'type' => null,
'settings' => $resolvedConfig,
];
}