PHPC-1435: Fix test checking invalid argument values

Author: alcaeus

tests/session/session-startTransaction_error-003.phpt

@@ -1,10 +1,11 @@
 --TEST--
-MongoDB\Driver\Session::startTransaction() with wrong argument for options array
+MongoDB\Driver\Session::startTransaction() with wrong argument for options array on PHP 5
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto() ?>
 <?php skip_if_not_replica_set_or_mongos_with_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
+<?php skip_if_php_version('>=', '7.0.0'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
@@ -18,14 +19,17 @@ $options = [
 ];
 
 foreach ($options as $txnOptions) {
-    $session->startTransaction($txnOptions);
+    echo raises(function () use ($session, $txnOptions) {
+        $session->startTransaction($txnOptions);
+    }, E_RECOVERABLE_ERROR), "\n";
 }
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Warning: MongoDB\Driver\Session::startTransaction() expects parameter 1 to be array, int%S given in %s on line %d
-
-Warning: MongoDB\Driver\Session::startTransaction() expects parameter 1 to be array, object given in %s on line %d
+OK: Got E_RECOVERABLE_ERROR
+Argument 1 passed to MongoDB\Driver\Session::startTransaction() must be of the type array, int%S given, called in %S
+OK: Got E_RECOVERABLE_ERROR
+Argument 1 passed to MongoDB\Driver\Session::startTransaction() must be of the type array, object given, called in %S
 ===DONE===

tests/session/session-startTransaction_error-005.phpt

@@ -0,0 +1,35 @@
+--TEST--
+MongoDB\Driver\Session::startTransaction() with wrong argument for options array on PHP 7
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_libmongoc_crypto() ?>
+<?php skip_if_not_replica_set(); ?>
+<?php skip_if_server_version('<', '4.0'); ?>
+<?php skip_if_php_version('<', '7.0.0'); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$manager = new MongoDB\Driver\Manager(URI);
+$session = $manager->startSession();
+
+$options = [
+    2,
+    new stdClass,
+];
+
+foreach ($options as $txnOptions) {
+    echo throws(function () use ($session, $txnOptions) {
+        $session->startTransaction($txnOptions);
+    }, TypeError::class), "\n";
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+OK: Got TypeError
+Argument 1 passed to MongoDB\Driver\Session::startTransaction() must be of the type array or null, int%S given
+OK: Got TypeError
+Argument 1 passed to MongoDB\Driver\Session::startTransaction() must be of the type array or null, object given
+===DONE===

tests/utils/skipif.php

@@ -252,6 +252,20 @@ function skip_if_server_version($operator, $version)
     }
 }
 
+/**
+ * Skips the test if the PHP version satisfies a comparison.
+ *
+ * @see http://php.net/version_compare
+ * @param string $operator Comparison operator
+ * @param string $version  Version to compare against
+ */
+function skip_if_php_version($operator, $version)
+{
+    if (version_compare(PHP_VERSION, $version, $operator)) {
+        exit("skip PHP version '" . PHP_VERSION . "' $operator '$version'");
+    }
+}
+
 /**
  * Skips the test if the server not using a particular storage engine.
  *

tests/utils/tools.php

@@ -545,6 +545,8 @@ function destroyTemporaryMongoInstance($id = NULL)
 
 function severityToString($type) {
     switch($type) {
+    case E_RECOVERABLE_ERROR:
+        return "E_RECOVERABLE_ERROR";
     case E_WARNING:
         return "E_WARNING";
     case E_NOTICE:
@@ -590,26 +592,33 @@ function raises($function, $type, $infunction = null) {
 function throws($function, $exceptionname, $infunction = null) {
     try {
         $function();
+    } catch (Throwable $e) {
     } catch(Exception $e) {
-        $message = str_replace(array("\n", "\r"), ' ', $e->getMessage());
-        if ($e instanceof $exceptionname) {
-            if ($infunction) {
-                $trace = $e->getTrace();
-                $function = $trace[0]["function"];
-                if (strcasecmp($function, $infunction) == 0) {
-                    printf("OK: Got %s thrown from %s\n", $exceptionname, $infunction);
-                } else {
-                    printf("ALMOST: Got %s - but was thrown in %s, not %s (%s)\n", $exceptionname, $function, $infunction, $message);
-                }
-                return $e->getMessage();
+    }
+
+    if ($e === null) {
+        echo "FAILED: Expected $exceptionname thrown, but no exception thrown!\n";
+        return;
+    }
+
+    $message = str_replace(array("\n", "\r"), ' ', $e->getMessage());
+    if ($e instanceof $exceptionname) {
+        if ($infunction) {
+            $trace = $e->getTrace();
+            $function = $trace[0]["function"];
+            if (strcasecmp($function, $infunction) == 0) {
+                printf("OK: Got %s thrown from %s\n", $exceptionname, $infunction);
+            } else {
+                printf("ALMOST: Got %s - but was thrown in %s, not %s (%s)\n", $exceptionname, $function, $infunction, $message);
             }
-            printf("OK: Got %s\n", $exceptionname);
-        } else {
-            printf("ALMOST: Got %s (%s) - expected %s\n", get_class($e), $message, $exceptionname);
+            return $e->getMessage();
         }
-        return $e->getMessage();
+        printf("OK: Got %s\n", $exceptionname);
+    } else {
+        printf("ALMOST: Got %s (%s) - expected %s\n", get_class($e), $message, $exceptionname);
     }
-    echo "FAILED: Expected $exceptionname thrown, but no exception thrown!\n";
+
+    return $e->getMessage();
 }
 
 function printServer(Server $server)