Skip to content

Commit 7af6518

Browse files
Merge branch '4.1'
* 4.1: fix cs fix cs fix cs SCA: consolidate non empty array checks across codebase [cs] correct invalid @param types [Bridge/PhpUnit] Use composer to download phpunit [DI] fix taking lazy services into account when dumping the container [Form] Fixed empty data for compound date interval [Cache] fix optimizing Psr6Cache for AdapterInterface pools deal with explicitly enabled workflow nodes
2 parents 19be3f5 + 9631c22 commit 7af6518

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

Router.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ protected function getMatcherDumperInstance()
375375
* Provides the ConfigCache factory implementation, falling back to a
376376
* default implementation if necessary.
377377
*
378-
* @return ConfigCacheFactoryInterface $configCacheFactory
378+
* @return ConfigCacheFactoryInterface
379379
*/
380380
private function getConfigCacheFactory()
381381
{

Tests/Matcher/Dumper/PhpMatcherDumperTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,6 @@ public function getRouteCollections()
472472
);
473473
}
474474

475-
/**
476-
* @param $dumper
477-
*/
478475
private function generateDumpedMatcher(RouteCollection $collection, $redirectableStub = false)
479476
{
480477
$options = array('class' => $this->matcherClass);

0 commit comments

Comments
 (0)