Commit2a88752

committed

[Routing] Deprecate RouteCollection::addPrefix(null).

1 parent7f6ed32 commit2a88752Copy full SHA for 2a88752

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,10 @@ public function addCollection(self $collection)`
`140`	`140`	`*/`
`141`	`141`	`publicfunctionaddPrefix($prefix,array$defaults = [],array$requirements = [])`
`142`	`142`	`{`
	`143`	`+if (null ===$prefix) {`
	`144`	`+ @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);`
	`145`	`+ }`
	`146`	`+`
`143`	`147`	`$prefix =trim(trim($prefix),'/');`
`144`	`148`
`145`	`149`	`if ('' ===$prefix) {`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,9 @@ public function build()`
`309`	`309`	`}else {`
`310`	`310`	`/* @var self $route */`
`311`	`311`	`$subCollection =$route->build();`
`312`		`-$subCollection->addPrefix($this->prefix);`
	`312`	`+if (null !==$this->prefix) {`
	`313`	`+$subCollection->addPrefix($this->prefix);`
	`314`	`+ }`
`313`	`315`
`314`	`316`	`$routeCollection->addCollection($subCollection);`
`315`	`317`	`}`

Comments

(0)