Merge pull request #170 from villermen/fix/csrf-name-override

Allow override of CSRF name
laminas · Jun 16, 2022 · bfc12a8 · bfc12a8
2 parents d854a56 + ea4b81d
commit bfc12a8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Element/Csrf.php b/src/Element/Csrf.php
@@ -73,7 +73,7 @@ public function getCsrfValidator(): CsrfValidator
     {
         if (null === $this->csrfValidator) {
             $csrfOptions = $this->getCsrfValidatorOptions();
-            $csrfOptions = array_merge($csrfOptions, ['name' => $this->getName()]);
+            $csrfOptions = array_merge(['name' => $this->getName()], $csrfOptions);
             $this->setCsrfValidator(new CsrfValidator($csrfOptions));
             assert(null !== $this->csrfValidator);
         }

diff --git a/test/Element/CsrfTest.php b/test/Element/CsrfTest.php
@@ -83,4 +83,18 @@ public function testSetOptionsTraversable(): void
         $this->assertEquals(777, $validator->getTimeOut());
         $this->assertEquals('MySalt', $validator->getSalt());
     }
+
+    public function testNameOverride(): void
+    {
+        $element = new CsrfElement('foo');
+        $element->setOptions([
+            'csrf_options' => [
+                'name' => 'bar',
+            ],
+        ]);
+        $validator = $element->getCsrfValidator();
+        $this->assertEquals('foo', $element->getName());
+        $this->assertEquals('bar', $validator->getName());
+        $this->assertEquals('Laminas_Validator_Csrf_salt_bar', $validator->getSessionName());
+    }
 }