Skip to content

Commit 9368e44

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 61973ec + 5baf0f8 commit 9368e44

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Inline.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ private static function evaluateScalar($scalar, $flags, $references = array())
788788
* @param int &$i
789789
* @param int $flags
790790
*
791-
* @return null|string
791+
* @return string|null
792792
*/
793793
private static function parseTag($value, &$i, $flags)
794794
{

0 commit comments

Comments
 (0)