Merge pull request #355 from FriendsOfCake/search-form

Use Form::execute() instead of Form::validate().

Author: dereuromark

src/Controller/Component/SearchComponent.php

@@ -104,7 +104,7 @@ public function startup(EventInterface $event): void
 
         $params = (array)$this->getController()->getRequest()->getData();
 
-        if ($form !== null && !$form->validate($params)) {
+        if ($form !== null && !$form->execute($params)) {
             $this->getController()->set('searchForm', $form);
 
             return;

tests/TestCase/Controller/Component/SearchComponentTest.php

@@ -379,7 +379,7 @@ public function testGetWithForm(): void
         $this->assertInstanceOf(SearchForm::class, $this->Controller->viewBuilder()->getVar('searchForm'));
     }
 
-    public function testPostWithFormValidation(): void
+    public function testPostFormValidationFailure(): void
     {
         $request = $this->Controller->getRequest()
             ->withAttribute('params', [
@@ -406,7 +406,45 @@ public function testPostWithFormValidation(): void
                 'minLength' => 'Search query must be at least 3 characters long',
             ],
         ];
-        $this->assertEquals($errors, $form->getErrors());
+        $this->assertSame($errors, $form->getErrors());
+    }
+
+    public function testPostFormValidationSuccess(): void
+    {
+        $request = $this->Controller->getRequest()
+            ->withAttribute('params', [
+                'controller' => 'Posts',
+                'action' => 'index',
+            ])
+            ->withRequestTarget('/Posts')
+            ->withData('q', 'abcd')
+            ->withEnv('REQUEST_METHOD', 'POST');
+
+        $mock = new class extends SearchForm
+        {
+            public static $called = false;
+
+            protected function _execute(array $data = []): bool
+            {
+                static::$called = true;
+
+                return true;
+            }
+        };
+
+        $this->Search->setConfig('formClass', $mock::class);
+
+        $this->Controller->setRequest($request);
+        $event = new Event('Controller.startup', $this->Controller);
+        $this->Search->startup($event);
+
+        $result = $event->getResult();
+        $this->assertInstanceOf(Response::class, $result);
+
+        $this->assertTrue($mock::$called, 'Form execute method was not called');
+
+        // View var is not set as there will be a redirect
+        $this->assertNull($this->Controller->viewBuilder()->getVar('searchForm'));
     }
 
     /**