Skip to content

Commit

Permalink
Merge branch '2.8' into 3.4
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed Oct 2, 2018
2 parents 9d25efa + 8fe696a commit f6dd489
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Intl.php
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public static function getRegionBundle()
/**
* Returns the version of the installed ICU library.
*
* @return null|string The ICU version or NULL if it could not be determined
* @return string|null The ICU version or NULL if it could not be determined
*/
public static function getIcuVersion()
{
Expand Down

0 comments on commit f6dd489

Please sign in to comment.