Remove bareword fallback for constants

Access to undefined constants will now always result in an Error
exception being thrown.

This required quite a few test changes, because there were many
buggy tests that unintentionally used bareword fallback in combination
with error suppression.

17 files changed, 199 insertions, 243 deletions

diff --git a/ext/standard/tests/array/array_chunk_variation1.phpt b/ext/standard/tests/array/array_chunk_variation1.phpt
index e4437ccf1a..e48f28f8be 100644
--- a/ext/standard/tests/array/array_chunk_variation1.phpt
+++ b/ext/standard/tests/array/array_chunk_variation1.phpt
@@ -59,10 +59,10 @@ $values = array(
 /*20*/  new stdclass(),
 
         // undefined data
-/*21*/  @undefined_var,
+/*21*/  @$undefined_var,
 
         // unset data
-/*22*/  @unset_var
+/*22*/  @$unset_var
 
 );
 
@@ -303,23 +303,23 @@ NULL
 
 -- Iteration 21 --
 
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
 NULL
 
 -- Iteration 22 --
 
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
+Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/array/array_chunk_variation2.phpt b/ext/standard/tests/array/array_chunk_variation2.phpt
index ea6468cd8b..b3f66a005a 100644
--- a/ext/standard/tests/array/array_chunk_variation2.phpt
+++ b/ext/standard/tests/array/array_chunk_variation2.phpt
@@ -62,10 +62,10 @@ $values = array (
 /*21*/  new stdclass(),
 
         // undefined data
-/*22*/  @undefined_var,
+/*22*/  @$undefined_var,
 
         // unset data
-/*23*/  @unset_var
+/*23*/  @$unset_var
 
 );
 
@@ -407,23 +407,23 @@ NULL
 
 -- Iteration 22 --
 
-Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
+Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
+Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
+Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
 NULL
 
 -- Iteration 23 --
 
-Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
+Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
+Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
 NULL
 
-Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d
+Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/array/array_chunk_variation3.phpt b/ext/standard/tests/array/array_chunk_variation3.phpt
index 6492410c66..228490e442 100644
--- a/ext/standard/tests/array/array_chunk_variation3.phpt
+++ b/ext/standard/tests/array/array_chunk_variation3.phpt
@@ -53,10 +53,10 @@ $values = array(
 /*16*/  new stdclass(),
 
         // undefined data
-/*17*/  @undefined_var,
+/*17*/  @$undefined_var,
 
         // unset data
-/*18*/  @unset_var
+/*18*/  @$unset_var
 
 );
 
diff --git a/ext/standard/tests/array/array_diff_ukey_variation10.phpt b/ext/standard/tests/array/array_diff_ukey_variation10.phpt
index 09b4a70237..2f07428c05 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation10.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation10.phpt
@@ -19,9 +19,6 @@ var_dump( array_diff_ukey($array1, $array1, "unknown_function") );
 //function name within single quotes
 var_dump( array_diff_ukey($array1, $array1, 'unknown_function') );
 
-//function name without quotes
-var_dump( array_diff_ukey($array1, $array1, unknown_function) );
-
 ?>
 ===DONE===
 --EXPECTF--
@@ -32,9 +29,4 @@ NULL
 
 Warning: array_diff_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d
 NULL
-
-Warning: Use of undefined constant unknown_function - assumed 'unknown_function' (this will throw an Error in a future version of PHP) in %s on line %d
-
-Warning: array_diff_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d
-NULL
 ===DONE===
diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation9.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation9.phpt
index fc7c526ed1..026d06fd6f 100644
--- a/ext/standard/tests/array/array_intersect_uassoc_variation9.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation9.phpt
@@ -19,8 +19,6 @@ var_dump( array_intersect_uassoc($array1, $array2, "unknown_function") );
 //function name within single quotes
 var_dump( array_intersect_uassoc($array1, $array2, 'unknown_function') );
 
-//function name without quotes
-var_dump( array_intersect_uassoc($array1, $array2, unknown_function) );
 ?>
 ===DONE===
 --EXPECTF--
@@ -31,9 +29,4 @@ NULL
 
 Warning: array_intersect_uassoc() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d
 NULL
-
-Warning: Use of undefined constant unknown_function - assumed 'unknown_function' (this will throw an Error in a future version of PHP) in %s on line %d
-
-Warning: array_intersect_uassoc() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d
-NULL
 ===DONE===
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt
index 122d1e4767..65432379d7 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt
@@ -19,8 +19,6 @@ var_dump( array_intersect_ukey($array1, $array2, "unknown_function") );
 //function name within single quotes
 var_dump( array_intersect_ukey($array1, $array2, 'unknown_function') );
 
-//function name without quotes
-var_dump( array_intersect_ukey($array1, $array2, unknown_function) );
 ?>
 ===DONE===
 --EXPECTF--
@@ -31,9 +29,4 @@ NULL
 
 Warning: array_intersect_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d
 NULL
-
-Warning: Use of undefined constant unknown_function - assumed 'unknown_function' (this will throw an Error in a future version of PHP) in %s on line %d
-
-Warning: array_intersect_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name in %s on line %d
-NULL
 ===DONE===
diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt
index d5547efe95..d4156e3a9c 100644
--- a/ext/standard/tests/array/arsort_variation1.phpt
+++ b/ext/standard/tests/array/arsort_variation1.phpt
@@ -63,10 +63,10 @@ $unexpected_values = array (
   19 => new stdclass(),
 
   // undefined data
-  20 => @undefined_var,
+  20 => @$undefined_var,
 
   // unset data
-  21 => @unset_var,
+  21 => @$unset_var,
 
   // resource variable
   22 => $fp
@@ -99,301 +99,301 @@ echo "Done";
 -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
 -- Iteration 1 --
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 2 --
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 3 --
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 4 --
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, int given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, int given in %s on line %d
 bool(false)
 -- Iteration 5 --
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 -- Iteration 6 --
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 -- Iteration 7 --
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 -- Iteration 8 --
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 -- Iteration 9 --
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, float given in %s on line %d
 bool(false)
 -- Iteration 10 --
 
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 -- Iteration 11 --
 
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 -- Iteration 12 --
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 -- Iteration 13 --
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 -- Iteration 14 --
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 -- Iteration 15 --
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, bool given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d
 bool(false)
 -- Iteration 16 --
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 -- Iteration 17 --
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 -- Iteration 18 --
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 -- Iteration 19 --
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, string given in %s on line %d
 bool(false)
 -- Iteration 20 --
 
-Warning: arsort() expects parameter 1 to be array, object given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, object given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, object given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, object given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, object given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, object given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, object given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, object given in %s on line %d
 bool(false)
 -- Iteration 21 --
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 -- Iteration 22 --
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 -- Iteration 23 --
 
-Warning: arsort() expects parameter 1 to be array, resource given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, resource given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, resource given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, resource given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, resource given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, resource given in %s on line %d
 bool(false)
 
-Warning: arsort() expects parameter 1 to be array, resource given in %sarsort_variation1.php on line %d
+Warning: arsort() expects parameter 1 to be array, resource given in %s on line %d
 bool(false)
 Done
diff --git a/ext/standard/tests/array/arsort_variation2.phpt b/ext/standard/tests/array/arsort_variation2.phpt
index e6674774ee..b2c4385d6e 100644
--- a/ext/standard/tests/array/arsort_variation2.phpt
+++ b/ext/standard/tests/array/arsort_variation2.phpt
@@ -59,10 +59,10 @@ $unexpected_values = array(
 /*16*/ new stdclass(),
 
        // undefined data
-/*17*/ @undefined_var,
+/*17*/ @$undefined_var,
 
        // unset data
-/*18*/ @unset_var,
+/*18*/ @$unset_var,
 
        // resource variable
 /*19*/ $fp
@@ -211,7 +211,7 @@ array(3) {
 }
 -- Iteration 13 --
 
-Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -223,7 +223,7 @@ array(3) {
 }
 -- Iteration 14 --
 
-Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -235,7 +235,7 @@ array(3) {
 }
 -- Iteration 15 --
 
-Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -247,7 +247,7 @@ array(3) {
 }
 -- Iteration 16 --
 
-Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, string given in %s on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -259,7 +259,7 @@ array(3) {
 }
 -- Iteration 17 --
 
-Warning: arsort() expects parameter 2 to be int, object given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, object given in %s on line %d
 bool(false)
 array(3) {
   [1]=>
@@ -270,32 +270,28 @@ array(3) {
   int(45)
 }
 -- Iteration 18 --
-
-Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
-bool(false)
+bool(true)
 array(3) {
+  [3]=>
+  int(45)
   [1]=>
   int(10)
   [2]=>
   int(2)
-  [3]=>
-  int(45)
 }
 -- Iteration 19 --
-
-Warning: arsort() expects parameter 2 to be int, string given in %sarsort_variation2.php on line %d
-bool(false)
+bool(true)
 array(3) {
+  [3]=>
+  int(45)
   [1]=>
   int(10)
   [2]=>
   int(2)
-  [3]=>
-  int(45)
 }
 -- Iteration 20 --
 
-Warning: arsort() expects parameter 2 to be int, resource given in %sarsort_variation2.php on line %d
+Warning: arsort() expects parameter 2 to be int, resource given in %s on line %d
 bool(false)
 array(3) {
   [1]=>
diff --git a/ext/standard/tests/array/asort_variation1.phpt b/ext/standard/tests/array/asort_variation1.phpt
index 4594a3d171..efc109d28f 100644
--- a/ext/standard/tests/array/asort_variation1.phpt
+++ b/ext/standard/tests/array/asort_variation1.phpt
@@ -63,10 +63,10 @@ $unexpected_values = array (
   19 => new stdclass(),
 
   // undefined data
-  20 => @undefined_var,
+  20 => @$undefined_var,
 
   // unset data
-  21 => @unset_var,
+  21 => @$unset_var,
 
   // resource variable
   22 => $fp
@@ -359,29 +359,29 @@ Warning: asort() expects parameter 1 to be array, object given in %s on line %d
 bool(false)
 -- Iteration 21 --
 
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
+Warning: asort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
+Warning: asort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
+Warning: asort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
+Warning: asort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 -- Iteration 22 --
 
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
+Warning: asort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
+Warning: asort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
+Warning: asort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
+Warning: asort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 -- Iteration 23 --
 
diff --git a/ext/standard/tests/array/asort_variation2.phpt b/ext/standard/tests/array/asort_variation2.phpt
index e8dda190df..a3960cfddd 100644
--- a/ext/standard/tests/array/asort_variation2.phpt
+++ b/ext/standard/tests/array/asort_variation2.phpt
@@ -59,10 +59,10 @@ $unexpected_values = array(
 /*16*/ new stdclass(),
 
        // undefined data
-/*17*/ @undefined_var,
+/*17*/ @$undefined_var,
 
        // unset data
-/*18*/ @unset_var,
+/*18*/ @$unset_var,
 
        // resource variable
 /*19*/ $fp
@@ -270,26 +270,22 @@ array(3) {
   int(45)
 }
 -- Iteration 18 --
-
-Warning: asort() expects parameter 2 to be int, string given in %s on line %d
-bool(false)
+bool(true)
 array(3) {
-  [1]=>
-  int(10)
   [2]=>
   int(2)
+  [1]=>
+  int(10)
   [3]=>
   int(45)
 }
 -- Iteration 19 --
-
-Warning: asort() expects parameter 2 to be int, string given in %s on line %d
-bool(false)
+bool(true)
 array(3) {
-  [1]=>
-  int(10)
   [2]=>
   int(2)
+  [1]=>
+  int(10)
   [3]=>
   int(45)
 }
diff --git a/ext/standard/tests/array/count_recursive.phpt b/ext/standard/tests/array/count_recursive.phpt
index 175cfe7118..6d81c16621 100644
--- a/ext/standard/tests/array/count_recursive.phpt
+++ b/ext/standard/tests/array/count_recursive.phpt
@@ -117,7 +117,7 @@ var_dump( count() );  // No. of args = 0
 var_dump( count(array(), COUNT_NORMAL, 100) );  // No. of args > expected
 
 /* Testing Invalid type arguments */
-var_dump( count("string", ABCD) );
+var_dump( count("string", "ABCD") );
 var_dump( count(100, "string") );
 var_dump( count(array(), "") );
 
@@ -237,8 +237,6 @@ NULL
 Warning: count() expects at most 2 parameters, 3 given in %s on line %d
 NULL
 
-Warning: Use of undefined constant ABCD - assumed 'ABCD' (this will throw an Error in a future version of PHP) in %s on line %d
-
 Warning: count() expects parameter 2 to be int, %s given in %s on line %d
 NULL
 
diff --git a/ext/standard/tests/array/krsort_variation1.phpt b/ext/standard/tests/array/krsort_variation1.phpt
index 8b44de314e..aaba5b91ce 100644
--- a/ext/standard/tests/array/krsort_variation1.phpt
+++ b/ext/standard/tests/array/krsort_variation1.phpt
@@ -62,10 +62,10 @@ $unexpected_values = array (
 /*19*/  new stdclass(),
 
         // undefined data
-/*20*/  @undefined_var,
+/*20*/  @$undefined_var,
 
         // unset data
-/*21*/  @unset_var,
+/*21*/  @$unset_var,
 
         // resource variable
 /*22*/  $fp
@@ -357,29 +357,29 @@ Warning: krsort() expects parameter 1 to be array, object given in %s on line %d
 bool(false)
 -- Iteration 21 --
 
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 -- Iteration 22 --
 
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
+Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 -- Iteration 23 --
 
diff --git a/ext/standard/tests/array/krsort_variation2.phpt b/ext/standard/tests/array/krsort_variation2.phpt
index 95080b5507..303a9a1eb6 100644
--- a/ext/standard/tests/array/krsort_variation2.phpt
+++ b/ext/standard/tests/array/krsort_variation2.phpt
@@ -58,10 +58,10 @@ $unexpected_values = array (
 /*16*/ new stdclass(),
 
        // undefined data
-/*17*/ @undefined_var,
+/*17*/ @$undefined_var,
 
        // unset data
-/*18*/ @unset_var,
+/*18*/ @$unset_var,
 
        // resource variable
 /*19*/ $fp
@@ -269,28 +269,24 @@ array(3) {
   int(45)
 }
 -- Iteration 18 --
-
-Warning: krsort() expects parameter 2 to be int, string given in %s on line %d
-bool(false)
+bool(true)
 array(3) {
+  [45]=>
+  int(45)
   [10]=>
   int(10)
   [2]=>
   int(2)
-  [45]=>
-  int(45)
 }
 -- Iteration 19 --
-
-Warning: krsort() expects parameter 2 to be int, string given in %s on line %d
-bool(false)
+bool(true)
 array(3) {
+  [45]=>
+  int(45)
   [10]=>
   int(10)
   [2]=>
   int(2)
-  [45]=>
-  int(45)
 }
 -- Iteration 20 --
 
diff --git a/ext/standard/tests/array/ksort_variation1.phpt b/ext/standard/tests/array/ksort_variation1.phpt
index 185fac760c..87de1647d7 100644
--- a/ext/standard/tests/array/ksort_variation1.phpt
+++ b/ext/standard/tests/array/ksort_variation1.phpt
@@ -61,10 +61,10 @@ $unexpected_values = array (
 /*19*/  new stdclass(),
 
         // undefined data
-/*20*/  @undefined_var,
+/*20*/  @$undefined_var,
 
         // unset data
-/*21*/  @unset_var,
+/*21*/  @$unset_var,
 
         // resource variable
 /*22*/  $fp
@@ -357,29 +357,29 @@ Warning: ksort() expects parameter 1 to be array, object given in %s on line %d
 bool(false)
 -- Iteration 21 --
 
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 -- Iteration 22 --
 
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
+Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 -- Iteration 23 --
 
diff --git a/ext/standard/tests/array/ksort_variation2.phpt b/ext/standard/tests/array/ksort_variation2.phpt
index c80541ea27..83130d543e 100644
--- a/ext/standard/tests/array/ksort_variation2.phpt
+++ b/ext/standard/tests/array/ksort_variation2.phpt
@@ -58,10 +58,10 @@ $unexpected_values = array (
 /*16*/ new stdclass(),
 
        // undefined data
-/*17*/ @undefined_var,
+/*17*/ @$undefined_var,
 
        // unset data
-/*18*/ @unset_var,
+/*18*/ @$unset_var,
 
        // resource variable
 /*19*/ $fp
@@ -269,26 +269,22 @@ array(3) {
   int(45)
 }
 -- Iteration 18 --
-
-Warning: ksort() expects parameter 2 to be int, string given in %s on line %d
-bool(false)
+bool(true)
 array(3) {
-  [10]=>
-  int(10)
   [2]=>
   int(2)
+  [10]=>
+  int(10)
   [45]=>
   int(45)
 }
 -- Iteration 19 --
-
-Warning: ksort() expects parameter 2 to be int, string given in %s on line %d
-bool(false)
+bool(true)
 array(3) {
-  [10]=>
-  int(10)
   [2]=>
   int(2)
+  [10]=>
+  int(10)
   [45]=>
   int(45)
 }
diff --git a/ext/standard/tests/array/sort_variation1.phpt b/ext/standard/tests/array/sort_variation1.phpt
index 9eca22c680..e8365ea131 100644
--- a/ext/standard/tests/array/sort_variation1.phpt
+++ b/ext/standard/tests/array/sort_variation1.phpt
@@ -63,10 +63,10 @@ $unexpected_values = array (
 /*20*/ new stdclass(),
 
        // undefined data
-/*21*/ @undefined_var,
+/*21*/ @$undefined_var,
 
        // unset data
-/*22*/ @unset_var,
+/*22*/ @$unset_var,
 
        // resource variable
 /*23*/ $fp
@@ -358,29 +358,29 @@ Warning: sort() expects parameter 1 to be array, object given in %s on line %d
 bool(false)
 -- Iteration 21 --
 
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
+Warning: sort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
+Warning: sort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
+Warning: sort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
+Warning: sort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 -- Iteration 22 --
 
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
+Warning: sort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
+Warning: sort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
+Warning: sort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
+Warning: sort() expects parameter 1 to be array, null given in %s on line %d
 bool(false)
 -- Iteration 23 --
 
diff --git a/ext/standard/tests/array/sort_variation2.phpt b/ext/standard/tests/array/sort_variation2.phpt
index 02e6af21af..ee0e4b8b17 100644
--- a/ext/standard/tests/array/sort_variation2.phpt
+++ b/ext/standard/tests/array/sort_variation2.phpt
@@ -58,10 +58,10 @@ $unexpected_values = array(
 /*16*/ new stdclass(),
 
        // undefined data
-/*17*/ @undefined_var,
+/*17*/ @$undefined_var,
 
        // unset data
-/*18*/ @unset_var,
+/*18*/ @$unset_var,
 
        // resource variable
 /*19*/ $fp
@@ -273,26 +273,22 @@ array(3) {
   int(45)
 }
 -- Iteration 18 --
-
-Warning: sort() expects parameter 2 to be int, string given in %s on line %d
-bool(false)
+bool(true)
 array(3) {
   [0]=>
-  int(10)
-  [1]=>
   int(2)
+  [1]=>
+  int(10)
   [2]=>
   int(45)
 }
 -- Iteration 19 --
-
-Warning: sort() expects parameter 2 to be int, string given in %s on line %d
-bool(false)
+bool(true)
 array(3) {
   [0]=>
-  int(10)
-  [1]=>
   int(2)
+  [1]=>
+  int(10)
   [2]=>
   int(45)
 }