diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-11-12 14:58:47 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-11-12 16:42:28 +0100 |
| commit | a08a2b48b489572db89940027206020ee714afa5 (patch) | |
| tree | 7f612cfa39f9ac4d78b22e2ad25f32879b729776 /ext/com_dotnet | |
| parent | 34dd032e4e70a33e3e8fa27e38af62f63601b447 (diff) | |
| download | php-git-a08a2b48b489572db89940027206020ee714afa5.tar.gz | |
Strip trailing line breaks and periods from Windows error messages
PHP error messages should not contain line breaks, so we remove these
from the Windows specific error messages. We also remove trailing
periods for the same reason.
Closes GH-6423.
Diffstat (limited to 'ext/com_dotnet')
| -rw-r--r-- | ext/com_dotnet/tests/variants.phpt | 186 | ||||
| -rw-r--r-- | ext/com_dotnet/tests/variants_x64.phpt | 186 |
2 files changed, 186 insertions, 186 deletions
diff --git a/ext/com_dotnet/tests/variants.phpt b/ext/com_dotnet/tests/variants.phpt index 0bcd473f61..e28823c3ad 100644 --- a/ext/com_dotnet/tests/variants.phpt +++ b/ext/com_dotnet/tests/variants.phpt @@ -34,7 +34,7 @@ foreach ($values as $t => $val) { echo "$op:\n"; echo "\tvariant_$op($v, $op2)\n"; echo "\texception " . $e->getMessage(); - printf("\tcode %08x\n\n", $e->getCode()); + printf("\n\tcode %08x\n\n", $e->getCode()); } } } @@ -74,63 +74,63 @@ xor: 46 -- add: variant_add(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 cat: 42hello sub: variant_sub(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mul: variant_mul(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 and: variant_and(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 div: variant_div(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 eqv: variant_eqv(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 idiv: variant_idiv(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 imp: variant_imp(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mod: variant_mod(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 or: variant_or(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 pow: variant_pow(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 xor: variant_xor(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 -- @@ -141,19 +141,19 @@ mul: 0 and: 0 div: variant_div(42, ) - exception Division by zero. + exception Division by zero code 80020012 eqv: -43 idiv: variant_idiv(42, ) - exception Division by zero. + exception Division by zero code 80020012 imp: -43 mod: variant_mod(42, ) - exception Division by zero. + exception Division by zero code 80020012 or: 42 @@ -190,63 +190,63 @@ xor: 0 -- add: variant_add(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 cat: 3.5hello sub: variant_sub(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mul: variant_mul(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 and: variant_and(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 div: variant_div(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 eqv: variant_eqv(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 idiv: variant_idiv(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 imp: variant_imp(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mod: variant_mod(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 or: variant_or(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 pow: variant_pow(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 xor: variant_xor(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 -- @@ -257,19 +257,19 @@ mul: 0 and: 0 div: variant_div(3.5, ) - exception Division by zero. + exception Division by zero code 80020012 eqv: -5 idiv: variant_idiv(3.5, ) - exception Division by zero. + exception Division by zero code 80020012 imp: -5 mod: variant_mod(3.5, ) - exception Division by zero. + exception Division by zero code 80020012 or: 4 @@ -278,125 +278,125 @@ xor: 4 -- add: variant_add(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 cat: hello42 sub: variant_sub(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 mul: variant_mul(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 and: variant_and(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 div: variant_div(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 eqv: variant_eqv(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 idiv: variant_idiv(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 imp: variant_imp(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 mod: variant_mod(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 or: variant_or(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 pow: variant_pow(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 xor: variant_xor(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 -- add: variant_add(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 cat: hello3.5 sub: variant_sub(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 mul: variant_mul(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 and: variant_and(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 div: variant_div(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 eqv: variant_eqv(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 idiv: variant_idiv(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 imp: variant_imp(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 mod: variant_mod(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 or: variant_or(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 pow: variant_pow(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 xor: variant_xor(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 -- @@ -404,119 +404,119 @@ add: hellohello cat: hellohello sub: variant_sub(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mul: variant_mul(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 and: variant_and(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 div: variant_div(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 eqv: variant_eqv(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 idiv: variant_idiv(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 imp: variant_imp(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mod: variant_mod(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 or: variant_or(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 pow: variant_pow(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 xor: variant_xor(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 -- add: variant_add(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 cat: helloFalse sub: variant_sub(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 mul: variant_mul(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 and: variant_and(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 div: variant_div(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 eqv: variant_eqv(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 idiv: variant_idiv(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 imp: variant_imp(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 mod: variant_mod(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 or: variant_or(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 pow: variant_pow(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 xor: variant_xor(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 -- @@ -550,63 +550,63 @@ xor: 4 -- add: variant_add(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 cat: Falsehello sub: variant_sub(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mul: variant_mul(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 and: variant_and(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 div: variant_div(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 eqv: variant_eqv(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 idiv: variant_idiv(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 imp: variant_imp(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mod: variant_mod(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 or: variant_or(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 pow: variant_pow(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 xor: variant_xor(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 -- @@ -617,19 +617,19 @@ mul: 0 and: 0 div: variant_div(0, ) - exception Out of present range. + exception Out of present range code 8002000a eqv: -1 idiv: variant_idiv(0, ) - exception Division by zero. + exception Division by zero code 80020012 imp: -1 mod: variant_mod(0, ) - exception Division by zero. + exception Division by zero code 80020012 or: 0 diff --git a/ext/com_dotnet/tests/variants_x64.phpt b/ext/com_dotnet/tests/variants_x64.phpt index 6a1b7e1c12..1ca93c5709 100644 --- a/ext/com_dotnet/tests/variants_x64.phpt +++ b/ext/com_dotnet/tests/variants_x64.phpt @@ -37,7 +37,7 @@ foreach ($values as $t => $val) { echo "$op:\n"; echo "\tvariant_$op($v, $op2)\n"; echo "\texception " . $e->getMessage(); - printf("\tcode %08x\n\n", $e->getCode()); + printf("\n\tcode %08x\n\n", $e->getCode()); } } } @@ -77,63 +77,63 @@ xor: 46 -- add: variant_add(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 cat: 42hello sub: variant_sub(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mul: variant_mul(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 and: variant_and(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 div: variant_div(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 eqv: variant_eqv(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 idiv: variant_idiv(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 imp: variant_imp(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mod: variant_mod(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 or: variant_or(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 pow: variant_pow(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 xor: variant_xor(42, hello) - exception Type mismatch. + exception Type mismatch code 80020005 -- @@ -144,19 +144,19 @@ mul: 0 and: 0 div: variant_div(42, ) - exception Division by zero. + exception Division by zero code 80020012 eqv: -43 idiv: variant_idiv(42, ) - exception Division by zero. + exception Division by zero code 80020012 imp: -43 mod: variant_mod(42, ) - exception Division by zero. + exception Division by zero code 80020012 or: 42 @@ -193,63 +193,63 @@ xor: 0 -- add: variant_add(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 cat: 3.5hello sub: variant_sub(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mul: variant_mul(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 and: variant_and(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 div: variant_div(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 eqv: variant_eqv(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 idiv: variant_idiv(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 imp: variant_imp(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mod: variant_mod(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 or: variant_or(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 pow: variant_pow(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 xor: variant_xor(3.5, hello) - exception Type mismatch. + exception Type mismatch code 80020005 -- @@ -260,19 +260,19 @@ mul: 0 and: 0 div: variant_div(3.5, ) - exception Division by zero. + exception Division by zero code 80020012 eqv: -5 idiv: variant_idiv(3.5, ) - exception Division by zero. + exception Division by zero code 80020012 imp: -5 mod: variant_mod(3.5, ) - exception Division by zero. + exception Division by zero code 80020012 or: 4 @@ -281,125 +281,125 @@ xor: 4 -- add: variant_add(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 cat: hello42 sub: variant_sub(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 mul: variant_mul(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 and: variant_and(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 div: variant_div(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 eqv: variant_eqv(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 idiv: variant_idiv(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 imp: variant_imp(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 mod: variant_mod(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 or: variant_or(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 pow: variant_pow(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 xor: variant_xor(hello, 42) - exception Type mismatch. + exception Type mismatch code 80020005 -- add: variant_add(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 cat: hello3.5 sub: variant_sub(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 mul: variant_mul(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 and: variant_and(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 div: variant_div(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 eqv: variant_eqv(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 idiv: variant_idiv(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 imp: variant_imp(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 mod: variant_mod(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 or: variant_or(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 pow: variant_pow(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 xor: variant_xor(hello, 3.5) - exception Type mismatch. + exception Type mismatch code 80020005 -- @@ -407,119 +407,119 @@ add: hellohello cat: hellohello sub: variant_sub(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mul: variant_mul(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 and: variant_and(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 div: variant_div(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 eqv: variant_eqv(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 idiv: variant_idiv(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 imp: variant_imp(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mod: variant_mod(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 or: variant_or(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 pow: variant_pow(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 xor: variant_xor(hello, hello) - exception Type mismatch. + exception Type mismatch code 80020005 -- add: variant_add(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 cat: helloFalse sub: variant_sub(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 mul: variant_mul(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 and: variant_and(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 div: variant_div(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 eqv: variant_eqv(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 idiv: variant_idiv(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 imp: variant_imp(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 mod: variant_mod(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 or: variant_or(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 pow: variant_pow(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 xor: variant_xor(hello, ) - exception Type mismatch. + exception Type mismatch code 80020005 -- @@ -553,63 +553,63 @@ xor: 4 -- add: variant_add(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 cat: Falsehello sub: variant_sub(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mul: variant_mul(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 and: variant_and(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 div: variant_div(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 eqv: variant_eqv(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 idiv: variant_idiv(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 imp: variant_imp(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 mod: variant_mod(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 or: variant_or(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 pow: variant_pow(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 xor: variant_xor(0, hello) - exception Type mismatch. + exception Type mismatch code 80020005 -- @@ -620,19 +620,19 @@ mul: 0 and: 0 div: variant_div(0, ) - exception Out of present range. + exception Out of present range code 8002000a eqv: -1 idiv: variant_idiv(0, ) - exception Division by zero. + exception Division by zero code 80020012 imp: -1 mod: variant_mod(0, ) - exception Division by zero. + exception Division by zero code 80020012 or: 0 |
