Skip to content

[Validator][Tests] Fix AssertingContextualValidator not throwing on remaining expectations #42458

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 23, 2022
Merged

[Validator][Tests] Fix AssertingContextualValidator not throwing on remaining expectations #42458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,17 @@ class AssertingContextualValidator implements ContextualValidatorInterface
private $validateCalls = -1;
private $expectedValidate = [];

public function __destruct()
{
if ($this->expectedAtPath) {
throw new ExpectationFailedException('Some expected validation calls for paths were not done.');
}

if ($this->expectedValidate) {
throw new ExpectationFailedException('Some expected validation calls for values were not done.');
}
}

public function atPath($path)
{
}
Expand All @@ -403,7 +414,10 @@ public function doAtPath($path)
throw new ExpectationFailedException(sprintf('Validation for property path "%s" was not expected.', $path));
}

Assert::assertSame($this->expectedAtPath[$this->atPathCalls], $path);
$expectedPath = $this->expectedAtPath[$this->atPathCalls];
unset($this->expectedAtPath[$this->atPathCalls]);

Assert::assertSame($expectedPath, $path);

return $this;
}
Expand All @@ -417,6 +431,7 @@ public function doValidate($value, $constraints = null, $groups = null)
Assert::assertFalse($this->expectNoValidate, 'No validation calls have been expected.');

[$expectedValue, $expectedGroup, $expectedConstraints] = $this->expectedValidate[++$this->validateCalls];
unset($this->expectedValidate[$this->validateCalls]);

Assert::assertSame($expectedValue, $value);
$expectedConstraints($constraints);
Expand Down
71 changes: 71 additions & 0 deletions src/Symfony/Component/Validator/Tests/Test/ConstraintValidatorTestCaseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?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\Validator\Tests\Test;

use PHPUnit\Framework\ExpectationFailedException;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\Constraints\DateTime;
use Symfony\Component\Validator\Constraints\NotNull;
use Symfony\Component\Validator\ConstraintValidator;
use Symfony\Component\Validator\ConstraintValidatorInterface;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;

class ConstraintValidatorTestCaseTest extends ConstraintValidatorTestCase
{
protected function createValidator(): ConstraintValidatorInterface
{
return new TestCustomValidator();
}

public function testAssertingContextualValidatorRemainingExpectationsThrow()
{
$this->expectValidateValueAt(0, 'k1', 'ccc', [
new NotNull(),
]);
$this->expectValidateValueAt(1, 'k2', 'ccc', [
new DateTime(),
]);

$this->validator->validate('ccc', $this->constraint);

$contextualValidator = $this->context->getValidator()->inContext($this->context);
// Simulate __destruct to assert it throws
try {
$contextualValidator->__destruct();
$this->fail();
} catch (ExpectationFailedException $e) {
}

// Actually fulfill expectations so real __destruct doesn't throw
$contextualValidator
->atPath('k2')
->validate('ccc', [
new DateTime(),
]);
}
}

class TestCustomValidator extends ConstraintValidator
{
public function validate($value, Constraint $constraint)
{
$validator = $this->context
->getValidator()
->inContext($this->context);

$validator
->atPath('k1')
->validate($value, [
new NotNull(),
]);
}
}