Skip to content

Commit ac7a61b

Browse files
committed
Remove deprecations
1 parent a39cbbf commit ac7a61b

4 files changed

Lines changed: 16 additions & 8 deletions

File tree

src/Event/Listener/FormHandlerResponseListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use SolidWorx\FormHandler\FormRequest;
1717
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
1818
use Symfony\Component\HttpFoundation\Response;
19-
use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
19+
use Symfony\Component\HttpKernel\Event\ViewEvent;
2020
use Symfony\Component\HttpKernel\KernelEvents;
2121

2222
class FormHandlerResponseListener implements EventSubscriberInterface
@@ -34,7 +34,7 @@ public static function getSubscribedEvents(): array
3434
/**
3535
* @throws \Exception
3636
*/
37-
public function onKernelView(GetResponseForControllerResultEvent $event): void
37+
public function onKernelView(ViewEvent $event): void
3838
{
3939
$result = $event->getControllerResult();
4040

src/FormHandler.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,4 +166,12 @@ private function getForm(FormHandlerInterface $handler, Options $options): FormI
166166

167167
return $form;
168168
}
169+
170+
/**
171+
* @return FormHandlerInterface[]
172+
*/
173+
public function getHandlers(): array
174+
{
175+
return $this->handlers;
176+
}
169177
}

tests/Event/Listener/FormHandlerResponseListenerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
use SolidWorx\FormHandler\FormRequest;
1919
use Symfony\Component\HttpFoundation\Request;
2020
use Symfony\Component\HttpFoundation\Response;
21-
use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
21+
use Symfony\Component\HttpKernel\Event\ViewEvent;
2222
use Symfony\Component\HttpKernel\HttpKernelInterface;
2323

2424
class FormHandlerResponseListenerTest extends TestCase
2525
{
2626
public function testControllerNotReturningFormRequest()
2727
{
28-
$event = new GetResponseForControllerResultEvent($this->createMock(HttpKernelInterface::class), Request::createFromGlobals(), HttpKernelInterface::MASTER_REQUEST, new Response());
28+
$event = new ViewEvent($this->createMock(HttpKernelInterface::class), Request::createFromGlobals(), HttpKernelInterface::MASTER_REQUEST, new Response());
2929

3030
$listener = new FormHandlerResponseListener();
3131

@@ -36,7 +36,7 @@ public function testControllerNotReturningFormRequest()
3636

3737
public function testControllerReturningFormRequest()
3838
{
39-
$event = new GetResponseForControllerResultEvent($this->createMock(HttpKernelInterface::class), Request::createFromGlobals(), HttpKernelInterface::MASTER_REQUEST, new FormRequest());
39+
$event = new ViewEvent($this->createMock(HttpKernelInterface::class), Request::createFromGlobals(), HttpKernelInterface::MASTER_REQUEST, new FormRequest());
4040

4141
$listener = new FormHandlerResponseListener();
4242

tests/FormHandlerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function testRegisterFormHandler()
3636
$testHandler = new TestFormHandler();
3737
$formHandler->registerHandler($testHandler);
3838

39-
$this->assertAttributeEquals([TestFormHandler::class => $testHandler], 'handlers', $formHandler);
39+
$this->assertSame([TestFormHandler::class => $testHandler], $formHandler->getHandlers());
4040
}
4141

4242
public function testHandlerFormNotSubmitted()
@@ -91,7 +91,7 @@ public function testHandlerFormSuccess()
9191
$dispatcher = $this->createMock(EventDispatcherInterface::class);
9292
$dispatcher->expects($this->once())
9393
->method('dispatch')
94-
->with(FormHandlerEvents::EVENT_FORM_SUCCESS);
94+
->with($this->anything(), FormHandlerEvents::EVENT_FORM_SUCCESS);
9595

9696
$formHandler = new FormHandler($requestStack, $dispatcher, $factory);
9797
$formHandler->registerHandler(new TestFormHandler());
@@ -125,7 +125,7 @@ public function testHandlerFormFail()
125125
$dispatcher = $this->createMock(EventDispatcherInterface::class);
126126
$dispatcher->expects($this->once())
127127
->method('dispatch')
128-
->with(FormHandlerEvents::EVENT_FORM_FAIL);
128+
->with($this->anything(), FormHandlerEvents::EVENT_FORM_FAIL);
129129

130130
$formHandler = new FormHandler($requestStack, $dispatcher, $factory);
131131
$formHandler->registerHandler(new TestFormHandler());

0 commit comments

Comments
 (0)