Skip to content

Commit 47195e9

Browse files
Merge branch '4.4'
* 4.4: (28 commits) fix merge [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 ...
2 parents 9e24e81 + f688c8c commit 47195e9

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Router.php

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

258258
/**
259-
* Gets the UrlMatcher instance associated with this Router.
259+
* Gets the UrlMatcher or RequestMatcher instance associated with this Router.
260260
*
261-
* @return UrlMatcherInterface A UrlMatcherInterface instance
261+
* @return UrlMatcherInterface|RequestMatcherInterface
262262
*/
263263
public function getMatcher()
264264
{

Tests/Loader/ObjectLoaderTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ public function getBadResourceStrings()
6262
];
6363
}
6464

65+
/**
66+
* @group legacy
67+
*/
6568
public function testExceptionOnNoObjectReturned()
6669
{
6770
$this->expectException('LogicException');

0 commit comments

Comments
 (0)