Update more tests (WIP)

Author: nikic

ext/dba/tests/dba_handlers.phpt

@@ -31,7 +31,7 @@ check(dba_handlers());
 
 echo "Test 2\n";
 
-check(dba_handlers(null));
+check(dba_handlers(false));
 
 echo "Test 3\n";
 

ext/hash/tests/hash_init_error.phpt

@@ -37,7 +37,7 @@ catch (\Error $e) {
 
 
 ?>
---EXPECT--
+--EXPECTF--
 *** Testing hash_init(): error conditions ***
 
 -- Testing hash_init() function with unknown algorithms --
@@ -48,4 +48,6 @@ hash_init(): Argument #1 ($algo) must be a cryptographic hashing algorithm if HM
 
 -- Testing hash_init() function with HASH_HMAC and no key --
 hash_init(): Argument #3 ($key) cannot be empty when HMAC is requested
+
+Deprecated: hash_init(): Passing null to parameter of type string is deprecated in %s on line %d
 hash_init(): Argument #3 ($key) cannot be empty when HMAC is requested

ext/iconv/tests/iconv_mime_decode-charset-length-cve-2007-4840.phpt

@@ -5,7 +5,7 @@ iconv_mime_decode() charset parameter length checks (CVE-2007-4840)
 --FILE--
 <?php
 $a = str_repeat("/", 9000000);
-var_dump(iconv_mime_decode("a", null, $a));
+var_dump(iconv_mime_decode("a", 0, $a));
 ?>
 --EXPECTF--
 Warning: iconv_mime_decode(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d

ext/iconv/tests/iconv_mime_decode_headers-charset-length-cve-2007-4840.phpt

@@ -5,7 +5,7 @@ iconv_mime_decode_headers() charset parameter length checks (CVE-2007-4840)
 --FILE--
 <?php
 $a = str_repeat("/", 9000000);
-var_dump(iconv_mime_decode_headers("a", null, $a));
+var_dump(iconv_mime_decode_headers("a", 0, $a));
 ?>
 --EXPECTF--
 Warning: iconv_mime_decode_headers(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d

ext/imap/tests/bug45705_1.phpt

@@ -9,7 +9,7 @@ extension_loaded('imap') or die('skip imap extension not available in this build
 
 $address = 'John Doe <john@example.com>';
 var_dump($address);
-imap_rfc822_parse_adrlist($address, null);
+imap_rfc822_parse_adrlist($address, '');
 var_dump($address);
 
 ?>

ext/json/tests/001.phpt

@@ -31,6 +31,8 @@ NULL
 NULL
 NULL
 NULL
+
+Deprecated: json_decode(): Passing null to parameter of type string is deprecated in %s on line %d
 NULL
 object(stdClass)#%d (1) {
   ["test"]=>

ext/json/tests/bug69187.phpt

@@ -2,8 +2,6 @@
 Bug #69187 json_last_error return BC in PHP7
 --FILE--
 <?php
-var_dump(json_decode(NULL));
-var_dump(json_last_error());
 var_dump(json_decode(FALSE));
 var_dump(json_last_error());
 var_dump(json_decode(""));
@@ -33,8 +31,6 @@ NULL
 int(4)
 NULL
 int(4)
-NULL
-int(4)
 int(0)
 int(0)
 int(1)

ext/json/tests/bug72069.phpt

@@ -3,14 +3,14 @@ Bug #72069 (Behavior \JsonSerializable different from json_encode)
 --FILE--
 <?php
 
-$result = json_encode(['end' => json_decode(null, true)]);
+$result = json_encode(['end' => json_decode('', true)]);
 var_dump($result);
 
 class A implements \JsonSerializable
 {
     function jsonSerialize()
     {
-        return ['end' => json_decode(null, true)];
+        return ['end' => json_decode('', true)];
     }
 }
 $a = new A();

ext/ldap/tests/ldap_escape_filter.phpt

@@ -7,7 +7,7 @@ ldap_escape() test filter
 
 $subject = 'foo=bar(baz)*';
 
-var_dump(ldap_escape($subject, null, LDAP_ESCAPE_FILTER));
+var_dump(ldap_escape($subject, '', LDAP_ESCAPE_FILTER));
 
 ?>
 --EXPECT--

ext/openssl/tests/openssl_decrypt_ccm.phpt

@@ -24,7 +24,7 @@ foreach ($methods as $method) {
 
 // no IV
 var_dump(openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA,
-    NULL, $test['tag'], $test['aad']));
+    '', $test['tag'], $test['aad']));
 // failed because no AAD
 var_dump(openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA,
     $test['iv'], $test['tag']));

ext/openssl/tests/openssl_decrypt_gcm.phpt

@@ -22,7 +22,7 @@ foreach ($tests as $idx => $test) {
 
 // no IV
 var_dump(openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA,
-    NULL, $test['tag'], $test['aad']));
+    '', $test['tag'], $test['aad']));
 // failed because no AAD
 var_dump(openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA,
     $test['iv'], $test['tag']));

ext/openssl/tests/openssl_decrypt_ocb.phpt

@@ -22,7 +22,7 @@ foreach ($tests as $idx => $test) {
 
 // no IV
 var_dump(openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA,
-	NULL, $test['tag'], $test['aad']));
+	'', $test['tag'], $test['aad']));
 
 // IV too long
 var_dump(openssl_decrypt($test['ct'], $method, $test['key'], OPENSSL_RAW_DATA,

ext/openssl/tests/openssl_encrypt_ccm.phpt

@@ -24,7 +24,7 @@ foreach ($methods as $method) {
 }
 
 // Empty IV error
-var_dump(openssl_encrypt('data', $method, 'password', 0, NULL, $tag, ''));
+var_dump(openssl_encrypt('data', $method, 'password', 0, '', $tag, ''));
 
 // Test setting different IV length and tag length
 var_dump(openssl_encrypt('data', $method, 'password', 0, str_repeat('x', 10), $tag, '', 14));

ext/openssl/tests/openssl_encrypt_gcm.phpt

@@ -22,7 +22,7 @@ foreach ($tests as $idx => $test) {
 }
 
 // Empty IV error
-var_dump(openssl_encrypt('data', $method, 'password', 0, NULL, $tag, ''));
+var_dump(openssl_encrypt('data', $method, 'password', 0, '', $tag, ''));
 
 // Failing to retrieve tag (max is 16 bytes)
 var_dump(openssl_encrypt('data', $method, 'password', 0, str_repeat('x', 32), $tag, '', 20));

ext/openssl/tests/openssl_encrypt_ocb.phpt

@@ -22,7 +22,7 @@ foreach ($tests as $idx => $test) {
 }
 
 // Empty IV error
-var_dump(openssl_encrypt('data', $method, 'password', 0, NULL, $tag, ''));
+var_dump(openssl_encrypt('data', $method, 'password', 0, '', $tag, ''));
 
 // Failing to retrieve tag (must be at most 16 bytes)
 var_dump(openssl_encrypt('data', $method, 'password', 0, str_repeat('x', 12), $tag, '', 20));

ext/openssl/tests/openssl_x509_export_basic.phpt

@@ -29,9 +29,9 @@ if (PHP_EOL !== "\n") {
 
 var_dump(strcmp($output, $a));
 var_dump(strcmp($output, $output2));
-var_dump(strcmp($output, $output3));
-var_dump(strcmp($output, $output4)); // different
-var_dump(strcmp($output, $output5)); // different
+var_dump(strcmp($output, $output4));
+var_dump($output3);
+var_dump($output5);
 ?>
 --EXPECTF--
 bool(true)
@@ -44,5 +44,5 @@ openssl_x509_export(): Argument #1 ($certificate) must be of type OpenSSLCertifi
 int(0)
 int(0)
 int(%d)
-int(0)
-int(%d)
+NULL
+NULL

ext/posix/tests/posix_initgroups.phpt

@@ -8,7 +8,7 @@ if (!function_exists('posix_initgroups')) die('skip posix_initgroups() not found
 --FILE--
 <?php
 
-var_dump(posix_initgroups(NULL, NULL));
+var_dump(posix_initgroups('', 0));
 
 ?>
 --EXPECT--

ext/posix/tests/posix_mknod.phpt

@@ -8,7 +8,7 @@ if (!function_exists('posix_mknod')) die('skip posix_mknod() not found');
 --FILE--
 <?php
 
-var_dump(posix_mknod(NULL, NULL, NULL, NULL));
+var_dump(posix_mknod('', 0, 0, 0));
 
 ?>
 --EXPECT--

ext/posix/tests/posix_mknod_basic.phpt

@@ -16,7 +16,6 @@ $name = tempnam('/tmp', 'readline.tmp');
 readline_add_history('foo');
 readline_add_history('');
 readline_add_history(1);
-readline_add_history(NULL);
 readline_write_history($name);
 
 var_dump(file_get_contents($name));
@@ -25,9 +24,8 @@ unlink($name);
 
 ?>
 --EXPECT--
-string(21) "_HiStOrY_V2_
+string(20) "_HiStOrY_V2_
 foo
 
 1
-
 "

ext/readline/tests/libedit_write_history_001.phpt

@@ -7,7 +7,7 @@ readline_add_history(): Basic test
 
 var_dump(readline_add_history('foo'));
 var_dump(readline_list_history());
-var_dump(readline_add_history(NULL));
+var_dump(readline_add_history(''));
 var_dump(readline_list_history());
 var_dump(readline_clear_history());
 

ext/readline/tests/readline_add_history_001.phpt

@@ -45,8 +45,10 @@ try {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
 ReflectionClass::__construct() expects exactly 1 argument, 0 given
+
+Deprecated: ReflectionClass::__construct(): Passing null to parameter of type string is deprecated in %s on line %d
 Class "" does not exist
 Class "1" does not exist
 Class "1" does not exist

ext/reflection/tests/ReflectionClass_constructor_002.phpt

@@ -8,7 +8,6 @@ class C {
 
 $rc = new ReflectionClass("C");
 echo "Check invalid params:\n";
-var_dump($rc->getConstant(null));
 var_dump($rc->getConstant(1));
 var_dump($rc->getConstant(1.5));
 var_dump($rc->getConstant(true));
@@ -18,4 +17,3 @@ Check invalid params:
 bool(false)
 bool(false)
 bool(false)
-bool(false)

ext/reflection/tests/ReflectionClass_getConstant_error.phpt

@@ -54,10 +54,12 @@ try {
 
 
 ?>
---EXPECT--
+--EXPECTF--
 Check invalid params:
 ReflectionClass::getMethod() expects exactly 1 argument, 0 given
 ReflectionClass::getMethod() expects exactly 1 argument, 2 given
+
+Deprecated: ReflectionClass::getMethod(): Passing null to parameter of type string is deprecated in %s on line %d
 Method C::() does not exist
 Method C::1() does not exist
 Method C::1.5() does not exist

ext/reflection/tests/ReflectionClass_getMethod_002.phpt

@@ -52,10 +52,12 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---EXPECT--
+--EXPECTF--
 Check invalid params:
 ReflectionClass::getProperty() expects exactly 1 argument, 0 given
 ReflectionClass::getProperty() expects exactly 1 argument, 2 given
+
+Deprecated: ReflectionClass::getProperty(): Passing null to parameter of type string is deprecated in %s on line %d
 Property C::$ does not exist
 Property C::$1 does not exist
 Property C::$1.5 does not exist

ext/reflection/tests/ReflectionClass_getProperty_002.phpt

@@ -38,9 +38,11 @@ try {
 
 
 ?>
---EXPECT--
+--EXPECTF--
 ReflectionClass::getStaticPropertyValue() expects at most 2 arguments, 3 given
 ReflectionClass::getStaticPropertyValue() expects at least 1 argument, 0 given
+
+Deprecated: ReflectionClass::getStaticPropertyValue(): Passing null to parameter of type string is deprecated in %s on line %d
 Property C::$ does not exist
 string(3) "def"
 ReflectionClass::getStaticPropertyValue(): Argument #1 ($name) must be of type string, array given

ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt

@@ -11,7 +11,6 @@ class C {
 
 $rc = new ReflectionClass("C");
 echo "Check invalid params:\n";
-var_dump($rc->hasConstant(null));
 var_dump($rc->hasConstant(1));
 var_dump($rc->hasConstant(1.5));
 var_dump($rc->hasConstant(true));
@@ -21,4 +20,3 @@ Check invalid params:
 bool(false)
 bool(false)
 bool(false)
-bool(false)

ext/reflection/tests/ReflectionClass_hasConstant_002.phpt

@@ -11,7 +11,6 @@ class C {
 
 $rc = new ReflectionClass("C");
 echo "Check invalid params:\n";
-var_dump($rc->hasMethod(null));
 var_dump($rc->hasMethod(1));
 var_dump($rc->hasMethod(1.5));
 var_dump($rc->hasMethod(true));
@@ -21,4 +20,3 @@ Check invalid params:
 bool(false)
 bool(false)
 bool(false)
-bool(false)

ext/reflection/tests/ReflectionClass_hasMethod_002.phpt

@@ -11,7 +11,6 @@ class C {
 
 $rc = new ReflectionClass("C");
 echo "Check invalid params:\n";
-var_dump($rc->hasProperty(null));
 var_dump($rc->hasProperty(1));
 var_dump($rc->hasProperty(1.5));
 var_dump($rc->hasProperty(true));
@@ -21,4 +20,3 @@ Check invalid params:
 bool(false)
 bool(false)
 bool(false)
-bool(false)

ext/reflection/tests/ReflectionClass_hasProperty_002.phpt

@@ -65,7 +65,7 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---EXPECT--
+--EXPECTF--
 Does A implement A?
    - Using object argument: A is not an interface
    - Using string argument: A is not an interface
@@ -146,6 +146,8 @@ Does I2 implement I2?
 Test bad arguments:
 ReflectionClass::implementsInterface() expects exactly 1 argument, 0 given
 ReflectionClass::implementsInterface() expects exactly 1 argument, 2 given
+
+Deprecated: ReflectionClass::implementsInterface(): Passing null to parameter of type string is deprecated in %s on line %d
 Interface "" does not exist
 Interface "ThisClassDoesNotExist" does not exist
 Interface "2" does not exist

ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt

@@ -35,10 +35,12 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---EXPECT--
+--EXPECTF--
 Test bad arguments:
 ReflectionClass::isSubclassOf() expects exactly 1 argument, 0 given
 ReflectionClass::isSubclassOf() expects exactly 1 argument, 2 given
+
+Deprecated: ReflectionClass::isSubclassOf(): Passing null to parameter of type string is deprecated in %s on line %d
 Class "" does not exist
 Class "ThisClassDoesNotExist" does not exist
 Class "2" does not exist

ext/reflection/tests/ReflectionClass_isSubclassOf_002.phpt

@@ -43,10 +43,12 @@ try {
 
 
 ?>
---EXPECT--
+--EXPECTF--
 ReflectionClass::setStaticPropertyValue() expects exactly 2 arguments, 3 given
 ReflectionClass::setStaticPropertyValue() expects exactly 2 arguments, 0 given
 ReflectionClass::setStaticPropertyValue() expects exactly 2 arguments, 1 given
+
+Deprecated: ReflectionClass::setStaticPropertyValue(): Passing null to parameter of type string is deprecated in %s on line %d
 Class C does not have a property named 
 Class C does not have a property named 1.5
 ReflectionClass::setStaticPropertyValue(): Argument #1 ($name) must be of type string, array given