@@ -213,24 +213,18 @@ class NumberFormatter
213213 );
214214
215215/**
216- * The maximumvalues of the integer type in 32 bit platforms.
216+ * The maximumvalue of the integer type in 32 bit platforms.
217217 *
218- * @vararray
218+ * @varint
219219 */
220- private static $ int32Rangearray (
221- 'positive ' =>2147483647 ,
222- 'negative ' => -2147483648 ,
223- );
220+ private static $ int32Max2147483647 ;
224221
225222/**
226- * The maximumvalues of the integer type in 64 bit platforms.
223+ * The maximumvalue of the integer type in 64 bit platforms.
227224 *
228- * @vararray
225+ * @varint|float
229226 */
230- private static $ int64Rangearray (
231- 'positive ' =>9223372036854775807 ,
232- 'negative ' => -9223372036854775808 ,
233- );
227+ private static $ int64Max9223372036854775807 ;
234228
235229private static $ enSymbolsarray (
236230self ::DECIMAL =>array ('. ' ,', ' ,'; ' ,'% ' ,'0 ' ,'# ' ,'- ' ,'+ ' ,'¤ ' ,'¤¤ ' ,'. ' ,'E ' ,'‰ ' ,'* ' ,'∞ ' ,'NaN ' ,'@ ' ,', ' ),
@@ -508,7 +502,7 @@ public function parseCurrency($value, &$currency, &$position = null)
508502 * @param int $type Type of the formatting, one of the format type constants. NumberFormatter::TYPE_DOUBLE by default
509503 * @param int $position Offset to begin the parsing on return this value will hold the offset at which the parsing ended
510504 *
511- * @returnbool|string The parsed value of false on error
505+ * @returnint|float|false The parsed value of false on error
512506 *
513507 * @see http://www.php.net/manual/en/numberformatter.parse.php
514508 */
@@ -795,7 +789,7 @@ private function convertValueDataType($value, $type)
795789 */
796790private function getInt32Value ($ value
797791 {
798- if ($ valueself ::$ int32Range [ ' positive ' ] ||$ valueself ::$ int32Range [ ' negative ' ] ) {
792+ if ($ valueself ::$ int32Max $ value- self ::$ int32Max - 1 ) {
799793return false ;
800794 }
801795
@@ -808,20 +802,18 @@ private function getInt32Value($value)
808802 * @param mixed $value The value to be converted
809803 *
810804 * @return int|float|false The converted value
811- *
812- * @see https://bugs.php.net/bug.php?id=59597 Bug #59597
813805 */
814806private function getInt64Value ($ value
815807 {
816- if ($ valueself ::$ int64Range [ ' positive ' ] ||$ valueself ::$ int64Range [ ' negative ' ] ) {
808+ if ($ valueself ::$ int64Max $ value- self ::$ int64Max - 1 ) {
817809return false ;
818810 }
819811
820- if (PHP_INT_SIZE !==8 && ($ valueself ::$ int32Range [ ' positive ' ] ||$ valueself ::$ int32Range [ ' negative ' ] )) {
812+ if (PHP_INT_SIZE !==8 && ($ valueself ::$ int32Max $ value- self ::$ int32Max - 1 )) {
821813// Bug #59597 was fixed on PHP 5.3.14 and 5.4.4
822814// The negative PHP_INT_MAX was being converted to float
823815if (
824- $ valueself ::$ int32Range [ ' negative ' ] &&
816+ $ value- self ::$ int32Max - 1 &&
825817 ((PHP_VERSION_ID <50400 &&PHP_VERSION_ID >=50314 ) ||PHP_VERSION_ID >=50404 || (extension_loaded ('intl ' ) &&method_exists ('IntlDateFormatter ' ,'setTimeZone ' )))
826818 ) {
827819return (int )$ value
@@ -834,7 +826,7 @@ private function getInt64Value($value)
834826// Bug #59597 was fixed on PHP 5.3.14 and 5.4.4
835827// A 32 bit integer was being generated instead of a 64 bit integer
836828if (
837- ($ valueself ::$ int32Range [ ' positive ' ] ||$ valueself ::$ int32Range [ ' negative ' ] ) &&
829+ ($ valueself ::$ int32Max $ value- self ::$ int32Max - 1 ) &&
838830 (PHP_VERSION_ID <50314 || (PHP_VERSION_ID >=50400 &&PHP_VERSION_ID <50404 )) &&
839831 !(extension_loaded ('intl ' ) &&method_exists ('IntlDateFormatter ' ,'setTimeZone ' ))
840832 ) {