rex_list: refactor logic into new getColumnValue() method (#5828)

redaxo · Sep 30, 2023 · 427f734 · 427f734
1 parent d194b34
commit 427f734
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/.tools/phpstan/baseline.neon b/.tools/phpstan/baseline.neon
@@ -1900,11 +1900,6 @@ parameters:
 			count: 1
 			path: ../../redaxo/src/core/lib/list.php
 
-		-
-			message: "#^Method rex_list\\:\\:getColumnFormat\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: ../../redaxo/src/core/lib/list.php
-
 		-
 			message: "#^Method rex_list\\:\\:getColumnLayout\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -1990,11 +1985,6 @@ parameters:
 			count: 1
 			path: ../../redaxo/src/core/lib/list.php
 
-		-
-			message: "#^Property rex_list\\:\\:\\$columnFormates type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: ../../redaxo/src/core/lib/list.php
-
 		-
 			message: "#^Property rex_list\\:\\:\\$columnParams type has no value type specified in iterable type array\\.$#"
 			count: 1

diff --git a/.tools/psalm/baseline.xml b/.tools/psalm/baseline.xml
@@ -4057,7 +4057,6 @@
     <MixedInferredReturnType>
       <code>array</code>
       <code><![CDATA[array<string, string|int>|null]]></code>
-      <code>array|null</code>
       <code>string|null</code>
     </MixedInferredReturnType>
     <MixedOperand>
@@ -4071,8 +4070,6 @@
       <code><![CDATA[$this->linkAttributes]]></code>
     </MixedPropertyTypeCoercion>
     <MixedReturnStatement>
-      <code><![CDATA[$this->columnFormates[$columnName] ?? $default]]></code>
-      <code><![CDATA[$this->columnFormates[$columnName] ?? $default]]></code>
       <code><![CDATA[$this->columnNames[$columnIndex] ?? $default]]></code>
       <code><![CDATA[$this->columnNames[$columnIndex] ?? $default]]></code>
       <code><![CDATA[$this->linkAttributes[$column] ?? $default]]></code>

diff --git a/redaxo/src/core/lib/list.php b/redaxo/src/core/lib/list.php
@@ -86,7 +86,7 @@ class rex_list implements rex_url_provider_interface
     private $columnNames;
     /** @var array<string, string> */
     private $columnLabels;
-    /** @var array<string, array{string, mixed, array}> */
+    /** @var array<string, array{string, mixed, array<mixed>}> */
     private $columnFormates;
     /** @var array<string, array<string|int, mixed>> */
     private $columnOptions;
@@ -513,6 +513,21 @@ protected function getEnabledColumnNames(): array
         return $columnNames;
     }
 
+    /**
+     * @param string $columnName
+     * @param null|array{string, mixed, array<mixed>} $columnFormat
+     * @return string
+     */
+    protected function getColumnValue($columnName, $columnFormat)
+    {
+        return $this->formatValue(
+            $this->getValue($columnName),
+            $columnFormat,
+            !isset($this->customColumns[$columnName]),
+            $columnName,
+        );
+    }
+
     /**
      * Setzt ein Label für eine Spalte.
      *
@@ -559,10 +574,12 @@ public function setColumnFormat($columnName, $formatType, $format = '', array $p
     /**
      * Gibt das Format für eine Spalte zurück.
      *
+     * @template T
+     *
      * @param string $columnName Name der Spalte
-     * @param mixed  $default    Defaultrückgabewert, falls keine Formatierung gesetzt ist
+     * @param T      $default    Defaultrückgabewert, falls keine Formatierung gesetzt ist
      *
-     * @return array|null
+     * @return array{string, mixed, array<mixed>}|T
      */
     public function getColumnFormat($columnName, $default = null)
     {
@@ -1276,9 +1293,10 @@ public function get()
 
                 $s .= '            <tr' . $rowAttributes . ">\n";
                 foreach ($columnNames as $columnName) {
-                    $columnValue = $this->formatValue($this->getValue($columnName), $columnFormates[$columnName], !isset($this->customColumns[$columnName]), $columnName);
+                    $columnFormat = $columnFormates[$columnName];
+                    $columnValue = $this->getColumnValue($columnName, $columnFormat);
 
-                    if (!$this->isCustomFormat($columnFormates[$columnName]) && $this->hasColumnParams($columnName)) {
+                    if (!$this->isCustomFormat($columnFormat) && $this->hasColumnParams($columnName)) {
                         $columnValue = $this->getColumnLink($columnName, $columnValue);
                     }