work around ConstraintValidatorTestCase

symfony-cmf · Apr 6, 2024 · cc4d043 · cc4d043
1 parent 5fe612c
commit cc4d043
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/Model/Route.php b/src/Model/Route.php
@@ -26,7 +26,7 @@ class Route extends SymfonyRoute implements RouteObjectInterface
     /**
      * Unique id of this route.
      */
-    protected string|int|null $id;
+    protected string|int|null $id = null;
 
     /**
      * The referenced content object.

diff --git a/src/Routing/RedirectableRequestMatcher.php b/src/Routing/RedirectableRequestMatcher.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\RoutingBundle\Routing;
 
-use Symfony\Cmf\Bundle\RoutingBundle\Controller\RedirectController;
+use Symfony\Bundle\FrameworkBundle\Controller\RedirectController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Exception\ExceptionInterface;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;

diff --git a/tests/Unit/Validator/Constraints/RouteDefaultsTwigValidatorTest.php b/tests/Unit/Validator/Constraints/RouteDefaultsTwigValidatorTest.php
@@ -15,8 +15,10 @@
 use Symfony\Cmf\Bundle\RoutingBundle\Validator\Constraints\RouteDefaults;
 use Symfony\Cmf\Bundle\RoutingBundle\Validator\Constraints\RouteDefaultsTwigValidator;
 use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
+use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\ConstraintValidatorInterface;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+use Symfony\Component\Validator\Test\ConstraintViolationAssertion;
 use Twig\Loader\LoaderInterface;
 
 class RouteDefaultsTwigValidatorTest extends ConstraintValidatorTestCase
@@ -66,7 +68,7 @@ public function testControllerPathViolation(): void
 
         $this->validator->validate(['_controller' => 'NotExistingBundle:Foo:bar'], new RouteDefaults());
 
-        $this->buildViolation('Invalid controller')->assertRaised();
+        (new ConstraintViolationAssertion($this->context, 'Invalid controller', new NotNull()))->assertRaised();
     }
 
     public function testCorrectTemplate(): void
@@ -94,8 +96,9 @@ public function testTemplateViolation(): void
             new RouteDefaults(['message' => 'my message'])
         );
 
-        $this->buildViolation('my message')
+        (new ConstraintViolationAssertion($this->context, 'my message', new NotNull()))
             ->setParameter('%name%', 'NotExistingBundle:Foo:bar.html.twig')
-            ->assertRaised();
+            ->assertRaised()
+        ;
     }
 }