Skip to content

Commit

Permalink
minor #33349 [Form] fix parameter type declaration and make fabbot ha…
Browse files Browse the repository at this point in the history
…ppy (xabbuh)

This PR was merged into the 3.4 branch.

Discussion
----------

[Form] fix parameter type declaration and make fabbot happy

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Commits
-------

19b2928 fix parameter type declaration and make fabbot happy
  • Loading branch information
fabpot committed Aug 27, 2019
2 parents aa0152e + 19b2928 commit c08b42a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/Symfony/Component/Form/FormInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
* @throws Exception\LogicException when trying to set a parent for a form with
* an empty name
*/
public function setParent(FormInterface $parent = null);
public function setParent(self $parent = null);

/**
* Returns the parent form.
Expand Down
14 changes: 11 additions & 3 deletions src/Symfony/Component/Form/Tests/FormFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@

use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormFactory;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormTypeGuesserChain;
use Symfony\Component\Form\Guess\Guess;
use Symfony\Component\Form\Guess\TypeGuess;
Expand Down Expand Up @@ -194,7 +195,7 @@ public function testCreateUsesBlockPrefixIfTypeGivenAsString()
->method('buildForm')
->with($this->builder, $resolvedOptions);

$form = $this->createMock(FormInterface::class);
$form = $this->createForm();

$this->builder->expects($this->once())
->method('getForm')
Expand Down Expand Up @@ -227,7 +228,7 @@ public function testCreateNamed()
->method('buildForm')
->with($this->builder, $resolvedOptions);

$form = $this->createMock(FormInterface::class);
$form = $this->createForm();

$this->builder->expects($this->once())
->method('getForm')
Expand Down Expand Up @@ -467,6 +468,13 @@ public function testCreateBuilderUsesPatternIfFound()
$this->assertSame($this->builder, $this->builder);
}

protected function createForm()
{
$formBuilder = new FormBuilder('', null, new EventDispatcher(), $this->factory);

return $formBuilder->getForm();
}

private function getMockFactory(array $methods = [])
{
return $this->getMockBuilder('Symfony\Component\Form\FormFactory')
Expand Down

0 comments on commit c08b42a

Please sign in to comment.