Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Refix the tests once more
This commit is contained in:
Anatol Belski 2018-05-19 13:11:39 +02:00
commit aebbf38df5
2 changed files with 5 additions and 10 deletions

View file

@ -6,13 +6,11 @@ if(!extension_loaded("bcmath")) print "skip";
if (substr(PHP_OS, 0, 3) != 'WIN') { if (substr(PHP_OS, 0, 3) != 'WIN') {
die('skip valid only for windows'); die('skip valid only for windows');
} }
$cur = PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD; $cur = PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD;
$req = "10.0.17134"; $req = "10.0.17134";
if (version_compare($cur, $req) >= 0) { if (version_compare($cur, $req) >= 0) {
echo "skip Only for Windows systems < $req"; echo "skip Only for Windows systems < $req";
} }
?> ?>
--FILE-- --FILE--
<?php <?php
@ -21,5 +19,4 @@ var_dump(bcpowmod(1, 1.2, 1, 1));
?> ?>
--EXPECTF-- --EXPECTF--
string(1) "1" string(1) "1"
string(3) "0.0" %Astring(3) "0.0"%A
bc math warning: non-zero scale in exponent

View file

@ -18,9 +18,7 @@ var_dump(bcpowmod('4.1', '4', '3', 3));
var_dump(bcpowmod('4', '4', '3.1', 3)); var_dump(bcpowmod('4', '4', '3.1', 3));
?> ?>
===DONE=== ===DONE===
--EXPECT-- --EXPECTF--
string(5) "1.000" %Astring(5) "1.000"
string(5) "1.000" %Astring(5) "1.000"
===DONE=== ===DONE===%A
bc math warning: non-zero scale in base
bc math warning: non-zero scale in modulus