8000 [FrameworkBundle] Remove ControllerTrait::isFormValid() · symfony/symfony@fd2985c · GitHub
[go: up one dir, main page]
Skip to content

Commit fd2985c

Browse files
lyrixxlyrixx
committed
[FrameworkBundle] Remove ControllerTrait::isFormValid()
1 parent 4ba6397 commit fd2985c

File tree

3 files changed

+0
-138
lines changed

3 files changed

+0
-138
lines changed

‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
CHANGELOG
22
=========
33

4-
4.3.0
5-
-----
6-
7-
* Added `ControllerTrait::isFormValid()`
8-
94
4.2.0
105
-----
116

‎src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -326,28 +326,6 @@ protected function createFormBuilder($data = null, array $options = array()): Fo
326326
return $this->container->get('form.factory')->createBuilder(FormType::class, $data, $options);
327327
}
328328

329-
/**
330-
* Handles request and check form validity.
331-
*
332-
* @final
333-
*/
334-
protected function isFormValid(FormInterface $form, Request $request = null): bool
335-
{
336-
if ($form->isSubmitted()) {
337-
throw new \LogicException('The form is already submitted, use $form->isValid() directly.');
338-
}
339-
340-
if (!$request) {
341-
$request = $this->container->get('request_stack')->getCurrentRequest();
342-
}
343-
344-
if (!$request) {
345-
throw new \LogicException('You must pass a request as second argument because the request stack is empty.');
346-
}
347-
348-
return $form->handleRequest($request)->isSubmitted() && $form->isValid();
349-
}
350-
351329
/**
352330
* Shortcut to return the Doctrine Registry service.
353331
*

‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTraitTest.php

Lines changed: 0 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -517,117 +517,6 @@ public function testCreateFormBuilder()
517517
$this->assertEquals($formBuilder, $controller->createFormBuilder('foo'));
518518
}
519519

520-
/**
521-
* @expectedException \LogicException
522-
* @expectedExceptionMessage The form is already submitted, use $form->isValid() directly.
523-
*/
524-
public function testIsFormValidWhenAlreadySubmitted()
525-
{
526-
$requestStack = new RequestStack();
527-
$requestStack->push($request = new Request());
528-
529-
$container = new Container();
530-
$container->set('request_stack', $requestStack);
531-
532-
$controller = $this->createController();
533-
$controller->setContainer($container);
534-
535-
$form = $this->getMockBuilder('Symfony\Component\Form\FormInterface')->getMock();
536-
$form
537-
->expects($this->once())
538-
->method('isSubmitted')
539-
->willReturn(true)
540-
;
541-
542-
$controller->isFormValid($form);
543-
}
544-
545-
public function testIsFormValidWhenInvalid()
546-
{
547-
$requestStack = new RequestStack();
548-
$requestStack->push($request = new Request());
549-
550-
$container = new Container();
551-
$container->set('request_stack', $requestStack);
552-
553-
$controller = $this->createController();
554-
$controller->setContainer($container);
555-
556-
$form = $this->getMockBuilder('Symfony\Component\Form\FormInterface')->getMock();
557-
$form
558-
->expects($this->at(0))
559-
->method('isSubmitted')
560-
->willReturn(false)
561-
;
562-
$form
563-
->expects($this->once())
564-
->method('handleRequest')
565-
->with($request)
566-
->willReturn($form)
567-
;
568-
$form
569-
->expects($this->at(2))
570-
->method('isSubmitted')
571-
->willReturn(false)
572-
;
573-
574-
$this->assertFalse($controller->isFormValid($form));
575-
}
576-
577-
public function testIsFormValidWhenValid()
578-
{
579-
$requestStack = new RequestStack();
580-
$requestStack->push($request = new Request());
581-
582-
$container = new Container();
583-
$container->set('request_stack', $requestStack);
584-
585-
$controller = $this->createController();
586-
$controller->setContainer($container);
587-
588-
$form = $this->getMockBuilder('Symfony\Component\Form\FormInterface')->getMock();
589-
$form
590-
->expects($this->at(0))
591-
->method('isSubmitted')
592-
->willReturn(false)
593-
;
594-
$form
595-
->expects($this->once())
596-
->method('handleRequest')
597-
->with($request)
598-
->willReturn($form)
599-
;
600-
$form
601-
->expects($this->at(2))
602-
->method('isSubmitted')
603-
->willReturn(true)
604-
;
605-
$form
606-
->expects($this->once())
607-
->method('isValid')
608-
->willReturn(true)
609-
;
610-
611-
$this->assertTrue($controller->isFormValid($form));
612-
}
613-
614-
/**
615-
* @expectedException \LogicException
616-
* @expectedExceptionMessage You must pass a req B1DA uest as second argument because the request stack is empty.
617-
*/
618-
public function testIsFormValidWhenRequestStackIsEmpty()
619-
{
620-
$container = new Container();
621-
$container->set('request_stack', new RequestStack());
622-
623-
$controller = $this->createController();
624-
$controller->setContainer($container);
625-
626-
$form = $this->getMockBuilder('Symfony\Component\Form\FormInterface')->getMock();
627-
628-
$this->assertTrue($controller->isFormValid($form));
629-
}
630-
631520
public function testGetDoctrine()
632521
{
633522
$doctrine = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();

0 commit comments

Comments
 (0)
0