symfony
diff --git a/‎src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
+16-1Lines changed: 16 additions & 1 deletion b/‎src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
+16-1Lines changed: 16 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Validator/Tests/Test/ConstraintValidatorTestCaseTest.php
Copy file name to clipboard
+71Lines changed: 71 additions & 0 deletions b/‎src/Symfony/Component/Validator/Tests/Test/ConstraintValidatorTestCaseTest.php
Copy file name to clipboard
+71Lines changed: 71 additions & 0 deletions
@@ -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)
     {
     }
@@ -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;
     }
@@ -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);
 
@@ -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(),
+            ]);
+    }
+}