Merge branch '5.4' into 6.0

* 5.4:
  [Lock] Release Locks from Internal Store on Postgres waitAndSave*
  [Serializer] Fix passing null to str_contains()
  [DependencyInjection] Don't reset env placeholders during compilation
  [HttpClient] Fix overriding default options with null
  [DependencyInjection] Clarify that using expressions in parameters is not allowed
  [GHA] Cancel running CI jobs when a PR is updated
  [Validator] Improve tests for the Image and File constraints
  [Validator][Tests] Fix AssertingContextualValidator not throwing on remaining expectations

Author: nicolas-grekas

Test/ConstraintValidatorTestCase.php

@@ -467,6 +467,17 @@ public function __construct(ExecutionContextInterface $context)
         $this->context = $context;
     }
 
+    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(string $path): static
     {
         throw new \BadMethodCallException();
@@ -483,7 +494,10 @@ public function doAtPath(string $path): static
             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;
     }
@@ -505,6 +519,7 @@ public function doValidate(mixed $value, Constraint|array $constraints = null, s
         }
 
         [$expectedValue, $expectedGroup, $expectedConstraints, $violation] = $this->expectedValidate[$this->validateCalls];
+        unset($this->expectedValidate[$this->validateCalls]);
 
         Assert::assertSame($expectedValue, $value);
         $expectedConstraints($constraints);

Tests/Constraints/FileValidatorTest.php

@@ -185,6 +185,9 @@ public function testMaxSizeExceeded($bytesWritten, $limit, $sizeAsString, $limit
     public function provideMaxSizeNotExceededTests()
     {
         return [
+            // 0 has no effect
+            [100, 0],
+
             // limit in bytes
             [1000, 1000],
             [1000000, 1000000],

Tests/Constraints/Fixtures/ccc.txt

@@ -0,0 +1 @@
+foobar

Tests/Constraints/ImageValidatorTest.php

@@ -34,6 +34,7 @@ class ImageValidatorTest extends ConstraintValidatorTestCase
     protected $imagePortrait;
     protected $image4By3;
     protected $imageCorrupted;
+    protected $notAnImage;
 
     protected function createValidator()
     {
@@ -50,6 +51,7 @@ protected function setUp(): void
         $this->image4By3 = __DIR__.'/Fixtures/test_4by3.gif';
         $this->image16By9 = __DIR__.'/Fixtures/test_16by9.gif';
         $this->imageCorrupted = __DIR__.'/Fixtures/test_corrupted.gif';
+        $this->notAnImage = __DIR__.'/Fixtures/ccc.txt';
     }
 
     public function testNullIsValid()
@@ -524,6 +526,21 @@ public function testCorrupted(Image $constraint)
             ->assertRaised();
     }
 
+    public function testInvalidMimeType()
+    {
+        $this->validator->validate($this->notAnImage, $constraint = new Image());
+
+        $this->assertSame('image/*', $constraint->mimeTypes);
+
+        $this->buildViolation('This file is not a valid image.')
+            ->setParameter('{{ file }}', sprintf('"%s"', $this->notAnImage))
+            ->setParameter('{{ type }}', '"text/plain"')
+            ->setParameter('{{ types }}', '"image/*"')
+            ->setParameter('{{ name }}', '"ccc.txt"')
+            ->setCode(Image::INVALID_MIME_TYPE_ERROR)
+            ->assertRaised();
+    }
+
     public function provideDetectCorruptedConstraints(): iterable
     {
         yield 'Doctrine style' => [new Image([

Tests/Test/ConstraintValidatorTestCaseTest.php

@@ -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(),
+            ]);
+    }
+}