From 2a88752cd6ab2bc9e7d06fdc48fbfc2b30f9b4ee Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Fri, 28 Jun 2019 10:23:33 +0200 Subject: [PATCH] [Routing] Deprecate RouteCollection::addPrefix(null). --- src/Symfony/Component/Routing/RouteCollection.php | 4 ++++ src/Symfony/Component/Routing/RouteCollectionBuilder.php | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php index 6c642300a96d3..76b1a84d9cccf 100644 --- a/src/Symfony/Component/Routing/RouteCollection.php +++ b/src/Symfony/Component/Routing/RouteCollection.php @@ -140,6 +140,10 @@ public function addCollection(self $collection) */ public function addPrefix($prefix, array $defaults = [], array $requirements = []) { + if (null === $prefix) { + @trigger_error(sprintf('Passing null as $prefix to %s is deprecated in Symfony 4.4 and will trigger a TypeError in 5.0.', __METHOD__), E_USER_DEPRECATED); + } + $prefix = trim(trim($prefix), '/'); if ('' === $prefix) { diff --git a/src/Symfony/Component/Routing/RouteCollectionBuilder.php b/src/Symfony/Component/Routing/RouteCollectionBuilder.php index eb0585bdf6e44..86013a3fa3787 100644 --- a/src/Symfony/Component/Routing/RouteCollectionBuilder.php +++ b/src/Symfony/Component/Routing/RouteCollectionBuilder.php @@ -309,7 +309,9 @@ public function build() } else { /* @var self $route */ $subCollection = $route->build(); - $subCollection->addPrefix($this->prefix); + if (null !== $this->prefix) { + $subCollection->addPrefix($this->prefix); + } $routeCollection->addCollection($subCollection); } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy