Use new cursor ID logic in tests where possible

Author: alcaeus

tests/cursorid/cursorid-002.phpt

@@ -21,7 +21,7 @@ $bulk->insert(['_id' => 3]);
 $server->executeBulkWrite(NS, $bulk);
 
 $cursor = $server->executeQuery(NS, new MongoDB\Driver\Query([], ['batchSize' => 2]));
-$cursorId = $cursor->getId();
+$cursorId = $cursor->getId(true);
 
 $command = new MongoDB\Driver\Command([
     'killCursors' => COLLECTION_NAME,
@@ -32,13 +32,12 @@ $command = new MongoDB\Driver\Command([
  * unserializing the result document requires a 64-bit platform. */
 $result = $server->executeCommand(DATABASE_NAME, $command)->toArray()[0];
 printf("Killed %d cursor(s)\n", count($result->cursorsKilled));
-printf("Killed expected cursor: %s\n", (string) $cursorId === (string) $result->cursorsKilled[0] ? 'yes' : 'no');
+printf("Killed expected cursor: %s\n", $cursorId == $result->cursorsKilled[0] ? 'yes' : 'no');
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Deprecated: MongoDB\Driver\Cursor::getId(): The method "MongoDB\Driver\Cursor::getId" will no longer return a "MongoDB\Driver\CursorId" instance in the future. Pass "true" as argument to change to the new behavior and receive a "MongoDB\BSON\Int64" instance instead. in %s
 Killed 1 cursor(s)
 Killed expected cursor: yes
 ===DONE===

tests/functional/cursorid-001.phpt

@@ -20,23 +20,17 @@ $query = new MongoDB\Driver\Query(array(), array(
 
 $cursor = $manager->executeQuery(NS, $query);
 
-$cursorid = $cursor->getId();
-$s1 = (string)$cursorid;
-var_dump(
-    $cursorid,
-    $s1
-);
-var_dump($s1 > 0); 
+$cursorid = $cursor->getId(true);
+var_dump($cursorid);
+var_dump($cursorid != 0);
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Deprecated: MongoDB\Driver\Cursor::getId(): The method "MongoDB\Driver\Cursor::getId" will no longer return a "MongoDB\Driver\CursorId" instance in the future. Pass "true" as argument to change to the new behavior and receive a "MongoDB\BSON\Int64" instance instead. in %s
-object(MongoDB\Driver\CursorId)#%d (%d) {
-  ["id"]=>
-  %rint\(\d+\)|string\(\d+\) "\d+"%r
+object(MongoDB\BSON\Int64)#%d (%d) {
+  ["integer"]=>
+  string(%d) "%d"
 }
-string(%d) "%d"
 bool(true)
 ===DONE===