rex_list: refactor logic into new getEnabledColumnNames() method (#5825)

redaxo · Sep 29, 2023 · 31929eb · 31929eb
1 parent 74be1b7
commit 31929eb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 30 deletions.
diff --git a/.tools/phpstan/baseline.neon b/.tools/phpstan/baseline.neon
@@ -1930,11 +1930,6 @@ parameters:
 			count: 1
 			path: ../../redaxo/src/core/lib/list.php
 
-		-
-			message: "#^Method rex_list\\:\\:getColumnNames\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: ../../redaxo/src/core/lib/list.php
-
 		-
 			message: "#^Method rex_list\\:\\:getColumnParams\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1

diff --git a/.tools/psalm/baseline.xml b/.tools/psalm/baseline.xml
@@ -4014,15 +4014,6 @@
       <code>$column</code>
       <code>$column</code>
       <code>$columnName</code>
-      <code>$columnName</code>
-      <code>$columnName</code>
-      <code>$columnName</code>
-      <code>$columnName</code>
-      <code>$columnName</code>
-      <code>$columnName</code>
-      <code>$columnName</code>
-      <code>$columnName</code>
-      <code>$columnName</code>
       <code><![CDATA[$column['span'] ?? null]]></code>
       <code><![CDATA[$column['width'] ?? null]]></code>
       <code>$format[0]</code>
@@ -4040,22 +4031,13 @@
       <code>$groupColumns[]</code>
     </MixedArrayAssignment>
     <MixedArrayOffset>
-      <code>$columnFormates[$columnName]</code>
-      <code>$columnFormates[$columnName]</code>
-      <code><![CDATA[$this->customColumns[$columnName]]]></code>
-      <code><![CDATA[$this->customColumns[$columnName]]]></code>
       <code><![CDATA[$this->customColumns[$column]]]></code>
       <code><![CDATA[$this->linkAttributes[$columnName]]]></code>
       <code><![CDATA[$this->linkAttributes[$columnName][$attrName]]]></code>
       <code><![CDATA[$this->linkAttributes[$column]]]></code>
     </MixedArrayOffset>
     <MixedAssignment>
       <code>$column</code>
-      <code>$columnName</code>
-      <code>$columnName</code>
-      <code>$columnName</code>
-      <code>$columnName</code>
-      <code>$columnNames[]</code>
       <code>$columnSortType</code>
       <code>$flatParams[$name]</code>
       <code>$flatParams[$name]</code>

diff --git a/redaxo/src/core/lib/list.php b/redaxo/src/core/lib/list.php
@@ -491,13 +491,28 @@ public function getColumnName($columnIndex, $default = null)
     /**
      * Gibt alle Namen der Spalten als Array zurück.
      *
-     * @return array
+     * @return list<string>
      */
     public function getColumnNames()
     {
         return $this->columnNames;
     }
 
+    /**
+     * @return list<string>
+     */
+    protected function getEnabledColumnNames(): array
+    {
+        $columnNames = [];
+        foreach ($this->getColumnNames() as $columnName) {
+            if (!in_array($columnName, $this->columnDisabled)) {
+                $columnNames[] = $columnName;
+            }
+        }
+
+        return $columnNames;
+    }
+
     /**
      * Setzt ein Label für eine Spalte.
      *
@@ -1149,12 +1164,7 @@ public function get()
 
         // Columns vars
         $columnFormates = [];
-        $columnNames = [];
-        foreach ($this->getColumnNames() as $columnName) {
-            if (!in_array($columnName, $this->columnDisabled)) {
-                $columnNames[] = $columnName;
-            }
-        }
+        $columnNames = $this->getEnabledColumnNames();
 
         // List vars
         $sortColumn = $this->getSortColumn();