Skip to content

Commit f688c8c

Browse files
Merge branch '4.3' into 4.4
* 4.3: (23 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 d0014ae + ff1049f commit f688c8c

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
@@ -271,9 +271,9 @@ public function matchRequest(Request $request)
271271
}
272272

273273
/**
274-
* Gets the UrlMatcher instance associated with this Router.
274+
* Gets the UrlMatcher or RequestMatcher instance associated with this Router.
275275
*
276-
* @return UrlMatcherInterface A UrlMatcherInterface instance
276+
* @return UrlMatcherInterface|RequestMatcherInterface
277277
*/
278278
public function getMatcher()
279279
{

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)