MFB: change run-tests.php to add %a

7 files changed, 42 insertions, 40 deletions

diff --git a/ext/bz2/tests/005.phpt b/ext/bz2/tests/005.phpt
index ee45f10f7c..d10f8765e7 100644
--- a/ext/bz2/tests/005.phpt
+++ b/ext/bz2/tests/005.phpt
@@ -38,10 +38,10 @@ var_dump(bzdecompress($data2));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: bzcompress() expects at least 1 parameter, 0 given in %s on line %d
 NULL
-string(%d) "BZ%s"
+string(%d) "BZ%a"
 int(-2)
 int(-2)
 int(-2)
@@ -73,7 +73,7 @@ Done
 --UEXPECTF--
 Warning: bzcompress() expects at least 1 parameter, 0 given in %s on line %d
 NULL
-unicode(%d) "BZ%s"
+unicode(%d) "BZ%a"
 int(-2)
 int(-2)
 int(-2)
diff --git a/ext/standard/tests/general_functions/phpcredits.phpt b/ext/standard/tests/general_functions/phpcredits.phpt
index d7decae148..69515dfe6a 100644
--- a/ext/standard/tests/general_functions/phpcredits.phpt
+++ b/ext/standard/tests/general_functions/phpcredits.phpt
@@ -17,28 +17,28 @@ var_dump(phpcredits(CREDITS_GROUP));
 PHP Credits
 
 PHP Group
-%s
+%a
 
 Language Design & Concept
-%s
+%a
 
 %wPHP Authors%w
-%s
+%a
 
 %wSAPI Modules%w
-%s
+%a
 
 %wModule Authors%w
-%s
+%a
 
 %wPHP Documentation%w
-%s
+%a
 
 PHP Quality Assurance Team
-%s
+%a
 
 PHP Website Team
-%s
+%a
 bool(true)
 
 Warning: phpcredits() expects parameter 1 to be long, array given in %sphpcredits.php on line 4
@@ -50,5 +50,5 @@ bool(true)
 PHP Credits
 
 PHP Group
-%s
+%a
 bool(true)
diff --git a/ext/standard/tests/general_functions/phpinfo.phpt b/ext/standard/tests/general_functions/phpinfo.phpt
index dab7f327c1..32125bfceb 100644
--- a/ext/standard/tests/general_functions/phpinfo.phpt
+++ b/ext/standard/tests/general_functions/phpinfo.phpt
@@ -24,6 +24,7 @@ Configure Command => %s
 Server API => Command Line Interface
 Virtual Directory Support => %s
 Configuration File (php.ini) Path => %s
+Loaded Configuration File => %s
 PHP API => %d
 PHP Extension => %d
 Zend Extension => %d
@@ -35,7 +36,7 @@ Registered PHP Streams => %s
 Registered Stream Socket Transports => %s
 Registered Stream Filters => %s
 
-%s
+%a
  _______________________________________________________________________
 
 
@@ -43,22 +44,22 @@ Configuration
 
 PHP Core
 
-%s
+%a
 
 Additional Modules
 
-%s
+%a
 
 Environment
 
-%s
+%a
 
 PHP Variables
 
-%s
+%a
 
 PHP License
-%s
+%a
 bool(true)
 --
 
@@ -71,5 +72,5 @@ bool(true)
 phpinfo()
 
 PHP License
-%s
+%a
 bool(true)
diff --git a/ext/standard/tests/strings/sha1.phpt b/ext/standard/tests/strings/sha1.phpt
index 0043d27c46..60fb33fd7f 100644
--- a/ext/standard/tests/strings/sha1.phpt
+++ b/ext/standard/tests/strings/sha1.phpt
@@ -44,8 +44,8 @@ bool(true)
 string(40) "da39a3ee5e6b4b0d3255bfef95601890afd80709"
 string(40) "da39a3ee5e6b4b0d3255bfef95601890afd80709"
 bool(true)
-string(20) "%s"
-string(20) "%s"
+string(20) "%a"
+string(20) "%a"
 
 Warning: sha1_file(%ssha1.dat): failed to open stream: No such file or directory in %s on line %d
 Done
diff --git a/ext/zlib/tests/005.phpt b/ext/zlib/tests/005.phpt
index 874f0545d9..5c880f5fe3 100644
--- a/ext/zlib/tests/005.phpt
+++ b/ext/zlib/tests/005.phpt
@@ -33,18 +33,18 @@ var_dump(gzuncompress((binary)$data2));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 
 Warning: gzcompress() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 
 Warning: gzcompress(): compression level (1000) must be within -1..9 in %s on line %d
 bool(false)
-string(%d) "%s"
-string(%d) "%s"
-string(%d) "%s"
-string(%d) "%s"
-string(%d) "%s"
+string(%d) "%a"
+string(%d) "%a"
+string(%d) "%a"
+string(%d) "%a"
+string(%d) "%a"
 
 Warning: gzuncompress() expects at least 1 parameter, 0 given in %s on line %d
 NULL
diff --git a/ext/zlib/tests/006.phpt b/ext/zlib/tests/006.phpt
index c736bb3f71..c51c8323aa 100644
--- a/ext/zlib/tests/006.phpt
+++ b/ext/zlib/tests/006.phpt
@@ -40,11 +40,11 @@ NULL
 
 Warning: gzdeflate(): compression level (1000) must be within -1..9 in %s on line %d
 bool(false)
-string(%d) "%s"
-string(%d) "%s"
-string(%d) "%s"
-string(%d) "%s"
-string(%d) "%s"
+string(%d) "%a"
+string(%d) "%a"
+string(%d) "%a"
+string(%d) "%a"
+string(%d) "%a"
 
 Warning: gzinflate() expects at least 1 parameter, 0 given in %s on line %d
 NULL
diff --git a/run-tests.php b/run-tests.php
index 1d5f4a27e3..c7841765c7 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -1550,14 +1550,15 @@ COMMAND $cmd
 		if (isset($section_text['EXPECTF'])) {
 			$wanted_re = preg_quote($wanted_re, '/');
 			// Stick to basics
-			$wanted_re = str_replace("%e", '\\' . DIRECTORY_SEPARATOR, $wanted_re);
-			$wanted_re = str_replace("%s", ".+?", $wanted_re); //not greedy
-			$wanted_re = str_replace("%w", "\s*", $wanted_re);
-			$wanted_re = str_replace("%i", "[+\-]?[0-9]+", $wanted_re);
-			$wanted_re = str_replace("%d", "[0-9]+", $wanted_re);
-			$wanted_re = str_replace("%x", "[0-9a-fA-F]+", $wanted_re);
-			$wanted_re = str_replace("%f", "[+\-]?\.?[0-9]+\.?[0-9]*(E-?[0-9]+)?", $wanted_re);
-			$wanted_re = str_replace("%c", ".", $wanted_re);
+			$wanted_re = str_replace('%e', '\\' . DIRECTORY_SEPARATOR, $wanted_re);
+			$wanted_re = str_replace('%s', '[^\r\n]+', $wanted_re);
+			$wanted_re = str_replace('%a', '.+', $wanted_re);
+			$wanted_re = str_replace('%w', '\s*', $wanted_re);
+			$wanted_re = str_replace('%i', '[+-]?\d+', $wanted_re);
+			$wanted_re = str_replace('%d', '\d+', $wanted_re);
+			$wanted_re = str_replace('%x', '[0-9a-fA-F]+', $wanted_re);
+			$wanted_re = str_replace('%f', '[+-]?\.?\d+\.?\d*(?:E-?\d+)?', $wanted_re);
+			$wanted_re = str_replace('%c', '.', $wanted_re);
 			// %f allows two points "-.0.0" but that is the best *simple* expression
 		}
 /* DEBUG YOUR REGEX HERE