PHPC-1692: Test suite fixes for PHP 8

Author: jmikola

tests/apm/bug0950-002.phpt

@@ -2,12 +2,16 @@
 PHPC-950: Segfault killing cursor after subscriber HashTable is destroyed (one subscriber)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '7.99'); ?>
 <?php skip_if_not_live(); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
 
+/* Note: this test is skipped on PHP 8 because the CommandSubscriber ends up
+ * observing the killCursors command invoked from the Cursor's dtor. */
+
 class MySubscriber implements MongoDB\Driver\Monitoring\CommandSubscriber
 {
     public function commandStarted(MongoDB\Driver\Monitoring\CommandStartedEvent $event)
@@ -39,7 +43,7 @@ MongoDB\Driver\Monitoring\addSubscriber(new MySubscriber);
 $cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query([], ['batchSize' => 2]));
 
 /* Exiting during iteration on a live cursor will result in
- * php_phongo_command_started() being invoked for the killCursor command after
+ * php_phongo_command_started() being invoked for the killCursors command after
  * RSHUTDOWN has already destroyed the subscriber HashTable */
 foreach ($cursor as $data) {
     echo "Exiting during first iteration on cursor\n";

tests/bson/bson-binary_error-001.phpt

@@ -1,5 +1,8 @@
 --TEST--
 MongoDB\BSON\Binary #001 error
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '7.99'); ?>
 --FILE--
 <?php
 

tests/bson/bson-decimal128_error-001.phpt

@@ -1,6 +1,8 @@
 --TEST--
 MongoDB\BSON\Decimal128 requires valid decimal string
 --SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '7.99'); ?>
 <?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
 --FILE--
 <?php

tests/bson/bson-javascript_error-001.phpt

@@ -1,5 +1,8 @@
 --TEST--
 MongoDB\BSON\Javascript #001 error
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '7.99'); ?>
 --FILE--
 <?php
 

tests/bson/bson-objectid-001.phpt

@@ -55,11 +55,6 @@ throws(function() {
     $id = new MongoDB\BSON\ObjectId(" 3e28b650640fd3162152da1");
 }, "MongoDB\\Driver\\Exception\\InvalidArgumentException");
 
-
-
-raises(function() use($pregenerated) {
-    $pregenerated->__toString(1);
-}, E_WARNING);
 ?>
 ===DONE===
 <?php exit(0); ?>
@@ -88,5 +83,4 @@ OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-OK: Got E_WARNING
 ===DONE===

tests/bson/bson-objectid-tostring_error-001.phpt

@@ -0,0 +1,22 @@
+--TEST--
+MongoDB\BSON\ObjectId raises warning on invalid arguments
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '7.99'); ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/tools.php';
+
+$pregenerated = new MongoDB\BSON\ObjectId("53e28b650640fd3162152de1");
+
+raises(function() use($pregenerated) {
+    $pregenerated->__toString(1);
+}, E_WARNING);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+OK: Got E_WARNING
+===DONE===

tests/bson/bson-objectid_error-001.phpt

@@ -1,5 +1,8 @@
 --TEST--
 MongoDB\BSON\ObjectId #001 error
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '7.99'); ?>
 --FILE--
 <?php
 

tests/bson/bson-regex_error-001.phpt

@@ -1,5 +1,8 @@
 --TEST--
 MongoDB\BSON\Regex #001 error
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '7.99'); ?>
 --FILE--
 <?php
 

tests/bson/bson-timestamp_error-001.phpt

@@ -1,5 +1,8 @@
 --TEST--
 MongoDB\BSON\Timestamp #001 error
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_php_version('>=', '7.99'); ?>
 --FILE--
 <?php
 

tests/bson/bug0939-001.phpt

@@ -21,7 +21,7 @@ foreach ($tests as $test) {
     var_dump($object);
 
     foreach ($properties as $property) {
-        var_dump($object->{$property});
+        printf("%s::$%s exists: %s\n", get_class($object), $property, property_exists($object, $property) ? 'yes' : 'no');
     }
 
     echo "\n";
@@ -31,26 +31,21 @@ foreach ($tests as $test) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
+
 object(MongoDB\BSON\Binary)#%d (%d) {
   ["data"]=>
   string(3) "foo"
   ["type"]=>
   int(0)
 }
-
-Notice: Undefined property: MongoDB\BSON\Binary::$data in %s on line %d
-NULL
-
-Notice: Undefined property: MongoDB\BSON\Binary::$type in %s on line %d
-NULL
+MongoDB\BSON\Binary::$data exists: no
+MongoDB\BSON\Binary::$type exists: no
 
 object(MongoDB\BSON\Decimal128)#%d (%d) {
   ["dec"]=>
   string(4) "3.14"
 }
-
-Notice: Undefined property: MongoDB\BSON\Decimal128::$dec in %s on line %d
-NULL
+MongoDB\BSON\Decimal128::$dec exists: no
 
 object(MongoDB\BSON\Javascript)#%d (%d) {
   ["code"]=>
@@ -61,12 +56,8 @@ object(MongoDB\BSON\Javascript)#%d (%d) {
     int(42)
   }
 }
-
-Notice: Undefined property: MongoDB\BSON\Javascript::$code in %s on line %d
-NULL
-
-Notice: Undefined property: MongoDB\BSON\Javascript::$scope in %s on line %d
-NULL
+MongoDB\BSON\Javascript::$code exists: no
+MongoDB\BSON\Javascript::$scope exists: no
 
 object(MongoDB\BSON\MaxKey)#%d (%d) {
 }
@@ -78,42 +69,30 @@ object(MongoDB\BSON\ObjectId)#%d (%d) {
   ["oid"]=>
   string(24) "%x"
 }
-
-Notice: Undefined property: MongoDB\BSON\ObjectId::$oid in %s on line %d
-NULL
+MongoDB\BSON\ObjectId::$oid exists: no
 
 object(MongoDB\BSON\Regex)#%d (%d) {
   ["pattern"]=>
   string(3) "foo"
   ["flags"]=>
   string(1) "i"
 }
-
-Notice: Undefined property: MongoDB\BSON\Regex::$pattern in %s on line %d
-NULL
-
-Notice: Undefined property: MongoDB\BSON\Regex::$flags in %s on line %d
-NULL
+MongoDB\BSON\Regex::$pattern exists: no
+MongoDB\BSON\Regex::$flags exists: no
 
 object(MongoDB\BSON\Timestamp)#%d (%d) {
   ["increment"]=>
   string(4) "1234"
   ["timestamp"]=>
   string(4) "5678"
 }
-
-Notice: Undefined property: MongoDB\BSON\Timestamp::$increment in %s on line %d
-NULL
-
-Notice: Undefined property: MongoDB\BSON\Timestamp::$timestamp in %s on line %d
-NULL
+MongoDB\BSON\Timestamp::$increment exists: no
+MongoDB\BSON\Timestamp::$timestamp exists: no
 
 object(MongoDB\BSON\UTCDateTime)#%d (%d) {
   ["milliseconds"]=>
   string(%d) "%d"
 }
-
-Notice: Undefined property: MongoDB\BSON\UTCDateTime::$milliseconds in %s on line %d
-NULL
+MongoDB\BSON\UTCDateTime::$milliseconds exists: no
 
 ===DONE===

tests/cursor/bug1050-001.phpt

@@ -10,6 +10,31 @@ PHPC-1050: Command cursor should not invoke getMore at execution
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
 
+class CommandLogger implements MongoDB\Driver\Monitoring\CommandSubscriber
+{
+    public function commandStarted(MongoDB\Driver\Monitoring\CommandStartedEvent $event)
+    {
+        if ($event->getCommandName() !== 'aggregate' && $event->getCommandName() !== 'getMore') {
+            return;
+        }
+
+        printf("Executing command: %s\n", $event->getCommandName());
+    }
+
+    public function commandSucceeded(MongoDB\Driver\Monitoring\CommandSucceededEvent $event)
+    {
+        if ($event->getCommandName() !== 'aggregate' && $event->getCommandName() !== 'getMore') {
+            return;
+        }
+
+        printf("Executing command took %0.6f seconds\n", $event->getDurationMicros() / 1000000);
+    }
+
+    public function commandFailed(MongoDB\Driver\Monitoring\CommandFailedEvent $event)
+    {
+    }
+}
+
 $manager = new MongoDB\Driver\Manager(URI);
 
 $cmd = new MongoDB\Driver\Command(
@@ -25,25 +50,27 @@ $cmd = new MongoDB\Driver\Command(
     ]
 );
 
-$start = microtime(true);
+MongoDB\Driver\Monitoring\addSubscriber(new CommandLogger);
+
 $cursor = $manager->executeReadCommand(DATABASE_NAME, $cmd);
-printf("Executing command took %0.6f seconds\n", microtime(true) - $start);
 
 $it = new IteratorIterator($cursor);
 
-$start = microtime(true);
+printf("Current position is valid: %s\n\n", $it->valid() ? 'yes' : 'no');
+
+echo "Rewinding cursor\n";
 $it->rewind();
-printf("Rewinding cursor took %0.6f seconds\n", microtime(true) - $start);
-printf("Current position is valid: %s\n", $it->valid() ? 'yes' : 'no');
+
+printf("Current position is valid: %s\n\n", $it->valid() ? 'yes' : 'no');
 
 $bulk = new MongoDB\Driver\BulkWrite;
 $bulk->insert(['x' => 1]);
 $manager->executeBulkWrite(NS, $bulk);
 
-$start = microtime(true);
+echo "Advancing cursor\n";
 $it->next();
-printf("Advancing cursor took %0.6f seconds\n", microtime(true) - $start);
-printf("Current position is valid: %s\n", $it->valid() ? 'yes' : 'no');
+
+printf("Current position is valid: %s\n\n", $it->valid() ? 'yes' : 'no');
 
 $document = $it->current();
 
@@ -56,11 +83,20 @@ if (isset($document)) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
+Executing command: aggregate
 Executing command took 0.%d seconds
-Rewinding cursor took 0.%r(4|5)%r%d seconds
 Current position is valid: no
-Advancing cursor took %d.%d seconds
+
+Rewinding cursor
+Executing command: getMore
+Executing command took 0.%r(4|5)%r%d seconds
+Current position is valid: no
+
+Advancing cursor
+Executing command: getMore
+Executing command took 0.%d seconds
 Current position is valid: yes
+
 Operation type: insert
 object(stdClass)#%d (%d) {
   ["_id"]=>