diff options
Diffstat (limited to 'ext')
29 files changed, 217 insertions, 272 deletions
diff --git a/ext/opcache/Optimizer/compact_literals.c b/ext/opcache/Optimizer/compact_literals.c index 8cc83d2964..8c5702a38d 100644 --- a/ext/opcache/Optimizer/compact_literals.c +++ b/ext/opcache/Optimizer/compact_literals.c @@ -171,7 +171,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx LITERAL_INFO(opline->op1.constant, LITERAL_CONST, 1); break; case ZEND_FETCH_CONSTANT: - if ((opline->op1.num & (IS_CONSTANT_IN_NAMESPACE|IS_CONSTANT_UNQUALIFIED)) == (IS_CONSTANT_IN_NAMESPACE|IS_CONSTANT_UNQUALIFIED)) { + if (opline->op1.num & IS_CONSTANT_UNQUALIFIED_IN_NAMESPACE) { LITERAL_INFO(opline->op2.constant, LITERAL_CONST, 3); } else { LITERAL_INFO(opline->op2.constant, LITERAL_CONST, 2); diff --git a/ext/opcache/Optimizer/zend_dump.c b/ext/opcache/Optimizer/zend_dump.c index ad4d393bd6..b10cc31c9d 100644 --- a/ext/opcache/Optimizer/zend_dump.c +++ b/ext/opcache/Optimizer/zend_dump.c @@ -127,11 +127,8 @@ static void zend_dump_unused_op(const zend_op *opline, znode_op op, uint32_t fla } else if (ZEND_VM_OP_CONSTRUCTOR == (flags & ZEND_VM_OP_MASK)) { fprintf(stderr, " CONSTRUCTOR"); } else if (ZEND_VM_OP_CONST_FETCH == (flags & ZEND_VM_EXT_MASK)) { - if (op.num & IS_CONSTANT_UNQUALIFIED) { - fprintf(stderr, " (unqualified)"); - } - if (op.num & IS_CONSTANT_IN_NAMESPACE) { - fprintf(stderr, " (in-namespace)"); + if (op.num & IS_CONSTANT_UNQUALIFIED_IN_NAMESPACE) { + fprintf(stderr, " (unqualified-in-namespace)"); } } } diff --git a/ext/opcache/tests/bug66251.phpt b/ext/opcache/tests/bug66251.phpt index 64e758065b..42c6e2f606 100644 --- a/ext/opcache/tests/bug66251.phpt +++ b/ext/opcache/tests/bug66251.phpt @@ -13,5 +13,8 @@ const A="hello"; function getA() {return A;} ?> --EXPECTF-- -Warning: Use of undefined constant A - assumed 'A' (this will throw an Error in a future version of PHP) in %sbug66251.php on line 4 -A=A +Fatal error: Uncaught Error: Undefined constant 'A' in %s:%d +Stack trace: +#0 %s(%d): getA() +#1 {main} + thrown in %s on line %d diff --git a/ext/opcache/tests/bug71843.phpt b/ext/opcache/tests/bug71843.phpt index 924fb873fe..0a193425dd 100644 --- a/ext/opcache/tests/bug71843.phpt +++ b/ext/opcache/tests/bug71843.phpt @@ -8,18 +8,15 @@ opcache.optimization_level=0xFFFFBFFF <?php if (!extension_loaded('Zend OPcache')) die("skip"); ?> --FILE-- <?php +define('E', 'E'); +define('R', 'R'); +define('See', 'See'); 0 & ~E & ~R; 6 && ~See ?> okey --EXPECTF-- -Warning: Use of undefined constant E - assumed 'E' (this will throw an Error in a future version of PHP) in %sbug71843.php on line %d - Warning: A non-numeric value encountered in %s on line %d -Warning: Use of undefined constant R - assumed 'R' (this will throw an Error in a future version of PHP) in %sbug71843.php on line %d - Warning: A non-numeric value encountered in %s on line %d - -Warning: Use of undefined constant See - assumed 'See' (this will throw an Error in a future version of PHP) in %sbug71843.php on line %d okey diff --git a/ext/reflection/tests/bug74673.phpt b/ext/reflection/tests/bug74673.phpt index 8e4e8e3a18..07db9a169a 100644 --- a/ext/reflection/tests/bug74673.phpt +++ b/ext/reflection/tests/bug74673.phpt @@ -3,10 +3,6 @@ Bug #74673 (Segfault when cast Reflection object to string with undefined consta --FILE-- <?php -set_error_handler(function() { - throw new Exception(); -}); - class A { public function method($test = PHP_SELF + 1) @@ -19,4 +15,4 @@ $class = new ReflectionClass('A'); echo $class; ?> --EXPECTF-- -Fatal error: Method ReflectionClass::__toString() must not throw an exception, caught Exception: in %sbug74673.php on line %d +Fatal error: Method ReflectionClass::__toString() must not throw an exception, caught Error: Undefined constant 'PHP_SELF' in %s on line %d diff --git a/ext/reflection/tests/bug76536.phpt b/ext/reflection/tests/bug76536.phpt index 9f3b3fdb31..aa32781e16 100644 --- a/ext/reflection/tests/bug76536.phpt +++ b/ext/reflection/tests/bug76536.phpt @@ -2,7 +2,7 @@ Bug #76536 (PHP crashes with core dump when throwing exception in error handler) --FILE-- <?php -class SomeConstants {const SOME_CONSTANT = SOME_NONSENSE;} +class SomeConstants {const SOME_CONSTANT = "foo" % 5; } function handleError() {throw new ErrorException();} 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) } diff --git a/ext/standard/tests/file/bug22414.phpt b/ext/standard/tests/file/bug22414.phpt index abc6e47585..c6e993ac9f 100644 --- a/ext/standard/tests/file/bug22414.phpt +++ b/ext/standard/tests/file/bug22414.phpt @@ -7,7 +7,7 @@ output_handler= $php = getenv('TEST_PHP_EXECUTABLE'); $tmpfile = tempnam(__DIR__, 'phpt'); - $args = ' -n -dsafe_mode=off '; + $args = ' -n '; /* Regular Data Test */ passthru($php . $args . ' -r " echo \"HELLO\"; "'); @@ -17,7 +17,7 @@ output_handler= /* Binary Data Test */ if (substr(PHP_OS, 0, 3) != 'WIN') { - $cmd = $php . $args . ' -r \"readfile(@getenv(\'TEST_PHP_EXECUTABLE\')); \"'; + $cmd = $php . $args . ' -r \"readfile(@getenv(\'\\\'\'TEST_PHP_EXECUTABLE\'\\\'\')); \"'; $cmd = $php . $args . ' -r \' passthru("'.$cmd.'"); \' > '.$tmpfile ; } else { $cmd = $php . $args . ' -r \"readfile(@getenv(\\\\\\"TEST_PHP_EXECUTABLE\\\\\\")); \"'; diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt index db2a881d6c..0da1fc69aa 100644 --- a/ext/standard/tests/file/fscanf_error.phpt +++ b/ext/standard/tests/file/fscanf_error.phpt @@ -38,7 +38,7 @@ var_dump( fscanf($file_handle, "%d%s%f", $int_var, $string_var) ); fclose($file_handle); // different invalid format strings -$invalid_formats = array( $undefined_var, undefined_constant, +$invalid_formats = array( $undefined_var, "%", "%h", "%.", "%d%m" ); @@ -76,10 +76,6 @@ Warning: fscanf(): Different numbers of variable names and field specifiers in % int(-1) Notice: Undefined variable: undefined_var in %s on line %d - -Warning: Use of undefined constant undefined_constant - assumed 'undefined_constant' (this will throw an Error in a future version of PHP) in %s on line %d -array(0) { -} array(0) { } diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt index b1dce294ab..6cb413dc26 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt @@ -102,7 +102,7 @@ $misc_values = array ( @$undef_var, /* mixed types */ - @TRUE123, + "TRUE123", "123string", "string123", "NULLstring" diff --git a/ext/standard/tests/strings/explode.phpt b/ext/standard/tests/strings/explode.phpt index 20c2a25470..84cdcb985f 100644 --- a/ext/standard/tests/strings/explode.phpt +++ b/ext/standard/tests/strings/explode.phpt @@ -16,7 +16,7 @@ var_dump(@explode(NULL, "")); var_dump(@explode("a", "")); var_dump(@explode("a", "a")); var_dump(@explode("a", NULL)); -var_dump(@explode(NULL, a)); +var_dump(@explode(NULL, "a")); var_dump(@explode("abc", "acb")); var_dump(@explode("somestring", "otherstring")); var_dump(@explode("somestring", "otherstring", -1)); diff --git a/ext/standard/tests/strings/lcfirst.phpt b/ext/standard/tests/strings/lcfirst.phpt Binary files differindex d09e51eef5..af17e29ad0 100644 --- a/ext/standard/tests/strings/lcfirst.phpt +++ b/ext/standard/tests/strings/lcfirst.phpt diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt Binary files differindex 66da7a90f3..b430b35eda 100644 --- a/ext/standard/tests/strings/ucfirst.phpt +++ b/ext/standard/tests/strings/ucfirst.phpt |