-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
Remove Validator\TypeTestCase and add validator logic to base TypeTestCase #21960
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
777107d
Remove Validator\TypeTestCase and add validator logic to base TypeTes…
pierredup 06b4b83
Keep class references consistent
pierredup 6180189
Add ValidatorExtensionTrait to register validation extension for form…
pierredup 9374094
Add ValidatorExtensionTrait to FormTypeValidatorExtensionTest
pierredup f74a53c
Add ValidatorExtensionTrait to SubmitTypeValidatorExtensionTest
pierredup b887c3c
Fixed CS
pierredup 45e518a
Add tearDownAfterClass method to clear validator property
pierredup c6ae491
Change tearDownAfterClass to tearDown in TypeTestCase
pierredup File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
40 changes: 40 additions & 0 deletions
40
src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) Fabien Potencier <fabien@symfony.com> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
namespace Symfony\Component\Form\Test\Traits; | ||
|
||
use Symfony\Component\Form\Extension\Validator\ValidatorExtension; | ||
use Symfony\Component\Form\Test\TypeTestCase; | ||
use Symfony\Component\Validator\Mapping\ClassMetadata; | ||
use Symfony\Component\Validator\Validator\ValidatorInterface; | ||
|
||
trait ValidatorExtensionTrait | ||
{ | ||
protected $validator; | ||
|
||
protected function getValidatorExtension() | ||
{ | ||
if (!interface_exists(ValidatorInterface::class)) { | ||
throw new \Exception('In order to use the "ValidatorExtensionTrait", the symfony/validator component must be installed'); | ||
} | ||
|
||
if (!$this instanceof TypeTestCase) { | ||
throw new \Exception(sprintf('The trait "ValidatorExtensionTrait" can only be added to a class that extends %s', TypeTestCase::class)); | ||
} | ||
|
||
$this->validator = $this->getMockBuilder(ValidatorInterface::class)->getMock(); | ||
$metadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock(); | ||
$this->validator->expects($this->any())->method('getMetadataFor')->will($this->returnValue($metadata)); | ||
$this->validator->expects($this->any())->method('validate')->will($this->returnValue(array())); | ||
|
||
return new ValidatorExtension($this->validator); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 0 additions & 44 deletions
44
src/Symfony/Component/Form/Tests/Extension/Validator/Type/TypeTestCase.php
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The trait is now missing the tearDown (or maybe a tearDownAfterClass?) to set the validator property to
null
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
tearDownAfterClass
added to the TypeTestCase classThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't use
tearDownAfterClass
since it's static, so I addedtearDown
instead