better output matching/fixes

5 files changed, 216 insertions, 193 deletions

diff --git a/ext/standard/tests/strings/strncmp_basic.phpt b/ext/standard/tests/strings/strncmp_basic.phpt
index c0a6bb2532..317039859f 100644
--- a/ext/standard/tests/strings/strncmp_basic.phpt
+++ b/ext/standard/tests/strings/strncmp_basic.phpt
@@ -7,17 +7,40 @@ Test strncmp() function : basic functionality
  * Source code: Zend/zend_builtin_functions.c
 */
 
-/* Test strncmp() function with all three arguments */
+echo "*** Testing strncmp() function: basic functionality ***\n";
 
-echo "*** Test strncmp() function: basic functionality ***\n";
+echo "-- Testing strncmp() with single quoted string --\n";
+var_dump( strncmp('Hello', 'Hello', 5) );  //expected: int(0)
+var_dump( strncmp('Hello', 'Hi', 5) );  //expected: value < 0
+var_dump( strncmp('Hi', 'Hello', 5) );  //expected: value > 0
+
+echo "-- Testing strncmp() with double quoted string --\n";
 var_dump( strncmp("Hello", "Hello", 5) );  //expected: int(0)
-var_dump( strncmp("Hello", "Hi", 5) );  //expected: int(-1)
-var_dump( strncmp("Hi", "Hello", 5) );  //expected: int(1)
+var_dump( strncmp("Hello", "Hi", 5) );  //expected: value < 0
+var_dump( strncmp("Hi", "Hello", 5) );  //expected: value > 0
+
+echo "-- Testing strncmp() with here-doc string --\n";
+$str = <<<HEREDOC
+Hello
+HEREDOC;
+var_dump( strncmp($str, "Hello", 5) );  //expected: int(0)
+var_dump( strncmp($str, "Hi", 5) );  //expected: value < 0
+var_dump( strncmp("Hi", $str, 5) );  //expected: value > 0
+
 echo "*** Done ***";
 ?>
---EXPECTF--
-*** Test strncmp() function: basic functionality ***
-int(0)
-int(-1)
-int(1)
-*** Done ***
+--EXPECTREGEX--
+\*\*\* Testing strncmp\(\) function: basic functionality \*\*\*
+-- Testing strncmp\(\) with single quoted string --
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\([1-9][0-9]*\)
+-- Testing strncmp\(\) with double quoted string --
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\([1-9][0-9]*\)
+-- Testing strncmp\(\) with here-doc string --
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\([1-9][0-9]*\)
+\*\*\* Done \*\*\*
diff --git a/ext/standard/tests/strings/strncmp_variation1.phpt b/ext/standard/tests/strings/strncmp_variation1.phpt
index 9617f0e913..2fc3c3d4c7 100644
--- a/ext/standard/tests/strings/strncmp_variation1.phpt
+++ b/ext/standard/tests/strings/strncmp_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strncmp() function: usage variations - different inputs(alphabet characters)
+Test strncmp() function: usage variations - case-sensitivity
 --FILE--
 <?php
 /* Prototype  : int strncmp ( string $str1, string $str2, int $len );
@@ -9,127 +9,127 @@ Test strncmp() function: usage variations - different inputs(alphabet characters
 
 /* Test strncmp() function with upper-case and lower-case alphabets as inputs for 'str1' and 'str2' */
 
-echo "*** Test strncmp() function: with chars ***\n";
+echo "*** Test strncmp() function: with alphabets ***\n";
 echo "-- Passing upper-case letters for 'str1' --\n";
 for($ASCII = 65; $ASCII <= 90; $ASCII++) {
   var_dump( strncmp( chr($ASCII), chr($ASCII), 1 ) );  //comparing uppercase letters with uppercase letters; exp: int(0)
-  var_dump( strncmp( chr($ASCII), chr($ASCII + 32), 1 ) );  //comparing uppercase letters with lowercase letters; exp: int(-1)
+  var_dump( strncmp( chr($ASCII), chr($ASCII + 32), 1 ) );  //comparing uppercase letters with lowercase letters; exp: value < 0
 }
 
 echo "\n-- Passing lower-case letters for 'str1' --\n";
 for($ASCII = 97; $ASCII <= 122; $ASCII++) {
   var_dump( strncmp( chr($ASCII), chr($ASCII), 1 ) );  //comparing lowercase letters with lowercase letters; exp: int(0)
-  var_dump( strncmp( chr($ASCII), chr($ASCII - 32), 1 ) );  //comparing lowercase letters with uppercase letters; exp: int(1)
+  var_dump( strncmp( chr($ASCII), chr($ASCII - 32), 1 ) );  //comparing lowercase letters with uppercase letters; exp: value > 0
 }
-echo "*** Done ***\n";
+echo "*** Done ***";
 ?>
---EXPECTF--	
-*** Test strncmp() function: with chars ***
+--EXPECTREGEX--	
+\*\*\* Test strncmp\(\) function: with alphabets \*\*\*
 -- Passing upper-case letters for 'str1' --
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
-int(0)
-int(-1)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
 
 -- Passing lower-case letters for 'str1' --
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-int(0)
-int(1)
-*** Done ***
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+\*\*\* Done \*\*\*
diff --git a/ext/standard/tests/strings/strncmp_variation2.phpt b/ext/standard/tests/strings/strncmp_variation2.phpt
index 7fbb5eb5de..3c74522417 100644
--- a/ext/standard/tests/strings/strncmp_variation2.phpt
+++ b/ext/standard/tests/strings/strncmp_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strncmp() function: usage variations - different inputs(double quoted strings)
+Test strncmp() function: usage variations - double quoted strings
 --FILE--
 <?php
 /* Prototype  : int strncmp ( string $str1, string $str2, int $len );
@@ -7,9 +7,9 @@ Test strncmp() function: usage variations - different inputs(double quoted strin
  * Source code: Zend/zend_builtin_functions.c
 */
 
-/* Test strncmp() function with different strings for 'str1', 'str2' and considering case sensitive */
+/* Test strncmp() function with double quoted strings for 'str1', 'str2' */
 
-echo "*** Test strncmp() function: with different input strings ***\n";
+echo "*** Test strncmp() function: with double quoted strings ***\n";
 $strings = array(
   "Hello, World",
   "hello, world",
@@ -28,36 +28,36 @@ for($index1 = 0; $index1 < count($strings); $index1++) {
 }
 echo "*** Done ***\n";
 ?>
---EXPECTF--
-*** Test strncmp() function: with different input strings ***
+--EXPECTREGEX--
+\*\*\* Test strncmp\(\) function: with double quoted strings \*\*\*
 -- Iteration 1 --
-int(0)
-int(-1)
-int(1)
-int(-1)
-int(1)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\([1-9][0-9]*\)
+int\(-[1-9][0-9]*\)
+int\([1-9][0-9]*\)
 -- Iteration 2 --
-int(1)
-int(0)
-int(1)
-int(1)
-int(1)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\([1-9][0-9]*\)
+int\([1-9][0-9]*\)
 -- Iteration 3 --
-int(-1)
-int(-1)
-int(0)
-int(-1)
-int(-1)
+int\(-[1-9][0-9]*\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\(-[1-9][0-9]*\)
 -- Iteration 4 --
-int(1)
-int(-1)
-int(1)
-int(0)
-int(1)
+int\([1-9][0-9]*\)
+int\(-[1-9][0-9]*\)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
 -- Iteration 5 --
-int(-1)
-int(-1)
-int(1)
-int(-1)
-int(0)
-*** Done ***
+int\(-[1-9][0-9]*\)
+int\(-[1-9][0-9]*\)
+int\([1-9][0-9]*\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+\*\*\* Done \*\*\*
diff --git a/ext/standard/tests/strings/strncmp_variation3.phpt b/ext/standard/tests/strings/strncmp_variation3.phpt
index bb25c52688..6a703c7050 100644
--- a/ext/standard/tests/strings/strncmp_variation3.phpt
+++ b/ext/standard/tests/strings/strncmp_variation3.phpt
@@ -7,7 +7,7 @@ Test strncmp() function: usage variations - different lengths
  * Source code: Zend/zend_builtin_functions.c
 */
 
-/* Test strncmp() with various nteger length values including zero and considering case sensitive */
+/* Test strncmp() with various lengths */
 
 echo "*** Test strncmp() function: with different lengths ***\n";
 /* definitions of required variables */
@@ -20,20 +20,20 @@ for($len = strlen($str1); $len >= 0; $len--) {
 }
 echo "*** Done ***\n";
 ?>
---EXPECTF--	
-*** Test strncmp() function: with different lengths ***
-int(-1)
-int(-1)
-int(-1)
-int(-1)
-int(-1)
-int(-1)
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-*** Done ***
+--EXPECTREGEX--
+\*\*\* Test strncmp\(\) function: with different lengths \*\*\*
+int\(-[1-9][0-9]*\)
+int\(-[1-9][0-9]*\)
+int\(-[1-9][0-9]*\)
+int\(-[1-9][0-9]*\)
+int\(-[1-9][0-9]*\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(0\)
+int\(0\)
+int\(0\)
+int\(0\)
+int\(0\)
+int\(0\)
+int\(0\)
+\*\*\* Done \*\*\*
diff --git a/ext/standard/tests/strings/strncmp_variation8.phpt b/ext/standard/tests/strings/strncmp_variation8.phpt
index c033c1092e..bc000d171e 100644
--- a/ext/standard/tests/strings/strncmp_variation8.phpt
+++ b/ext/standard/tests/strings/strncmp_variation8.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strncmp() function: usage variations - different inputs(single quoted strings)
+Test strncmp() function: usage variations - single quoted strings
 --FILE--
 <?php
 /* Prototype  : int strncmp ( string $str1, string $str2, int $len ); 
@@ -7,9 +7,9 @@ Test strncmp() function: usage variations - different inputs(single quoted strin
  * Source code: Zend/zend_builtin_functions.c
 */
 
-/* Test strncmp() function with different strings for 'str1', 'str2' and considering case sensitive */
+/* Test strncmp() function with single quoted strings for 'str1', 'str2' */
 
-echo "*** Test strncmp() function: with different input strings ***\n";
+echo "*** Test strncmp() function: with single quoted strings ***\n";
 $strings = array(
   'Hello, World',
   'hello, world',
@@ -27,26 +27,26 @@ for($index1 = 0; $index1 < count($strings); $index1++) {
 }
 echo "*** Done ***\n";
 ?>
---EXPECTF--
-*** Test strncmp() function: with different input strings ***
+--EXPECTREGEX--
+\*\*\* Test strncmp\(\) function: with single quoted strings \*\*\*
 -- Iteration 1 --
-int(0)
-int(-1)
-int(1)
-int(-1)
+int\(0\)
+int\(-[1-9][0-9]*\)
+int\([1-9][0-9]*\)
+int\(-[1-9][0-9]*\)
 -- Iteration 2 --
-int(1)
-int(0)
-int(1)
-int(1)
+int\([1-9][0-9]*\)
+int\(0\)
+int\([1-9][0-9]*\)
+int\([1-9][0-9]*\)
 -- Iteration 3 --
-int(-1)
-int(-1)
-int(0)
-int(-1)
+int\(-[1-9][0-9]*\)
+int\(-[1-9][0-9]*\)
+int\(0\)
+int\(-[1-9][0-9]*\)
 -- Iteration 4 --
-int(2)
-int(-1)
-int(1)
-int(0)
-*** Done ***
+int\([1-9][0-9]*\)
+int\(-[1-9][0-9]*\)
+int\([1-9][0-9]*\)
+int\(0\)
+\*\*\* Done \*\*\*