PHPC-1211: Update SKIPIFs for 32-bit platforms

Author: jmikola

scripts/convert-bson-corpus-tests.php

@@ -15,8 +15,11 @@
 ];
 
 $for64bitOnly = [
-	'Int64 type: MinValue' => "Can't represent 64-bit ints on a 32-bit platform",
-	'Int64 type: MaxValue' => "Can't represent 64-bit ints on a 32-bit platform",
+    /* Note: Although 64-bit integers be represented by the Int64 class, these
+     * tests fail on 32-bit platforms due to json_canonicalize() roundtripping
+     * values through PHP, which converts large integers to floats. */
+    'Int64 type: MinValue' => "Can't represent 64-bit ints on a 32-bit platform",
+    'Int64 type: MaxValue' => "Can't represent 64-bit ints on a 32-bit platform",
 ];
 
 $outputPath = realpath(__DIR__ . '/../tests') . '/bson-corpus/';

tests/cursor/bug1152-001.phpt

@@ -1,7 +1,6 @@
 --TEST--
 PHPC-1152: Command cursors should use the same session for getMore and killCursors (implicit)
 --SKIPIF--
- <?php if (PHP_INT_SIZE !== 8) { die("skip Can't represent 64-bit ints on a 32-bit platform"); } ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_live(); ?>
@@ -74,7 +73,7 @@ class Test implements MongoDB\Driver\Monitoring\CommandSubscriber
         }
 
         if ($event->getCommandName() === 'getMore') {
-            $cursorId = $event->getCommand()->getMore;
+            $cursorId = (string) $event->getCommand()->getMore;
 
             if ( ! isset($this->lsidByCursorId[$cursorId])) {
                 throw new UnexpectedValueException('No previous command observed for cursor ID: ' . $cursorId);
@@ -84,7 +83,7 @@ class Test implements MongoDB\Driver\Monitoring\CommandSubscriber
         }
 
         if ($event->getCommandName() === 'killCursors') {
-            $cursorId = $event->getCommand()->cursors[0];
+            $cursorId = (string) $event->getCommand()->cursors[0];
 
             if ( ! isset($this->lsidByCursorId[$cursorId])) {
                 throw new UnexpectedValueException('No previous command observed for cursor ID: ' . $cursorId);
@@ -99,7 +98,7 @@ class Test implements MongoDB\Driver\Monitoring\CommandSubscriber
         /* Associate the aggregate's session ID with its cursor ID so it can be
          * looked up by the subsequent getMore or killCursors */
         if ($event->getCommandName() === 'aggregate') {
-            $cursorId = $event->getReply()->cursor->id;
+            $cursorId = (string) $event->getReply()->cursor->id;
             $requestId = $event->getRequestId();
 
             $this->lsidByCursorId[$cursorId] = $this->lsidByRequestId[$requestId];

tests/cursor/bug1152-002.phpt

@@ -1,7 +1,6 @@
 --TEST--
 PHPC-1152: Command cursors should use the same session for getMore and killCursors (explicit)
 --SKIPIF--
- <?php if (PHP_INT_SIZE !== 8) { die("skip Can't represent 64-bit ints on a 32-bit platform"); } ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_live(); ?>
@@ -72,7 +71,7 @@ class Test implements MongoDB\Driver\Monitoring\CommandSubscriber
         }
 
         if ($event->getCommandName() === 'getMore') {
-            $cursorId = $event->getCommand()->getMore;
+            $cursorId = (string) $event->getCommand()->getMore;
 
             if ( ! isset($this->lsidByCursorId[$cursorId])) {
                 throw new UnexpectedValueException('No previous command observed for cursor ID: ' . $cursorId);
@@ -82,7 +81,7 @@ class Test implements MongoDB\Driver\Monitoring\CommandSubscriber
         }
 
         if ($event->getCommandName() === 'killCursors') {
-            $cursorId = $event->getCommand()->cursors[0];
+            $cursorId = (string) $event->getCommand()->cursors[0];
 
             if ( ! isset($this->lsidByCursorId[$cursorId])) {
                 throw new UnexpectedValueException('No previous command observed for cursor ID: ' . $cursorId);
@@ -97,7 +96,7 @@ class Test implements MongoDB\Driver\Monitoring\CommandSubscriber
         /* Associate the aggregate's session ID with its cursor ID so it can be
          * looked up by the subsequent getMore or killCursors */
         if ($event->getCommandName() === 'aggregate') {
-            $cursorId = $event->getReply()->cursor->id;
+            $cursorId = (string) $event->getReply()->cursor->id;
             $requestId = $event->getRequestId();
 
             $this->lsidByCursorId[$cursorId] = $this->lsidByRequestId[$requestId];

tests/cursor/cursor-destruct-001.phpt

@@ -1,7 +1,6 @@
 --TEST--
 MongoDB\Driver\Cursor destruct should kill a live cursor
 --SKIPIF--
-<?php if (PHP_INT_SIZE !== 8) { die('skip Only for 64-bit platform'); } ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
 <?php skip_if_not_clean(); ?>

tests/cursorid/cursorid-002.phpt

@@ -1,7 +1,6 @@
 --TEST--
 MongoDB\Driver\CursorID BSON serialization for killCursors command
 --SKIPIF--
-<?php if (8 !== PHP_INT_SIZE) { die('skip Only for 64-bit platform'); } ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
 <?php skip_if_not_clean(); ?>

tests/manager/bug1163-001.phpt

@@ -1,7 +1,6 @@
 --TEST--
 PHPC-1163: Unacknowledged write concern should omit implicit session
 --SKIPIF--
-<?php if (PHP_INT_SIZE !== 8) { die("skip Can't represent 64-bit ints on a 32-bit platform"); } ?>
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
 <?php skip_if_server_version('<', '3.4'); ?>