ソースを参照

Rename "templateParams" to "templateVars"

ADmad 10 年 前
コミット
7cb6ee2926

+ 4 - 4
src/View/StringTemplate.php

@@ -232,9 +232,9 @@ class StringTemplate
             return null;
         }
 
-        if (isset($data['templateParams'])) {
-            $data += $data['templateParams'];
-            unset($data['templateParams']);
+        if (isset($data['templateVars'])) {
+            $data += $data['templateVars'];
+            unset($data['templateVars']);
         }
         $replace = [];
         foreach ($placeholders as $placeholder) {
@@ -278,7 +278,7 @@ class StringTemplate
             $exclude = [];
         }
 
-        $exclude = ['escape' => true, 'idPrefix' => true, 'templateParams' => true] + array_flip($exclude);
+        $exclude = ['escape' => true, 'idPrefix' => true, 'templateVars' => true] + array_flip($exclude);
         $escape = $options['escape'];
         $attributes = [];
 

+ 2 - 2
src/View/Widget/BasicWidget.php

@@ -66,7 +66,7 @@ class BasicWidget implements WidgetInterface
             'val' => null,
             'type' => 'text',
             'escape' => true,
-            'templateParams' => []
+            'templateVars' => []
         ];
         $data['value'] = $data['val'];
         unset($data['val']);
@@ -74,7 +74,7 @@ class BasicWidget implements WidgetInterface
         return $this->_templates->format('input', [
             'name' => $data['name'],
             'type' => $data['type'],
-            'templateParams' => $data['templateParams'],
+            'templateVars' => $data['templateVars'],
             'attrs' => $this->_templates->formatAttributes(
                 $data,
                 ['name', 'type']

+ 2 - 2
tests/TestCase/View/StringTemplateTest.php

@@ -112,7 +112,7 @@ class StringTemplateTest extends TestCase
 
         $result = $this->template->format('custom', [
             'standard' => 'default',
-            'templateParams' => ['var1' => 'foo']
+            'templateVars' => ['var1' => 'foo']
         ]);
         $this->assertEquals('<custom default v1="foo" v2="" />', $result);
     }
@@ -204,7 +204,7 @@ class StringTemplateTest extends TestCase
             $result
         );
 
-        $attrs = ['name' => 'bruce', 'data-hero' => '<batman>', 'templateParams' => ['foo' => 'bar']];
+        $attrs = ['name' => 'bruce', 'data-hero' => '<batman>', 'templateVars' => ['foo' => 'bar']];
         $result = $this->template->formatAttributes($attrs, ['name']);
         $this->assertEquals(
             ' data-hero="&lt;batman&gt;"',

+ 1 - 1
tests/TestCase/View/Widget/BasicWidgetTest.php

@@ -133,7 +133,7 @@ class BasicWidgetTest extends TestCase
             'type' => 'email',
             'class' => 'form-control',
             'required' => true,
-            'templateParams' => ['help' => 'SOS']
+            'templateVars' => ['help' => 'SOS']
         ];
         $result = $text->render($data, $this->context);
         $expected = [