Fragment: Dynamische Properties vermeiden (#5226)

redaxo · Jul 18, 2022 · 52fe0ac · 52fe0ac
1 parent bf61215
commit 52fe0ac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 44 deletions.
diff --git a/.tools/psalm/baseline.xml b/.tools/psalm/baseline.xml
@@ -3921,39 +3921,6 @@
       <code>$this-&gt;getVar('toc')</code>
     </MixedArgument>
   </file>
-  <file src="redaxo/src/core/fragments/core/page/grid.php">
-    <MixedArgument occurrences="2">
-      <code>$content</code>
-      <code>$this-&gt;content</code>
-    </MixedArgument>
-    <MixedArrayAccess occurrences="3">
-      <code>$this-&gt;classes[$key]</code>
-      <code>$this-&gt;classes[$key]</code>
-      <code>$this-&gt;classes[$key]</code>
-    </MixedArrayAccess>
-    <MixedArrayOffset occurrences="3">
-      <code>$this-&gt;classes[$key]</code>
-      <code>$this-&gt;classes[$key]</code>
-      <code>$this-&gt;classes[$key]</code>
-    </MixedArrayOffset>
-    <MixedAssignment occurrences="7">
-      <code>$content</code>
-      <code>$content</code>
-      <code>$content</code>
-      <code>$content</code>
-      <code>$key</code>
-      <code>$key</code>
-      <code>$key</code>
-    </MixedAssignment>
-    <MixedOperand occurrences="6">
-      <code>$content</code>
-      <code>$content</code>
-      <code>$content</code>
-      <code>$this-&gt;classes[$key] ?? 'col-md-4'</code>
-      <code>$this-&gt;classes[$key] ?? 'col-md-6'</code>
-      <code>$this-&gt;classes[$key] ?? 'col-sm-6 col-md-3'</code>
-    </MixedOperand>
-  </file>
   <file src="redaxo/src/core/fragments/core/page/header.php">
     <MixedArgument occurrences="3">
       <code>$this-&gt;heading</code>

diff --git a/redaxo/src/core/fragments/core/page/grid.php b/redaxo/src/core/fragments/core/page/grid.php
@@ -6,18 +6,19 @@
 ?>
 <?php
 
-$this->content = is_string($this->content) ? [$this->content] : $this->content;
+/** @var array<int, string> $contents */
+$contents = is_string($this->content) ? [$this->content] : $this->content;
+$count = count($contents);
 
-$count = count($this->content);
-
-$this->classes = isset($this->classes) && (is_array($this->classes) && count($this->classes) == $count) ? $this->classes : [];
+/** @var array<int, string> $classes */
+$classes = isset($this->classes) && (is_array($this->classes) && count($this->classes) == $count) ? $this->classes : [];
 
 switch ($count) {
     case '4':
         echo '<div class="row">';
 
-        foreach ($this->content as $key => $content) {
-            echo '<div class="' . ($this->classes[$key] ?? 'col-sm-6 col-md-3') . '">' . $content . '</div>';
+        foreach ($contents as $key => $content) {
+            echo '<div class="' . ($classes[$key] ?? 'col-sm-6 col-md-3') . '">' . $content . '</div>';
         }
 
         echo '</div>';
@@ -27,8 +28,8 @@
     case '3':
         echo '<div class="row">';
 
-        foreach ($this->content as $key => $content) {
-            echo '<div class="' . ($this->classes[$key] ?? 'col-md-4') . '">' . $content . '</div>';
+        foreach ($contents as $key => $content) {
+            echo '<div class="' . ($classes[$key] ?? 'col-md-4') . '">' . $content . '</div>';
         }
 
         echo '</div>';
@@ -38,16 +39,16 @@
     case '2':
         echo '<div class="row">';
 
-        foreach ($this->content as $key => $content) {
-            echo '<div class="' . ($this->classes[$key] ?? 'col-md-6') . '">' . $content . '</div>';
+        foreach ($contents as $key => $content) {
+            echo '<div class="' . ($classes[$key] ?? 'col-md-6') . '">' . $content . '</div>';
         }
 
         echo '</div>';
 
         break;
 
     default:
-        foreach ($this->content as $content) {
+        foreach ($contents as $content) {
             echo $content;
         }