Skip to content

Commit 585f6e2

Browse files
Merge branch '2.8' into 3.4
* 2.8: [php_cs] disable fopen_flags [CS] Remove unused variables passed to closures [CS] Remove empty comment [CS] Enforces null type hint on last position in phpDocs [CS] Use combined assignment operators when possible Fix a typo in error messages [Console] Add missing null to input values allowed types [PHPUnitBridge] Fix microtime() format bumped Symfony version to 2.8.47 update CONTRIBUTORS for 2.8.46 updated VERSION for 2.8.46 updated CHANGELOG for 2.8.46
2 parents eb22cc1 + 066acfc commit 585f6e2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Matcher/Dumper/StaticPrefixCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function addRoute($prefix, $route)
106106
* @param string $prefix
107107
* @param mixed $route
108108
*
109-
* @return null|StaticPrefixCollection
109+
* @return StaticPrefixCollection|null
110110
*/
111111
private function groupWithItem($item, $prefix, $route)
112112
{

Route.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Route implements \Serializable
2929
private $condition = '';
3030

3131
/**
32-
* @var null|CompiledRoute
32+
* @var CompiledRoute|null
3333
*/
3434
private $compiled;
3535

0 commit comments

Comments
 (0)