diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-12 15:47:42 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-12 15:47:42 +0200 |
| commit | b277548ed567caad1b7c9c22bf049b3f31af94a2 (patch) | |
| tree | efb8b63de6cc3592680303446ab5524b19992c04 | |
| parent | 859e3f36f96f2ec755efe0ee69ccf0ed97d844a2 (diff) | |
| download | php-git-b277548ed567caad1b7c9c22bf049b3f31af94a2.tar.gz | |
Fix two 32-bit tests for zpp changes
| -rw-r--r-- | ext/standard/tests/math/bindec_variation1.phpt | 12 | ||||
| -rw-r--r-- | ext/standard/tests/math/hexdec_variation1.phpt | 12 |
2 files changed, 14 insertions, 10 deletions
diff --git a/ext/standard/tests/math/bindec_variation1.phpt b/ext/standard/tests/math/bindec_variation1.phpt index 6041af19dc..307d021d99 100644 --- a/ext/standard/tests/math/bindec_variation1.phpt +++ b/ext/standard/tests/math/bindec_variation1.phpt @@ -73,7 +73,11 @@ $inputs = array( $iterator = 1; foreach($inputs as $input) { echo "\n-- Iteration $iterator --\n"; - var_dump(bindec($input)); + try { + var_dump(bindec($input)); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } $iterator++; }; fclose($fp); @@ -134,9 +138,7 @@ int(0) int(0) -- Iteration 18 -- - -Notice: Array to string conversion in %s on line %d -int(0) +bindec() expects parameter 1 to be string, array given -- Iteration 19 -- int(0) @@ -154,5 +156,5 @@ int(0) int(0) -- Iteration 24 -- -int(%d) +bindec() expects parameter 1 to be string, resource given ===Done=== diff --git a/ext/standard/tests/math/hexdec_variation1.phpt b/ext/standard/tests/math/hexdec_variation1.phpt index 00b11d2b3d..5405c72c8e 100644 --- a/ext/standard/tests/math/hexdec_variation1.phpt +++ b/ext/standard/tests/math/hexdec_variation1.phpt @@ -77,7 +77,11 @@ $inputs = array( $iterator = 1; foreach($inputs as $input) { echo "\n-- Iteration $iterator --\n"; - var_dump(hexdec($input)); + try { + var_dump(hexdec($input)); + } catch (TypeError $e) { + echo $e->getMessage(), "\n"; + } $iterator++; }; fclose($fp); @@ -144,9 +148,7 @@ int(0) int(0) -- Iteration 20 -- - -Notice: Array to string conversion in %s on line %d -int(170) +hexdec() expects parameter 1 to be string, array given -- Iteration 21 -- int(2748) @@ -164,5 +166,5 @@ int(0) int(0) -- Iteration 26 -- -%s +hexdec() expects parameter 1 to be string, resource given ===Done=== |