Cleanup argument handling of Zend functions and methods

Author: kocsismate

Zend/tests/002.phpt

@@ -96,26 +96,26 @@ try {
 echo "Done\n";
 ?>
 --EXPECTF--
-func_get_arg(): Argument #1 ($arg_num) must be greater than or equal to 0
-func_get_arg(): Argument 0 not passed to function
-func_get_arg(): Argument 1 not passed to function
-func_get_arg(): Argument #1 ($arg_num) must be greater than or equal to 0
+func_get_arg(): Argument #1 ($argument_number) must be greater than or equal to 0
+func_get_arg(): Argument #1 ($argument_number) must be less than the number of the arguments passed to the currently executed function
+func_get_arg(): Argument #1 ($argument_number) must be less than the number of the arguments passed to the currently executed function
+func_get_arg(): Argument #1 ($argument_number) must be greater than or equal to 0
 int(10)
-func_get_arg(): Argument 1 not passed to function
+func_get_arg(): Argument #1 ($argument_number) must be less than the number of the arguments passed to the currently executed function
 int(1)
-func_get_arg(): Argument 1 not passed to function
+func_get_arg(): Argument #1 ($argument_number) must be less than the number of the arguments passed to the currently executed function
 Exception: Too few arguments to function test2(), 0 passed in %s002.php on line %d and exactly 1 expected
 int(1)
 int(2)
-func_get_arg(): Argument 2 not passed to function
-func_get_arg(): Argument #1 ($arg_num) must be greater than or equal to 0
-func_get_arg(): Argument 0 not passed to function
-func_get_arg(): Argument 1 not passed to function
+func_get_arg(): Argument #1 ($argument_number) must be less than the number of the arguments passed to the currently executed function
+func_get_arg(): Argument #1 ($argument_number) must be greater than or equal to 0
+func_get_arg(): Argument #1 ($argument_number) must be less than the number of the arguments passed to the currently executed function
+func_get_arg(): Argument #1 ($argument_number) must be less than the number of the arguments passed to the currently executed function
 Exception: Too few arguments to function test3(), 1 passed in %s on line %d and exactly 2 expected
 int(1)
 int(2)
-func_get_arg(): Argument 2 not passed to function
+func_get_arg(): Argument #1 ($argument_number) must be less than the number of the arguments passed to the currently executed function
 int(1)
-func_get_arg(): Argument 1 not passed to function
+func_get_arg(): Argument #1 ($argument_number) must be less than the number of the arguments passed to the currently executed function
 func_get_arg() cannot be called from the global scope
 Done

Zend/tests/004.phpt

@@ -16,7 +16,7 @@ var_dump(strncmp("qwerty", "qwerty123", 7));
 ?>
 --EXPECT--
 int(0)
-strncmp(): Argument #3 ($len) must be greater than or equal to 0
+strncmp(): Argument #3 ($length) must be greater than or equal to 0
 int(0)
 int(0)
 int(-1)

Zend/tests/006.phpt

@@ -19,7 +19,7 @@ var_dump(strncasecmp("01", "01", 1000));
 
 ?>
 --EXPECT--
-strncasecmp(): Argument #3 ($len) must be greater than or equal to 0
+strncasecmp(): Argument #3 ($length) must be greater than or equal to 0
 int(0)
 int(-3)
 int(0)

Zend/tests/008.phpt

@@ -16,7 +16,12 @@ var_dump(define("test const", 3));
 var_dump(define("test const", 3));
 var_dump(define("test", array(1)));
 var_dump(define("test1", fopen(__FILE__, 'r')));
+
+try {
 var_dump(define("test2", new stdclass));
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 
 var_dump(constant(" "));
 var_dump(constant("[[["));
@@ -37,9 +42,7 @@ Notice: Constant test const already defined in %s on line %d
 bool(false)
 bool(true)
 bool(true)
-
-Warning: Constants may only evaluate to scalar values, arrays or resources in %s on line %d
-bool(false)
+define(): Argument #2 ($value) must be of type bool|int|float|string|array|resource|null, stdClass given
 int(1)
 int(2)
 int(3)

Zend/tests/020.phpt

@@ -26,4 +26,4 @@ try {
 ?>
 --EXPECT--
 func_get_arg() cannot be called from the global scope
-func_get_arg(): Argument 1 not passed to function
+func_get_arg(): Argument #1 ($argument_number) must be less than the number of the arguments passed to the currently executed function

Zend/tests/bug37811.phpt

@@ -11,19 +11,23 @@ class TestClass
     }
 }
 
-define("Bar",new TestClass);
+define("Bar", new TestClass);
 var_dump(Bar);
-define("Baz",new stdClass);
-var_dump(Baz);
 
-?>
-===DONE===
---EXPECTF--
-string(3) "Foo"
+try {
+    define("Baz", new stdClass);
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 
-Warning: Constants may only evaluate to scalar values, arrays or resources in %sbug37811.php on line %d
+try {
+    var_dump(Baz);
+} catch (Error $exception) {
+    echo $exception->getMessage() . "\n";
+}
 
-Fatal error: Uncaught Error: Undefined constant "Baz" in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
+?>
+--EXPECT--
+string(3) "Foo"
+define(): Argument #2 ($value) must be of type bool|int|float|string|array|resource|null, stdClass given
+Undefined constant "Baz"

Zend/tests/bug44827.phpt

@@ -2,10 +2,20 @@
 Bug #44827 (define() allows :: in constant names)
 --FILE--
 <?php
-define('foo::bar', 1);
-define('::', 1);
-?>
---EXPECTF--
-Warning: Class constants cannot be defined or redefined in %sbug44827.php on line %d
 
-Warning: Class constants cannot be defined or redefined in %sbug44827.php on line %d
+try {
+    define('foo::bar', 1);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    define('::', 1);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+?>
+--EXPECT--
+define(): Argument #1 ($constant_name) cannot be a class constant
+define(): Argument #1 ($constant_name) cannot be a class constant

Zend/tests/bug72162.phpt

@@ -4,11 +4,12 @@ Bug #72162 (use-after-free - error_reporting)
 <?php
 error_reporting(E_ALL);
 $var11 = new StdClass();
-$var16 = error_reporting($var11);
+
+try {
+    $var16 = error_reporting($var11);
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 ?>
---EXPECTF--
-Fatal error: Uncaught Error: Object of class stdClass could not be converted to string in %s:%d
-Stack trace:
-#0 %s(%d): error_reporting(Object(stdClass))
-#1 {main}
-  thrown in %s on line %d
+--EXPECT--
+error_reporting(): Argument #1 ($error_level) must be of type ?int, stdClass given

Zend/tests/closure_040.phpt

@@ -24,7 +24,12 @@ $a = new A(20);
 $ca = $a->getIncrementor();
 $cas = $a->getStaticIncrementor();
 
-$ca->bindTo($a, array());
+try {
+    $ca->bindTo($a, array());
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
 $cas->bindTo($a, 'A');
 
 ?>

Zend/tests/constant_arrays.phpt

@@ -24,12 +24,21 @@ $y[0] = 3;
 var_dump($x, $y, QUX);
 
 // ensure objects not allowed in arrays
-var_dump(define('ELEPHPANT', [new StdClass]));
+try {
+    define('ELEPHPANT', [new StdClass]);
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 
 // ensure recursion doesn't crash
 $recursive = [];
 $recursive[0] = &$recursive;
-var_dump(define('RECURSION', $recursive));
+
+try {
+    define('RECURSION', $recursive);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 --EXPECTF--
 array(4) {
   [0]=>
@@ -92,9 +101,5 @@ array(1) {
   [0]=>
   int(7)
 }
-
-Warning: Constants may only evaluate to scalar values, arrays or resources in %s on line %d
-bool(false)
-
-Warning: Constants cannot be recursive arrays in %s on line %d
-bool(false)
+define(): Argument #2 ($value) must be of type bool|int|float|string|array|resource|null, stdClass given
+define(): Argument #2 ($value) cannot be a recursive array