PHPC-1263: Fix tests for PHP 7.3 output changes

Author: derickr

tests/bson/bson-javascript-set_state-001.phpt

@@ -38,27 +38,27 @@ MongoDB\BSON\Javascript::__set_state(array(
 MongoDB\BSON\Javascript::__set_state(array(
 %w'code' => 'function foo(bar) { return bar; }',
 %w'scope' => 
-  stdClass::__set_state(array(
-  )),
+  %Sarray(
+  %S),
 ))
 
 MongoDB\BSON\Javascript::__set_state(array(
 %w'code' => 'function foo() { return foo; }',
 %w'scope' => 
-  stdClass::__set_state(array(
+  %Sarray(
   %w'foo' => 42,
-  )),
+  %S),
 ))
 
 MongoDB\BSON\Javascript::__set_state(array(
 %w'code' => 'function foo() { return id; }',
 %w'scope' => 
-  stdClass::__set_state(array(
+  %Sarray(
   %w'id' => 
     MongoDB\BSON\ObjectId::__set_state(array(
     %w'oid' => '53e2a1c40640fd72175d4603',
     )),
-  )),
+  %S),
 ))
 
 MongoDB\BSON\Javascript::__set_state(array(

tests/readPreference/readpreference-var_export-001.phpt

@@ -24,7 +24,7 @@ foreach ($tests as $test) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 MongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'primary',
 ))
@@ -48,27 +48,27 @@ MongoDB\Driver\ReadPreference::__set_state(array(
    'tags' => 
   array (
     0 => 
-    stdClass::__set_state(array(
+    %Sarray(
        'dc' => 'ny',
-    )),
+    %S),
   ),
 ))
 MongoDB\Driver\ReadPreference::__set_state(array(
    'mode' => 'secondary',
    'tags' => 
   array (
     0 => 
-    stdClass::__set_state(array(
+    %Sarray(
        'dc' => 'ny',
-    )),
+    %S),
     1 => 
-    stdClass::__set_state(array(
+    %Sarray(
        'dc' => 'sf',
        'use' => 'reporting',
-    )),
+    %S),
     2 => 
-    stdClass::__set_state(array(
-    )),
+    %Sarray(
+    %S),
   ),
 ))
 MongoDB\Driver\ReadPreference::__set_state(array(

tests/session/session_error-001.phpt

@@ -47,19 +47,19 @@ foreach ($options as $txnOptions) {
 <?php exit(0); ?>
 --EXPECTF--
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Expected "readConcern" option to be MongoDB\Driver\ReadConcern, integer given
+Expected "readConcern" option to be MongoDB\Driver\ReadConcern, int%S given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected "readConcern" option to be MongoDB\Driver\ReadConcern, stdClass given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected "readConcern" option to be MongoDB\Driver\ReadConcern, MongoDB\Driver\WriteConcern given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Expected "readPreference" option to be MongoDB\Driver\ReadPreference, integer given
+Expected "readPreference" option to be MongoDB\Driver\ReadPreference, int%S given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected "readPreference" option to be MongoDB\Driver\ReadPreference, stdClass given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected "readPreference" option to be MongoDB\Driver\ReadPreference, MongoDB\Driver\ReadConcern given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Expected "writeConcern" option to be MongoDB\Driver\WriteConcern, integer given
+Expected "writeConcern" option to be MongoDB\Driver\WriteConcern, int%S given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected "writeConcern" option to be MongoDB\Driver\WriteConcern, stdClass given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
@@ -71,7 +71,7 @@ Expected "writeConcern" option to be MongoDB\Driver\WriteConcern, MongoDB\Driver
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected "writeConcern" option to be MongoDB\Driver\WriteConcern, MongoDB\Driver\ReadPreference given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Expected "defaultTransactionOptions" option to be an array, integer given
+Expected "defaultTransactionOptions" option to be an array, int%S given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected "defaultTransactionOptions" option to be an array, stdClass given
 ===DONE===