Merge PR #1525 from @zonky2

stefanheimes · stefanheimes · commit 0b4da8da2897 · 2025-06-04T00:15:03.000+02:00
Fix list of attributes in MM List as CE and Module
diff --git a/src/CoreBundle/Contao/Hooks/AbstractContentElementAndModuleCallback.php b/src/CoreBundle/Contao/Hooks/AbstractContentElementAndModuleCallback.php
@@ -250,7 +250,7 @@ public function editRenderSettingButton(DC_Table $dataContainer)
      *
      * @param DC_Table $objDc The data container calling this method.
      *
-     * @return string[] array of all attributes as colName => human name
+     * @return array<string, array<string, string>> array of all attributes as colName => human name
      *
      * @SuppressWarnings(PHPMD.Superglobals)
      * @SuppressWarnings(PHPMD.CamelCaseVariableName)
diff --git a/src/MetaModel.php b/src/MetaModel.php
@@ -79,6 +79,7 @@ class MetaModel implements IMetaModel
     /**
      * The service container.
      *
+     * @psalm-suppress DeprecatedInterface
      * @var \Closure|IMetaModelsServiceContainer|null
      *
      * @psalm-suppress DeprecatedInterface

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ public function editRenderSettingButton(DC_Table $dataContainer)`
`250`	`250`	`*`
`251`	`251`	`* @param DC_Table $objDc The data container calling this method.`
`252`	`252`	`*`
`253`		`- * @return string[] array of all attributes as colName => human name`
	`253`	`+ * @return array<string, array<string, string>> array of all attributes as colName => human name`
`254`	`254`	`*`
`255`	`255`	`* @SuppressWarnings(PHPMD.Superglobals)`
`256`	`256`	`* @SuppressWarnings(PHPMD.CamelCaseVariableName)`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ class MetaModel implements IMetaModel`
`79`	`79`	`/**`
`80`	`80`	`* The service container.`
`81`	`81`	`*`
	`82`	`+ * @psalm-suppress DeprecatedInterface`
`82`	`83`	`* @var \Closure\|IMetaModelsServiceContainer\|null`
`83`	`84`	`*`
`84`	`85`	`* @psalm-suppress DeprecatedInterface`