Merge pull request #16906 from shadowx-jb/formhelper_update_attributes

Formhelper update attributes

src/View/Helper/FormHelper.php

@@ -539,7 +539,6 @@ class FormHelper extends Helper
         return $this->hidden('_csrfToken', [
             'value' => $csrfToken,
             'secure' => static::SECURE_SKIP,
-            'autocomplete' => 'off',
         ]);
     }
 
@@ -608,7 +607,6 @@ class FormHelper extends Helper
             unset($secureAttributes['debugSecurity']);
         }
         $secureAttributes['secure'] = static::SECURE_SKIP;
-        $secureAttributes['autocomplete'] = 'off';
 
         $tokenData = $this->formProtector->buildTokenData(
             $this->_lastAction,

tests/TestCase/View/Helper/FormHelperTest.php

@@ -940,7 +940,6 @@ class FormHelperTest extends TestCase
                 'type' => 'hidden',
                 'name' => '_csrfToken',
                 'value' => 'testKey',
-                'autocomplete' => 'off',
             ]],
             '/div',
         ];
@@ -1026,19 +1025,16 @@ class FormHelperTest extends TestCase
                 'type' => 'hidden',
                 'name' => '_Token[fields]',
                 'value' => $hash,
-                'autocomplete' => 'off',
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[unlocked]',
                 'value' => '',
-                'autocomplete' => 'off',
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[debug]',
                 'value' => $tokenDebug,
-                'autocomplete' => 'off',
             ]],
             '/div',
         ];
@@ -1067,13 +1063,11 @@ class FormHelperTest extends TestCase
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[fields]',
-                'autocomplete' => 'off',
                 'value' => $hash,
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[unlocked]',
-                'autocomplete' => 'off',
                 'value' => '',
             ]],
             '/div',
@@ -1267,19 +1261,16 @@ class FormHelperTest extends TestCase
                 'type' => 'hidden',
                 'name' => '_Token[fields]',
                 'value' => $hash,
-                'autocomplete' => 'off',
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[unlocked]',
-                'autocomplete' => 'off',
                 'value' => '',
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[debug]',
                 'value' => $tokenDebug,
-                'autocomplete' => 'off',
             ]],
             '/div',
         ];
@@ -1330,20 +1321,17 @@ class FormHelperTest extends TestCase
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[fields]',
-                'autocomplete',
                 'value',
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[unlocked]',
                 'value' => 'cancel%7Csave',
-                'autocomplete' => 'off',
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[debug]',
                 'value' => $tokenDebug,
-                'autocomplete' => 'off',
             ]],
             '/div',
         ];
@@ -1473,19 +1461,16 @@ class FormHelperTest extends TestCase
                 'type' => 'hidden',
                 'name' => '_Token[fields]',
                 'value' => $hash,
-                'autocomplete' => 'off',
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[unlocked]',
-                'autocomplete' => 'off',
                 'value' => '',
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[debug]',
                 'value' => $tokenDebug,
-                'autocomplete' => 'off',
             ]],
             '/div',
         ];
@@ -1565,19 +1550,16 @@ class FormHelperTest extends TestCase
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[fields]',
-                'autocomplete' => 'off',
                 'value' => $hash,
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[unlocked]',
-                'autocomplete' => 'off',
                 'value' => 'address%7Cfirst_name',
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[debug]',
-                'autocomplete' => 'off',
                 'value' => $tokenDebug,
             ]],
             '/div',
@@ -1641,20 +1623,17 @@ class FormHelperTest extends TestCase
                 'type' => 'hidden',
                 'name' => '_Token[fields]',
                 'value' => $hash,
-                'autocomplete' => 'off',
                 'data-foo' => 'bar',
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[unlocked]',
                 'value' => 'address%7Cfirst_name',
-                'autocomplete' => 'off',
                 'data-foo' => 'bar',
             ]],
             ['input' => [
                 'type' => 'hidden', 'name' => '_Token[debug]',
                 'value' => $tokenDebug,
-                'autocomplete' => 'off',
                 'data-foo' => 'bar',
             ]],
             '/div',
@@ -1717,20 +1696,17 @@ class FormHelperTest extends TestCase
                 'type' => 'hidden',
                 'name' => '_Token[fields]',
                 'value' => $hash,
-                'autocomplete' => 'off',
                 'data-foo' => 'bar',
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[unlocked]',
                 'value' => 'address%7Cfirst_name',
-                'autocomplete' => 'off',
                 'data-foo' => 'bar',
             ]],
             ['input' => [
                 'type' => 'hidden', 'name' => '_Token[debug]',
                 'value' => $tokenDebug,
-                'autocomplete' => 'off',
                 'data-foo' => 'bar',
             ]],
             '/div',
@@ -1779,14 +1755,12 @@ class FormHelperTest extends TestCase
                 'type' => 'hidden',
                 'name' => '_Token[fields]',
                 'value' => $hash,
-                'autocomplete' => 'off',
                 'data-foo' => 'bar',
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[unlocked]',
                 'value' => 'address%7Cfirst_name',
-                'autocomplete' => 'off',
                 'data-foo' => 'bar',
             ]],
             '/div',
@@ -1835,14 +1809,12 @@ class FormHelperTest extends TestCase
                 'type' => 'hidden',
                 'name' => '_Token[fields]',
                 'value' => $hash,
-                'autocomplete' => 'off',
                 'data-foo' => 'bar',
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[unlocked]',
                 'value' => 'address%7Cfirst_name',
-                'autocomplete' => 'off',
                 'data-foo' => 'bar',
             ]],
             '/div',
@@ -1894,7 +1866,6 @@ class FormHelperTest extends TestCase
                 'type' => 'hidden',
                 'name' => '_csrfToken',
                 'value' => 'testKey',
-                'autocomplete' => 'off',
             ]],
             '/div',
         ];
@@ -2016,18 +1987,15 @@ class FormHelperTest extends TestCase
                 'type' => 'hidden',
                 'name' => '_Token[fields]',
                 'value',
-                'autocomplete',
             ]],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[unlocked]',
                 'value' => '',
-                'autocomplete' => 'off',
             ]],
             ['input' => [
                 'type' => 'hidden', 'name' => '_Token[debug]',
                 'value' => $tokenDebug,
-                'autocomplete' => 'off',
             ]],
             '/div',
         ];
@@ -6649,19 +6617,18 @@ class FormHelperTest extends TestCase
                 'method' => 'post', 'action' => '/posts/delete/1', 'accept-charset' => 'utf-8',
             ],
             ['div' => ['style' => 'display:none;']],
-            ['input' => ['type' => 'hidden', 'name' => '_csrfToken', 'value' => 'testkey', 'autocomplete' => 'off']],
+            ['input' => ['type' => 'hidden', 'name' => '_csrfToken', 'value' => 'testkey']],
             '/div',
             'button' => ['type' => 'submit'],
             'Delete',
             '/button',
             ['div' => ['style' => 'display:none;']],
-            ['input' => ['type' => 'hidden', 'name' => '_Token[fields]', 'value' => 'preg:/[\w\d%]+/', 'autocomplete' => 'off']],
-            ['input' => ['type' => 'hidden', 'name' => '_Token[unlocked]', 'value' => '', 'autocomplete' => 'off']],
+            ['input' => ['type' => 'hidden', 'name' => '_Token[fields]', 'value' => 'preg:/[\w\d%]+/']],
+            ['input' => ['type' => 'hidden', 'name' => '_Token[unlocked]', 'value' => '']],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[debug]',
                 'value' => $tokenDebug,
-                'autocomplete' => 'off',
             ]],
             '/div',
             '/form',
@@ -6870,13 +6837,12 @@ class FormHelperTest extends TestCase
             ['input' => ['type' => 'hidden', 'name' => '_method', 'value' => 'POST']],
             ['input' => ['type' => 'hidden', 'name' => 'id', 'value' => '1']],
             'div' => ['style' => 'display:none;'],
-            ['input' => ['type' => 'hidden', 'name' => '_Token[fields]', 'value' => $hash, 'autocomplete' => 'off']],
-            ['input' => ['type' => 'hidden', 'name' => '_Token[unlocked]', 'value' => '', 'autocomplete' => 'off']],
+            ['input' => ['type' => 'hidden', 'name' => '_Token[fields]', 'value' => $hash]],
+            ['input' => ['type' => 'hidden', 'name' => '_Token[unlocked]', 'value' => '']],
             ['input' => [
                 'type' => 'hidden',
                 'name' => '_Token[debug]',
                 'value' => $tokenDebug,
-                'autocomplete' => 'off',
             ]],
             '/div',
             '/form',
@@ -6939,8 +6905,8 @@ class FormHelperTest extends TestCase
             ['input' => ['type' => 'hidden', 'name' => '_method', 'value' => 'POST']],
             ['input' => ['type' => 'hidden', 'name' => 'id', 'value' => '1']],
             'div' => ['style' => 'display:none;'],
-            ['input' => ['type' => 'hidden', 'name' => '_Token[fields]', 'value' => $hash, 'autocomplete' => 'off']],
-            ['input' => ['type' => 'hidden', 'name' => '_Token[unlocked]', 'value' => '', 'autocomplete' => 'off']],
+            ['input' => ['type' => 'hidden', 'name' => '_Token[fields]', 'value' => $hash]],
+            ['input' => ['type' => 'hidden', 'name' => '_Token[unlocked]', 'value' => '']],
             '/div',
             '/form',
             'a' => ['href' => '#', 'onclick' => 'preg:/document\.post_\w+\.submit\(\); event\.returnValue = false; return false;/'],
@@ -6996,14 +6962,13 @@ class FormHelperTest extends TestCase
                 'name' => 'preg:/post_\w+/', 'style' => 'display:none;',
             ],
             ['input' => ['type' => 'hidden', 'name' => '_method', 'value' => 'POST']],
-            ['input' => ['type' => 'hidden', 'name' => '_csrfToken', 'value' => 'testkey', 'autocomplete' => 'off']],
+            ['input' => ['type' => 'hidden', 'name' => '_csrfToken', 'value' => 'testkey']],
             'div' => ['style' => 'display:none;'],
-            ['input' => ['type' => 'hidden', 'name' => '_Token[fields]', 'value' => 'preg:/[\w\d%]+/', 'autocomplete' => 'off']],
-            ['input' => ['type' => 'hidden', 'name' => '_Token[unlocked]', 'value' => '', 'autocomplete' => 'off']],
+            ['input' => ['type' => 'hidden', 'name' => '_Token[fields]', 'value' => 'preg:/[\w\d%]+/']],
+            ['input' => ['type' => 'hidden', 'name' => '_Token[unlocked]', 'value' => '']],
             ['input' => [
                 'type' => 'hidden', 'name' => '_Token[debug]',
                 'value' => $tokenDebug,
-                'autocomplete' => 'off',
             ]],
             '/div',
             '/form',