Merge pull request #476 from symfony-cmf/remove-legacy

remove legacy support code
symfony-cmf · Feb 11, 2022 · 73f6632 · 73f6632
2 parents 99101f3 + a8c8b32
commit 73f6632
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 109 deletions.
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
@@ -4,3 +4,12 @@
 
 If you extend any of the classes in this repository, you will need to adjust
 overwritten methods to specify the parameter and return types.
+
+## Content Template Request Attribute
+
+The content template request attribute is only at `template` and no longer also at `contentTemplate`.
+Use the `DynamicRouter::CONTENT_TEMPLATE` constant when referencing to it in code.
+
+## RouteDefaultsTemplatingValidator removed
+
+Use the RouteDefaultsTwigValidator instead.
diff --git a/src/CmfRoutingBundle.php b/src/CmfRoutingBundle.php
@@ -20,7 +20,6 @@
 use Doctrine\Persistence\Mapping\Driver\DefaultFileLocator;
 use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\RedirectableMatcherPass;
 use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\SetRouterPass;
-use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\TemplatingValidatorPass;
 use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\ValidationPass;
 use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRouteEnhancersPass;
 use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRoutersPass;
@@ -38,7 +37,6 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new RegisterRouteEnhancersPass());
         $container->addCompilerPass(new SetRouterPass());
         $container->addCompilerPass(new ValidationPass());
-        $container->addCompilerPass(new TemplatingValidatorPass());
         $container->addCompilerPass(new RedirectableMatcherPass());
 
         $this->buildPhpcrCompilerPass($container);

diff --git a/src/DependencyInjection/Compiler/TemplatingValidatorPass.php b/src/DependencyInjection/Compiler/TemplatingValidatorPass.php
diff --git a/src/Doctrine/Phpcr/RedirectRoute.php b/src/Doctrine/Phpcr/RedirectRoute.php
@@ -83,7 +83,7 @@ public function getParentDocument(): ?object
      */
     public function setParent($parent)
     {
-        @trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 3.0. Use setParentDocument() instead.', \E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 4.0. Use setParentDocument() instead.', \E_USER_DEPRECATED);
 
         return $this->setParentDocument($parent);
     }
@@ -94,7 +94,7 @@ public function setParent($parent)
      */
     public function getParent()
     {
-        @trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 3.0. Use getParentDocument() instead.', \E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 4.0. Use getParentDocument() instead.', \E_USER_DEPRECATED);
 
         return $this->getParentDocument();
     }

diff --git a/src/Doctrine/Phpcr/Route.php b/src/Doctrine/Phpcr/Route.php
@@ -95,7 +95,7 @@ public function getParentDocument(): object
      */
     public function setParent($parent)
     {
-        @trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 3.0. Use setParentDocument() instead.', \E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 4.0. Use setParentDocument() instead.', \E_USER_DEPRECATED);
 
         return $this->setParentDocument($parent);
     }
@@ -106,7 +106,7 @@ public function setParent($parent)
      */
     public function getParent()
     {
-        @trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 3.0. Use getParentDocument() instead.', \E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.'() method is deprecated and will be removed in version 4.0. Use getParentDocument() instead.', \E_USER_DEPRECATED);
 
         return $this->getParentDocument();
     }

diff --git a/src/Routing/DynamicRouter.php b/src/Routing/DynamicRouter.php
@@ -98,9 +98,6 @@ protected function cleanDefaults(array $defaults, Request $request = null): arra
         if (\array_key_exists(RouteObjectInterface::TEMPLATE_NAME, $defaults)) {
             $request->attributes->set(self::CONTENT_TEMPLATE, $defaults[RouteObjectInterface::TEMPLATE_NAME]);
 
-            // contentTemplate is deprecated as of version 2.0, to be removed in 3.0
-            $request->attributes->set('contentTemplate', $defaults[RouteObjectInterface::TEMPLATE_NAME]);
-
             unset($defaults[RouteObjectInterface::TEMPLATE_NAME]);
         }
 

diff --git a/src/Validator/Constraints/RouteDefaultsTemplatingValidator.php b/src/Validator/Constraints/RouteDefaultsTemplatingValidator.php