Merge branch 'pull-request/61' into PHP-5.3

* pull-request/61:
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer

diff --cc ext/intl/tests/bug59597_32.phpt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..928a235a83fc31d7b2af192c4b7feb895ea57c07
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/ext/intl/tests/bug59597_32.phpt
@@@ -1,0 -1,0 +1,21 @@@
++--TEST--
++Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
++--SKIPIF--
++<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
++<?php echo PHP_INT_SIZE == 8 ? "skip 32-bit only" : "OK"; ?>
++--FILE--
++<?php
++
++$formatter = new \NumberFormatter('en', \NumberFormatter::DECIMAL);
++$value = $formatter->parse('2147483647', \NumberFormatter::TYPE_INT32);
++var_dump($value);
++
++$formatter = new \NumberFormatter('en', \NumberFormatter::DECIMAL);
++$value = $formatter->parse('2147483650', \NumberFormatter::TYPE_INT64);
++var_dump($value);
++
++?>
++--EXPECT--
++int(2147483647)
++float(2147483650)
++

diff --cc ext/intl/tests/bug59597_64.phpt
index 0000000000000000000000000000000000000000,54c9b6d3ccd01182c438a358059f1fbea7bf0f2d..4b96bf72e9732dfe99f3982d2b4b1107dde0dfe2
mode 000000,100644..100644
--- /dev/null
--- 2/ext/intl/tests/bug59597.phpt
+++ b/ext/intl/tests/bug59597_64.phpt
@@@ -1,0 -1,19 +1,21 @@@
 ---EXPECTF--
+ --TEST--
+ Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
+ --SKIPIF--
+ <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
++<?php echo PHP_INT_SIZE != 8 ? "skip 64-bit only" : "OK"; ?>
+ --FILE--
+ <?php
+ 
+ $formatter = new \NumberFormatter('en', \NumberFormatter::DECIMAL);
+ $value = $formatter->parse('2147483647', \NumberFormatter::TYPE_INT32);
+ var_dump($value);
+ 
+ $formatter = new \NumberFormatter('en', \NumberFormatter::DECIMAL);
+ $value = $formatter->parse('2147483650', \NumberFormatter::TYPE_INT64);
+ var_dump($value);
+ 
+ ?>
++--EXPECTREGEX--
+ int(2147483647)
+ int(2147483650)
++