From 1e82ad8038d3100b7e27be870652c1f639a7200a Mon Sep 17 00:00:00 2001 From: Andrea Faulds Date: Wed, 30 Mar 2016 01:44:27 +0100 Subject: Warn about invalid strings in arithmetic Squashed commit of the following: commit e05d3b67325d4521418483ed924ac9211a188919 Author: Andrea Faulds Date: Wed Mar 30 01:43:35 2016 +0100 UPGRADING and NEWS commit 6caf1d4585207d1b02fb06a216cd7da1a1f5e12d Author: Andrea Faulds Date: Sun Mar 20 21:18:33 2016 +0000 Fixes commit 6dadb1b0efe5e2ed071e95a55c806519e61377ac Author: Andrea Faulds Date: Sun Feb 14 02:15:01 2016 +0000 Add test for numeric string errors in assignment commit bd5f04e8dd576f92a48d25546f4f9a0f57f374de Author: Andrea Faulds Date: Sat Feb 13 23:53:05 2016 +0000 Add test for numeric string errors commit c72e92f16d512bcae30cc9639c89bcb08d971742 Author: Andrea Faulds Date: Tue Jan 26 23:28:33 2016 +0000 Add test for scientific notation in integer operations commit d94c08852d405b3a7ef6c84d24bf7915c890ce78 Author: Andrea Faulds Date: Sun Feb 14 01:25:57 2016 +0000 Disable optimiser evaluation for numeric string errors commit 30ee954ed13d933e766c68605d683c8ebae3d8ee Author: Andrea Faulds Date: Sun Feb 14 01:46:25 2016 +0000 fixup commit a6403b79e054c95e2b7345d787f3092b261eed27 Author: Andrea Faulds Date: Sat Feb 13 22:00:27 2016 +0000 Do not convert error-causing numeric strings ahead-of-time commit f9dc35401471ef3035954cb6f171826769297548 Author: Andrea Faulds Date: Sat Feb 13 19:15:38 2016 +0000 Disable compile-time evaluation for numeric string errors commit e05b0cc8496ea082c6db27efd8b8277ef1f785b5 Author: Andrea Faulds Date: Fri Feb 5 11:42:26 2016 +0000 Make _zval_get_long_func_noisy function for inlining commit 84d66321a57e579759109650c8bb7e3d5002854a Author: Andrea Faulds Date: Tue Jan 26 23:10:00 2016 +0000 Update tests commit 5ac4a0cc4bff282e3a15eaa8ab44b67391881a6d Author: Andrea Faulds Date: Tue Jan 26 22:08:19 2016 +0000 Use is_numeric_string_ex for zval_get_long etc. commit c21f08848533723331012a62a153de3577731d6a Author: Andrea Faulds Date: Thu Jan 7 21:13:04 2016 +0000 Update tests commit 63e214cf8160420bfc51c6a2b4ae32f09ad8e8af Author: Andrea Faulds Date: Wed Jan 6 00:28:01 2016 +0000 Warn on non-/bad numeric strings in arithmetic --- tests/lang/bug28800.phpt | 14 ++++++++++- .../bitwiseShiftLeft_variationStr_64bit.phpt | 20 ++++++++-------- .../operators/bitwiseShiftRight_variationStr.phpt | 20 ++++++++-------- tests/lang/operators/modulus_variationStr.phpt | 28 +++++++++++----------- tests/lang/operators/negate_variationStr.phpt | 18 +++++++++++++- 5 files changed, 64 insertions(+), 36 deletions(-) (limited to 'tests') diff --git a/tests/lang/bug28800.phpt b/tests/lang/bug28800.phpt index f81ad7fec9..8bd2c306e1 100644 --- a/tests/lang/bug28800.phpt +++ b/tests/lang/bug28800.phpt @@ -7,11 +7,23 @@ Bug #28800 (Incorrect string to number conversion for strings starting with 'inf echo ($v+0)."\n"; } ?> ---EXPECT-- +--EXPECTF-- + +Warning: A non-numeric value encountered in %s on line %d 0 + +Warning: A non-numeric value encountered in %s on line %d 0 + +Warning: A non-numeric value encountered in %s on line %d 0 + +Warning: A non-numeric value encountered in %s on line %d 0 + +Warning: A non-numeric value encountered in %s on line %d 0 + +Warning: A non-numeric value encountered in %s on line %d 0 diff --git a/tests/lang/operators/bitwiseShiftLeft_variationStr_64bit.phpt b/tests/lang/operators/bitwiseShiftLeft_variationStr_64bit.phpt index d5888d837f..69fd90f1c8 100644 --- a/tests/lang/operators/bitwiseShiftLeft_variationStr_64bit.phpt +++ b/tests/lang/operators/bitwiseShiftLeft_variationStr_64bit.phpt @@ -226,17 +226,17 @@ int(984) --- testing: '123abc' << 'a5.9' --- int(123) --- testing: '123e5' << '0' --- -int(123) +int(12300000) --- testing: '123e5' << '65' --- int(0) --- testing: '123e5' << '-44' --- Exception: Bit shift by negative number --- testing: '123e5' << '1.2' --- -int(246) +int(24600000) --- testing: '123e5' << '-7.7' --- Exception: Bit shift by negative number --- testing: '123e5' << 'abc' --- -int(123) +int(12300000) --- testing: '123e5' << '123abc' --- int(0) --- testing: '123e5' << '123e5' --- @@ -250,21 +250,21 @@ int(0) --- testing: '123e5' << '123abc ' --- int(0) --- testing: '123e5' << '3.4a' --- -int(984) +int(98400000) --- testing: '123e5' << 'a5.9' --- -int(123) +int(12300000) --- testing: '123e5xyz' << '0' --- -int(123) +int(12300000) --- testing: '123e5xyz' << '65' --- int(0) --- testing: '123e5xyz' << '-44' --- Exception: Bit shift by negative number --- testing: '123e5xyz' << '1.2' --- -int(246) +int(24600000) --- testing: '123e5xyz' << '-7.7' --- Exception: Bit shift by negative number --- testing: '123e5xyz' << 'abc' --- -int(123) +int(12300000) --- testing: '123e5xyz' << '123abc' --- int(0) --- testing: '123e5xyz' << '123e5' --- @@ -278,9 +278,9 @@ int(0) --- testing: '123e5xyz' << '123abc ' --- int(0) --- testing: '123e5xyz' << '3.4a' --- -int(984) +int(98400000) --- testing: '123e5xyz' << 'a5.9' --- -int(123) +int(12300000) --- testing: ' 123abc' << '0' --- int(123) --- testing: ' 123abc' << '65' --- diff --git a/tests/lang/operators/bitwiseShiftRight_variationStr.phpt b/tests/lang/operators/bitwiseShiftRight_variationStr.phpt index a86d0cfddb..a4c425aab3 100644 --- a/tests/lang/operators/bitwiseShiftRight_variationStr.phpt +++ b/tests/lang/operators/bitwiseShiftRight_variationStr.phpt @@ -222,17 +222,17 @@ int(15) --- testing: '123abc' >> 'a5.9' --- int(123) --- testing: '123e5' >> '0' --- -int(123) +int(12300000) --- testing: '123e5' >> '65' --- int(0) --- testing: '123e5' >> '-44' --- Exception: Bit shift by negative number --- testing: '123e5' >> '1.2' --- -int(61) +int(6150000) --- testing: '123e5' >> '-7.7' --- Exception: Bit shift by negative number --- testing: '123e5' >> 'abc' --- -int(123) +int(12300000) --- testing: '123e5' >> '123abc' --- int(0) --- testing: '123e5' >> '123e5' --- @@ -246,21 +246,21 @@ int(0) --- testing: '123e5' >> '123abc ' --- int(0) --- testing: '123e5' >> '3.4a' --- -int(15) +int(1537500) --- testing: '123e5' >> 'a5.9' --- -int(123) +int(12300000) --- testing: '123e5xyz' >> '0' --- -int(123) +int(12300000) --- testing: '123e5xyz' >> '65' --- int(0) --- testing: '123e5xyz' >> '-44' --- Exception: Bit shift by negative number --- testing: '123e5xyz' >> '1.2' --- -int(61) +int(6150000) --- testing: '123e5xyz' >> '-7.7' --- Exception: Bit shift by negative number --- testing: '123e5xyz' >> 'abc' --- -int(123) +int(12300000) --- testing: '123e5xyz' >> '123abc' --- int(0) --- testing: '123e5xyz' >> '123e5' --- @@ -274,9 +274,9 @@ int(0) --- testing: '123e5xyz' >> '123abc ' --- int(0) --- testing: '123e5xyz' >> '3.4a' --- -int(15) +int(1537500) --- testing: '123e5xyz' >> 'a5.9' --- -int(123) +int(12300000) --- testing: ' 123abc' >> '0' --- int(123) --- testing: ' 123abc' >> '65' --- diff --git a/tests/lang/operators/modulus_variationStr.phpt b/tests/lang/operators/modulus_variationStr.phpt index c647ecd380..4cfd7768ff 100644 --- a/tests/lang/operators/modulus_variationStr.phpt +++ b/tests/lang/operators/modulus_variationStr.phpt @@ -208,9 +208,9 @@ Exception: Modulo by zero --- testing: '123abc' % '123abc' --- int(0) --- testing: '123abc' % '123e5' --- -int(0) +int(123) --- testing: '123abc' % '123e5xyz' --- -int(0) +int(123) --- testing: '123abc' % ' 123abc' --- int(0) --- testing: '123abc' % '123 abc' --- @@ -224,13 +224,13 @@ Exception: Modulo by zero --- testing: '123e5' % '0' --- Exception: Modulo by zero --- testing: '123e5' % '65' --- -int(58) +int(50) --- testing: '123e5' % '-44' --- -int(35) +int(20) --- testing: '123e5' % '1.2' --- int(0) --- testing: '123e5' % '-7.7' --- -int(4) +int(6) --- testing: '123e5' % 'abc' --- Exception: Modulo by zero --- testing: '123e5' % '123abc' --- @@ -252,13 +252,13 @@ Exception: Modulo by zero --- testing: '123e5xyz' % '0' --- Exception: Modulo by zero --- testing: '123e5xyz' % '65' --- -int(58) +int(50) --- testing: '123e5xyz' % '-44' --- -int(35) +int(20) --- testing: '123e5xyz' % '1.2' --- int(0) --- testing: '123e5xyz' % '-7.7' --- -int(4) +int(6) --- testing: '123e5xyz' % 'abc' --- Exception: Modulo by zero --- testing: '123e5xyz' % '123abc' --- @@ -292,9 +292,9 @@ Exception: Modulo by zero --- testing: ' 123abc' % '123abc' --- int(0) --- testing: ' 123abc' % '123e5' --- -int(0) +int(123) --- testing: ' 123abc' % '123e5xyz' --- -int(0) +int(123) --- testing: ' 123abc' % ' 123abc' --- int(0) --- testing: ' 123abc' % '123 abc' --- @@ -320,9 +320,9 @@ Exception: Modulo by zero --- testing: '123 abc' % '123abc' --- int(0) --- testing: '123 abc' % '123e5' --- -int(0) +int(123) --- testing: '123 abc' % '123e5xyz' --- -int(0) +int(123) --- testing: '123 abc' % ' 123abc' --- int(0) --- testing: '123 abc' % '123 abc' --- @@ -348,9 +348,9 @@ Exception: Modulo by zero --- testing: '123abc ' % '123abc' --- int(0) --- testing: '123abc ' % '123e5' --- -int(0) +int(123) --- testing: '123abc ' % '123e5xyz' --- -int(0) +int(123) --- testing: '123abc ' % ' 123abc' --- int(0) --- testing: '123abc ' % '123 abc' --- diff --git a/tests/lang/operators/negate_variationStr.phpt b/tests/lang/operators/negate_variationStr.phpt index a25bdda7f5..7405d42882 100644 --- a/tests/lang/operators/negate_variationStr.phpt +++ b/tests/lang/operators/negate_variationStr.phpt @@ -16,7 +16,7 @@ foreach ($strVals as $strVal) { ?> ===DONE=== ---EXPECT-- +--EXPECTF-- --- testing: '0' --- int(0) --- testing: '65' --- @@ -28,21 +28,37 @@ float(-1.2) --- testing: '-7.7' --- float(7.7) --- testing: 'abc' --- + +Warning: A non-numeric value encountered in %s on line %d int(0) --- testing: '123abc' --- + +Notice: A non well formed numeric value encountered in %s on line %d int(-123) --- testing: '123e5' --- float(-12300000) --- testing: '123e5xyz' --- + +Notice: A non well formed numeric value encountered in %s on line %d float(-12300000) --- testing: ' 123abc' --- + +Notice: A non well formed numeric value encountered in %s on line %d int(-123) --- testing: '123 abc' --- + +Notice: A non well formed numeric value encountered in %s on line %d int(-123) --- testing: '123abc ' --- + +Notice: A non well formed numeric value encountered in %s on line %d int(-123) --- testing: '3.4a' --- + +Notice: A non well formed numeric value encountered in %s on line %d float(-3.4) --- testing: 'a5.9' --- + +Warning: A non-numeric value encountered in %s on line %d int(0) ===DONE=== -- cgit v1.2.1