Skip to content

Commit 537803f

Browse files
Merge branch '3.4' into 4.1
* 3.4: [php_cs] disable fopen_flags [DI] fix error in dumped container [CS] Remove unused variables passed to closures [DI] fix dumping setters before their inlined instances [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 Don't return early as this bypasses the auto exit feature [Console] Add missing null to input values allowed types [PHPUnitBridge] Fix microtime() format bumped Symfony version to 3.4.17 updated VERSION for 3.4.16 updated CHANGELOG for 3.4.16 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 d998113 + 585f6e2 commit 537803f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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)