Skip to content

Commit ff1049f

Browse files
Merge branch '3.4' into 4.3
* 3.4: (21 commits) [SecurityBundle] fix return type declarations [BrowserKit] fix return type declarations [PropertyInfo] fix return type declarations [Bridge/Doctrine] fix return type declarations [Form] fix return type declarations [Console] fix return type declarations [Intl] fix return type declarations [Templating] fix return type declarations [DomCrawler] fix return type declarations [Validator] fix return type declarations [Process] fix return type declarations [Workflow] fix return type declarations [Cache] fix return type declarations [Serializer] fix return type declarations [Translation] fix return type declarations [DI] fix return type declarations [Config] fix return type declarations [HttpKernel] Fix return type declarations [Security] Fix return type declarations [Routing] Fix return type declarations ...
2 parents 30e3863 + 8b0faa6 commit ff1049f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Router.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,9 @@ public function matchRequest(Request $request)
277277
}
278278

279279
/**
280-
* Gets the UrlMatcher instance associated with this Router.
280+
* Gets the UrlMatcher or RequestMatcher instance associated with this Router.
281281
*
282-
* @return UrlMatcherInterface A UrlMatcherInterface instance
282+
* @return UrlMatcherInterface|RequestMatcherInterface
283283
*/
284284
public function getMatcher()
285285
{

0 commit comments

Comments
 (0)