Merge pull request #807

Author: jmikola

tests/manager/manager-invalidnamespace.phpt

@@ -1,14 +1,14 @@
 --TEST--
 MongoDB\Driver\Manager: Invalid namespace
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php NEEDS('STANDALONE'); ?>
 --FILE--
 <?php
 
-require_once __DIR__ . '/../utils/tools.php';
+require_once __DIR__ . "/../utils/basic.inc";
 
-$manager = new MongoDB\Driver\Manager();
+$manager = new MongoDB\Driver\Manager(STANDALONE);
 $bulk = new MongoDB\Driver\BulkWrite;
 $bulk->insert(array("my" => "value"));
 

tests/standalone/bug0357.phpt

@@ -7,7 +7,7 @@ PHPC-357: The exception for "invalid namespace" does not list the broken name
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
 
-$m = new MongoDB\Driver\Manager(null);
+$manager = new MongoDB\Driver\Manager(STANDALONE);
 $c = new MongoDB\Driver\Query(array());
 
 echo throws(function() use($m, $c) {