Merge branch '2.8' into 3.3

fabpot · fabpot · commit 431a020d3e70 · 2017-08-27T07:52:21.000-07:00
* 2.8:
  [VarDumper] Enhance docblock to tell about AbstractDumper::dumpLine(-1)
  [Debug] Remove false-positive check in DebugClassLoader
  [Validator] Fix use of GroupSequenceProvider in child classes
  Change number PHPDoc type to int|float
  [VarDumper] Strengthen dumped JS
  [travis] Add timing info
  [Validator] Fix Greek translation
  [Console] Initialize lazily to render exceptions properly
  [Validator] Add a property tag for File::$maxSize
diff --git a/NumberFormatter/NumberFormatter.php b/NumberFormatter/NumberFormatter.php
@@ -357,9 +357,9 @@ public function formatCurrency($value, $currency)
     /**
      * Format a number.
      *
-     * @param number $value The value to format
-     * @param int    $type  Type of the formatting, one of the format type constants
-     *                      Only type NumberFormatter::TYPE_DEFAULT is currently supported.
+     * @param int|float $value The value to format
+     * @param int       $type  Type of the formatting, one of the format type constants
+     *                         Only type NumberFormatter::TYPE_DEFAULT is currently supported.
      *
      * @return bool|string The formatted value or false on error
      *

Original file line number	Diff line number	Diff line change
`@@ -357,9 +357,9 @@ public function formatCurrency($value, $currency)`
`357`	`357`	`/**`
`358`	`358`	`* Format a number.`
`359`	`359`	`*`
`360`		`- * @param number $value The value to format`
`361`		`- * @param int $type Type of the formatting, one of the format type constants`
`362`		`- * Only type NumberFormatter::TYPE_DEFAULT is currently supported.`
	`360`	`+ * @param int\|float $value The value to format`
	`361`	`+ * @param int $type Type of the formatting, one of the format type constants`
	`362`	`+ * Only type NumberFormatter::TYPE_DEFAULT is currently supported.`
`363`	`363`	`*`
`364`	`364`	`* @return bool\|string The formatted value or false on error`
`365`	`365`	`*`