[5.x] Allow dynamic counter names in increment tag (#11671)

Author: daun

src/Tags/Increment.php

@@ -36,12 +36,24 @@ public function reset()
         return '';
     }
 
-    public function wildcard($tag)
+    public function index()
     {
-        if (! isset(self::$arr[$tag])) {
-            return self::$arr[$tag] = $this->params->get('from', 0);
+        $counter = $this->params->get('counter', null);
+
+        return $this->increment($counter);
+    }
+
+    public function wildcard($counter)
+    {
+        return $this->increment($counter);
+    }
+
+    protected function increment($counter)
+    {
+        if (! isset(self::$arr[$counter])) {
+            return self::$arr[$counter] = $this->params->get('from', 0);
         }
 
-        return self::$arr[$tag] = self::$arr[$tag] + $this->params->get('by', 1);
+        return self::$arr[$counter] = self::$arr[$counter] + $this->params->get('by', 1);
     }
 }

tests/Tags/IncrementTest.php

@@ -11,12 +11,14 @@ class IncrementTest extends TestCase
     protected $data = [
         'data' => [
             [
+                'category' => 'A',
                 'articles' => [
                     ['title' => 'One'],
                     ['title' => 'Two'],
                 ],
             ],
             [
+                'category' => 'B',
                 'articles' => [
                     ['title' => 'Three'],
                     ['title' => 'Four'],
@@ -43,6 +45,19 @@ public function basic_increment_works()
         );
     }
 
+    #[Test]
+    public function increment_with_dynamic_name_works()
+    {
+        $template = <<<'EOT'
+{{ data }}{{ category }}-{{ articles }}{{ increment :counter="category" by="10" }}-{{ /articles }}{{ /data }}
+EOT;
+
+        $this->assertSame(
+            'A-0-10-B-0-10-',
+            $this->tag($template, $this->data)
+        );
+    }
+
     #[Test]
     public function increment_with_starting_value_works()
     {