Update more tests (WIP)

Author: nikic

ext/fileinfo/tests/finfo_file_001.phpt

@@ -16,19 +16,13 @@ try {
 } catch (\ValueError $e) {
     echo $e->getMessage() . \PHP_EOL;
 }
-try {
-    var_dump(finfo_file($fp, NULL));
-} catch (\ValueError $e) {
-    echo $e->getMessage() . \PHP_EOL;
-}
 var_dump(finfo_file($fp, '.'));
 var_dump(finfo_file($fp, '&'));
 
 ?>
 --EXPECTF--
 finfo_file(): Argument #1 ($finfo) must not contain any null bytes
 finfo_file(): Argument #1 ($finfo) cannot be empty
-finfo_file(): Argument #1 ($finfo) cannot be empty
 string(9) "directory"
 
 Warning: finfo_file(&): Failed to open stream: No such file or directory in %s on line %d

ext/ldap/tests/ldap_search_overrides.phpt

@@ -20,7 +20,7 @@ ldap_set_option($link, LDAP_OPT_NETWORK_TIMEOUT, 44);
 
 insert_dummy_data($link, $base);
 var_dump(
-    $result = ldap_search($link, "$base", "(objectClass=person)", array(), null, 111, 22, LDAP_DEREF_NEVER),
+    $result = ldap_search($link, "$base", "(objectClass=person)", array(), 0, 111, 22, LDAP_DEREF_NEVER),
     ldap_get_entries($link, $result)
 );
 var_dump(

ext/mysqli/tests/bug34810.phpt

@@ -12,13 +12,14 @@ class DbConnection {
     public function connect() {
         require_once("connect.inc");
 
-        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+        /* Pass false as $connect_flags cannot be accessed via globals. */
+        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket, false);
         var_dump($link);
 
         $link = mysqli_init();
         var_dump($link);
 
-        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
+        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket, false);
         $mysql->query("DROP TABLE IF EXISTS test_warnings");
         $mysql->query("CREATE TABLE test_warnings (a int not null)");
         $mysql->query("SET sql_mode=''");

ext/mysqli/tests/bug62885.phpt

@@ -12,11 +12,11 @@ if (!$IS_MYSQLND) {
 <?php
 error_reporting(E_ALL);
 $tablica = array();
-$test1 = mysqli_poll($test2, $test3, $tablica, null);
+$test1 = mysqli_poll($test2, $test3, $tablica, 0);
 
 $test2 = array();
 $test2 = array();
-$test1 = mysqli_poll($test2, $test3, $tablica, null);
+$test1 = mysqli_poll($test2, $test3, $tablica, 0);
 echo "okey";
 ?>
 --EXPECTF--

ext/mysqli/tests/mysqli_kill.phpt

@@ -11,9 +11,8 @@ require_once('skipifconnectfailure.inc');
 
     require('table.inc');
 
-    // Zend will cast the NULL to 0
     try {
-        mysqli_kill($link, null);
+        mysqli_kill($link, 0);
     } catch (\ValueError $e) {
         echo $e->getMessage() . \PHP_EOL;
     }

ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt

@@ -35,12 +35,12 @@ if (!function_exists('mysqli_stmt_get_result'))
             printf("[004] It is very unlikely that SHOW ENGINES returns no data, check manually\n");
         } else {
             $found = false;
-            foreach ($engines as $k => $engine)
-                foreach ($engine as $k => $v)
-                    if (stristr($v, 'MyISAM')) {
-                        $found = true;
-                        break;
-                    }
+            foreach ($engines as $engine) {
+                if (stristr($engine[0], 'MyISAM')) {
+                    $found = true;
+                    break;
+                }
+            }
             if (!$found)
                 printf("[005] It is very unlikely that SHOW ENGINES does not show MyISAM, check manually\n");
         }

ext/pdo_dblib/tests/pdo_dblib_quote.phpt

@@ -29,10 +29,12 @@ $db = new PDO($dsn, $user, $pass, [PDO::ATTR_DEFAULT_STR_PARAM => PDO::PARAM_STR
 var_dump($db->getAttribute(PDO::ATTR_DEFAULT_STR_PARAM) === PDO::PARAM_STR_NATL);
 
 ?>
---EXPECT--
+--EXPECTF--
 string(3) "'1'"
 string(2) "''"
 string(4) "'42'"
+
+Deprecated: PDO::quote(): Passing null to parameter of type string is deprecated in %s on line %d
 string(2) "''"
 string(4) "''''"
 string(5) "'foo'"

ext/session/tests/bug69111.phpt

@@ -14,7 +14,7 @@ $sessionName = ini_get('session.name');
 
 $sh->open($savePath, $sessionName);
 $sh->write("foo", "bar");
-var_dump($sh->read(@$id));
+var_dump($sh->read(""));
 ?>
 --EXPECTF--
 Warning: SessionHandler::open(): Session is not active in %s on line 10

ext/sodium/tests/utils.phpt

@@ -7,7 +7,7 @@ Check for libsodium utils
 $a = 'test';
 sodium_memzero($a);
 if ($a !== 'test') {
-  echo strlen($a);
+  var_dump($a);
 } else {
   echo $a;
 }
@@ -107,7 +107,8 @@ try {
 
 ?>
 --EXPECT--
-0
+NULL
+
 bool(true)
 bool(false)
 string(22) "0000810102030405060708"

ext/sqlite3/tests/sqlite3_busyTimeout.phpt

@@ -8,7 +8,6 @@ marcosptf - <[email protected]> - @phpsp - sao paulo - br
 <?php
 require_once(__DIR__ . '/new_db.inc');
 var_dump($db->busyTimeout(0));
-var_dump($db->busyTimeout(null));
 var_dump($db->busyTimeout(-1000));
 var_dump($db->busyTimeout(1000));
 $db->close();
@@ -17,4 +16,3 @@ $db->close();
 bool(true)
 bool(true)
 bool(true)
-bool(true)