New tests and fix tests (new error message)

diff --git a/ext/standard/tests/strings/stristr.phpt b/ext/standard/tests/strings/stristr.phpt
index 51c4dae97c16649b8ab83bcb3a9cf047ee7b2bbc..b11f6ebd9f826f4bcec22da3a20c52215686172c 100644 (file)
--- 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 (file)
index 0000000..4b5ca49
--- /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
index 8c76c65d72b662e99002b643aeb406339c690d9e..4ae960c61bd9e275f27facf52d42d0d93b0e2333 100644 (file)
Binary files a/ext/standard/tests/strings/strstr.phpt and b/ext/standard/tests/strings/strstr.phpt differ

diff --git a/ext/standard/tests/strings/strstr2.phpt b/ext/standard/tests/strings/strstr2.phpt
new file mode 100644 (file)
index 0000000..fadeb10
--- /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)