Merge branch '5.0' into 5

silverstripe · Oct 28, 2023 · b834b59 · b834b59
2 parents 2222029 + 86c6c81
commit b834b59
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/Context/FixtureContext.php b/src/Context/FixtureContext.php
@@ -299,7 +299,6 @@ public function stepCreateRecordWithTable($type, $id, TableNode $fieldsTable)
     {
 
         $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 @@ public function stepThereAreTheFollowingRecords($dataObject, PyStringNode $strin
         $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());
     }

diff --git a/src/Controllers/ModuleSuiteLocator.php b/src/Controllers/ModuleSuiteLocator.php
@@ -186,7 +186,7 @@ protected function loadSuiteConfiguration($suite, Module $module)
         // Resolve variables
         $resolvedConfig = $this->container->getParameterBag()->resolveValue($suiteConfig);
         return [
-            'type' => null, // @todo figure out what this is for
+            'type' => null,
             'settings' => $resolvedConfig,
         ];
     }