summaryrefslogtreecommitdiff
path: root/ext/standard
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2017-08-24 10:29:44 +0200
committerRemi Collet <remi@php.net>2017-08-24 10:29:44 +0200
commitc449057808d360f0b6e0a42d59cd6743fa9380a8 (patch)
treed015dd03865a753d19685109abbcadc541b47505 /ext/standard
parent1b8a71e7401d5f6d6fb978ec33d4109d33bbd799 (diff)
parentb7e96f8e0ea2c241619ddf38cdde47abb7448823 (diff)
downloadphp-git-c449057808d360f0b6e0a42d59cd6743fa9380a8.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: From documentation, only the sign of returned value is relevant
Diffstat (limited to 'ext/standard')
-rw-r--r--ext/standard/tests/strings/substr_compare.phpt16
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/tests/strings/substr_compare.phpt b/ext/standard/tests/strings/substr_compare.phpt
index c78dfca43e..4f69ee57c5 100644
--- a/ext/standard/tests/strings/substr_compare.phpt
+++ b/ext/standard/tests/strings/substr_compare.phpt
@@ -7,15 +7,15 @@ var_dump(substr_compare("abcde", "df", -2) < 0);
var_dump(substr_compare("abcde", "bc", 1, 2));
var_dump(substr_compare("abcde", "bcg", 1, 2));
var_dump(substr_compare("abcde", "BC", 1, 2, true));
-var_dump(substr_compare("abcde", "bc", 1, 3));
-var_dump(substr_compare("abcde", "cd", 1, 2));
+var_dump(substr_compare("abcde", "bc", 1, 3) > 0);
+var_dump(substr_compare("abcde", "cd", 1, 2) < 0);
var_dump(substr_compare("abcde", "abc", 5, 1));
-var_dump(substr_compare("abcde", "abcdef", -10, 10));
+var_dump(substr_compare("abcde", "abcdef", -10, 10) < 0);
var_dump(substr_compare("abcde", "abc", 0, 0));
var_dump(substr_compare("abcde", -1, 0, NULL, new stdClass));
echo "Test\n";
var_dump(substr_compare("abcde", "abc", 0, -1));
-var_dump(substr_compare("abcde", "abc", -1, NULL, -5));
+var_dump(substr_compare("abcde", "abc", -1, NULL, -5) > 0);
var_dump(substr_compare("abcde", -1, 0, "str", new stdClass));
echo "Done\n";
@@ -25,12 +25,12 @@ bool(true)
int(0)
int(0)
int(0)
-int(1)
-int(-1)
+bool(true)
+bool(true)
Warning: substr_compare(): The start position cannot exceed initial string length in %s on line %d
bool(false)
-int(-1)
+bool(true)
int(0)
Warning: substr_compare() expects parameter 5 to be boolean, object given in %s on line %d
@@ -39,7 +39,7 @@ Test
Warning: substr_compare(): The length must be greater than or equal to zero in %s on line %d
bool(false)
-int(4)
+bool(true)
Warning: substr_compare() expects parameter 4 to be integer, string given in %s on line %d
bool(false)