Merge branch 'v1.5'

Author: derickr

tests/functional/cursor-001.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Sorting single field, ascending, using the Cursor Iterator
---XFAIL--
-LOAD() tests must be reimplemented (PHPC-1178)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
@@ -11,6 +9,7 @@ LOAD() tests must be reimplemented (PHPC-1178)
 require_once __DIR__ . "/../utils/basic.inc";
 
 $manager = new MongoDB\Driver\Manager(URI);
+loadFixtures($manager);
 
 $query = new MongoDB\Driver\Query(array(), array(
     'projection' => array('_id' => 0, 'username' => 1),

tests/functional/cursorid-001.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Sorting single field, ascending, using the Cursor Iterator
---XFAIL--
-LOAD() tests must be reimplemented (PHPC-1178)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
@@ -11,6 +9,7 @@ LOAD() tests must be reimplemented (PHPC-1178)
 require_once __DIR__ . "/../utils/basic.inc";
 
 $manager = new MongoDB\Driver\Manager(URI);
+loadFixtures($manager);
 
 $query = new MongoDB\Driver\Query(array(), array(
     'projection' => array('_id' => 0, 'username' => 1),

tests/functional/query-sort-001.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Sorting single field, ascending
---XFAIL--
-LOAD() tests must be reimplemented (PHPC-1178)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
@@ -11,6 +9,7 @@ LOAD() tests must be reimplemented (PHPC-1178)
 require_once __DIR__ . "/../utils/basic.inc";
 
 $manager = new MongoDB\Driver\Manager(URI);
+loadFixtures($manager);
 
 $query = new MongoDB\Driver\Query(array(), array(
     'projection' => array('_id' => 0, 'username' => 1),

tests/functional/query-sort-002.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Sorting single field, descending
---XFAIL--
-LOAD() tests must be reimplemented (PHPC-1178)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
@@ -11,6 +9,7 @@ LOAD() tests must be reimplemented (PHPC-1178)
 require_once __DIR__ . "/../utils/basic.inc";
 
 $manager = new MongoDB\Driver\Manager(URI);
+loadFixtures($manager);
 
 $query = new MongoDB\Driver\Query(array(), array(
     'projection' => array('_id' => 0, 'username' => 1),

tests/functional/query-sort-003.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Sorting single field, ascending, using the Cursor Iterator
---XFAIL--
-LOAD() tests must be reimplemented (PHPC-1178)
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
@@ -11,6 +9,7 @@ LOAD() tests must be reimplemented (PHPC-1178)
 require_once __DIR__ . "/../utils/basic.inc";
 
 $manager = new MongoDB\Driver\Manager(URI);
+loadFixtures($manager);
 
 $query = new MongoDB\Driver\Query(array(), array(
     'projection' => array('_id' => 0, 'username' => 1),

tests/utils/tools.php

@@ -411,12 +411,13 @@ function SLOW() {
         exit("skip SKIP_SLOW_TESTS");
     }
 }
-function LOAD($uri, $dbname = DATABASE_NAME, $collname = COLLECTION_NAME, $filename = null) {
+
+function loadFixtures(\MongoDB\Driver\Manager $manager, $dbname = DATABASE_NAME, $collname = COLLECTION_NAME, $filename = null)
+{
     if (!$filename) {
         $filename = "compress.zlib://" . __DIR__ . "/" . "PHONGO-FIXTURES.json.gz";
     }
 
-    $manager = new MongoDB\Driver\Manager($uri);
     $bulk = new MongoDB\Driver\BulkWrite(['ordered' => false]);
 
     $server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY));