diff options
| author | Felipe Pena <felipe@php.net> | 2008-02-01 13:41:19 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-02-01 13:41:19 +0000 |
| commit | 8c76a00f9314b74fcf67cc40cb7431a57c822c3e (patch) | |
| tree | ac7b213fca91d6d0ad4f657a74027fdd6dabe114 | |
| parent | 79cfa91a435f90b976006e5bcaae4f7b4e774df2 (diff) | |
| download | php-git-8c76a00f9314b74fcf67cc40cb7431a57c822c3e.tar.gz | |
New tests and fix tests (new error message)
| -rw-r--r-- | ext/standard/tests/strings/stristr.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/strings/stristr2.phpt | 25 | ||||
| -rw-r--r-- | ext/standard/tests/strings/strstr.phpt | bin | 10369 -> 10353 bytes | |||
| -rw-r--r-- | ext/standard/tests/strings/strstr2.phpt | 40 |
4 files changed, 66 insertions, 1 deletions
diff --git a/ext/standard/tests/strings/stristr.phpt b/ext/standard/tests/strings/stristr.phpt index 51c4dae97c..b11f6ebd9f 100644 --- a/ext/standard/tests/strings/stristr.phpt +++ b/ext/standard/tests/strings/stristr.phpt @@ -19,7 +19,7 @@ stristr() function var_dump(stristr("tEsT sTrInG", " ")); ?> --EXPECTF-- -Warning: Wrong parameter count for stristr() in %s on line %d +Warning: stristr() expects at least 2 parameters, 0 given in %s on line %d NULL Notice: Array to string conversion in %s on line %d diff --git a/ext/standard/tests/strings/stristr2.phpt b/ext/standard/tests/strings/stristr2.phpt new file mode 100644 index 0000000000..4b5ca494ac --- /dev/null +++ b/ext/standard/tests/strings/stristr2.phpt @@ -0,0 +1,25 @@ +--TEST-- +stristr() - New parameter: before_needle +--FILE-- +<?php + +$email = 'AbcCdEfGh'; +var_dump(stristr($email, 'c')); +var_dump(stristr($email, 'c', 1)); + +$email = 'AbCdeEfGh'; +var_dump(stristr($email, 'E')); +var_dump(stristr($email, 'E', 1)); + +$email = 'wazAbCdeEfGh'; +var_dump(stristr($email, 97)); +var_dump(stristr($email, 97, 1)); + +?> +--EXPECT-- +string(7) "cCdEfGh" +string(2) "Ab" +string(5) "eEfGh" +string(4) "AbCd" +string(11) "azAbCdeEfGh" +string(1) "w" diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt Binary files differindex 8c76c65d72..4ae960c61b 100644 --- a/ext/standard/tests/strings/strstr.phpt +++ b/ext/standard/tests/strings/strstr.phpt diff --git a/ext/standard/tests/strings/strstr2.phpt b/ext/standard/tests/strings/strstr2.phpt new file mode 100644 index 0000000000..fadeb10ce3 --- /dev/null +++ b/ext/standard/tests/strings/strstr2.phpt @@ -0,0 +1,40 @@ +--TEST-- +strstr() - New parameter: before_needle +--FILE-- +<?php + +$email = 'aexample.com'; +var_dump(strstr($email, '@')); +var_dump(strstr($email, '@', 1)); +$email = 'a@example.com'; +var_dump(strstr($email, '@')); +var_dump(strstr($email, '@', 1)); +$email = 'asdfasdfas@e'; +var_dump(strstr($email, '@')); +var_dump(strstr($email, '@', 1)); +$email = '@'; +var_dump(strstr($email, '@')); +var_dump(strstr($email, '@', 1)); +$email = 'eE@fF'; +var_dump(strstr($email, 'e')); +var_dump(strstr($email, 'e', 1)); +var_dump(strstr($email, 'E')); +var_dump(strstr($email, 'E', 1)); + +var_dump(strstr('', ' ', '')); + +?> +--EXPECT-- +bool(false) +bool(false) +string(12) "@example.com" +string(1) "a" +string(2) "@e" +string(10) "asdfasdfas" +string(1) "@" +string(0) "" +string(5) "eE@fF" +string(0) "" +string(4) "E@fF" +string(1) "e" +bool(false) |