Merge pull request #92

Author: jmikola

tests/bson/bson-binary_error-001.phpt

@@ -10,22 +10,20 @@ require_once __DIR__ . "/../utils/basic.inc";
 $classname = BSON_NAMESPACE . "\\Binary";
 
 $binary = new $classname("random binary data", $classname::TYPE_GENERIC);
+$binary->getData(2);
+$binary->getType(2);
 
 throws(function() use($classname) {
-    $b = new $classname("random binary data without type");
-    echo "FAIL: Constructed BSON\Binary without type!\n";
+    new $classname("random binary data without type");
 }, "MongoDB\\Driver\\Exception\\InvalidArgumentException");
 
-$binary->getData(2);
-$binary->getType(2);
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-
 Warning: %s\Binary::getData() expects exactly 0 parameters, 1 given in %s on line %d
 
 Warning: %s\Binary::getType() expects exactly 0 parameters, 1 given in %s on line %d
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 ===DONE===
 

tests/bson/bson-javascript_error-001.phpt

@@ -7,18 +7,11 @@ BSON BSON\Javascript #001 error
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
 
-$classname = BSON_NAMESPACE . "\\Javascript";
-
-$js = new $classname("function foo(bar) {var baz = bar; var bar = foo; return bar; }");
-$jswscope = new $classname("function foo(bar) {var baz = bar; var bar = foo; return bar; }", array("foo" => 42));
-$tests = array(
-    array("js" => $js),
-    array("jswscope" => $jswscope),
-);
-
-throws(function() use($classname) {
-    $j = new $classname;
+throws(function() {
+    $classname = BSON_NAMESPACE . "\\Javascript";
+    new $classname;
 }, "MongoDB\\Driver\\Exception\\InvalidArgumentException");
+
 ?>
 ===DONE===
 <?php exit(0); ?>

tests/bson/bson-objectid_error-001.phpt

@@ -7,10 +7,11 @@ BSON BSON\ObjectID #001 error
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
 
-$classname = BSON_NAMESPACE . "\\ObjectID";
-throws(function() use($classname) {
-$id = new $classname(new stdclass);
+throws(function() {
+    $classname = BSON_NAMESPACE . "\\ObjectID";
+    new $classname(new stdclass);
 }, "MongoDB\\Driver\\Exception\\InvalidArgumentException");
+
 ?>
 ===DONE===
 <?php exit(0); ?>

tests/bson/bson-regex_error-001.phpt

@@ -8,22 +8,21 @@ BSON BSON\Regex #001 error
 require_once __DIR__ . "/../utils/basic.inc";
 
 $classname = BSON_NAMESPACE . "\\Regex";
+
 $regexp = new $classname("regexp", "i");
+$regexp->getPattern(true);
+$regexp->getFlags(true);
 
 throws(function() use($classname) {
-    $regexp = new $classname;
+    new $classname;
 }, "MongoDB\\Driver\\Exception\\InvalidArgumentException");
 
-$regexp->getPattern(true);
-$regexp->getFlags(true);
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-
 Warning: %s\Regex::getPattern() expects exactly 0 parameters, 1 given in %s on line %d
 
 Warning: %s\Regex::getFlags() expects exactly 0 parameters, 1 given in %s on line %d
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 ===DONE===
-

tests/bson/bson-timestamp_error-001.phpt

@@ -7,11 +7,11 @@ BSON BSON\Timestamp #001 error
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
 
-$classname = BSON_NAMESPACE . "\\Timestamp";
-
-throws(function() use($classname) {
-    $s = new $classname;
+throws(function() {
+    $classname = BSON_NAMESPACE . "\\Timestamp";
+    new $classname;
 }, "MongoDB\\Driver\\Exception\\InvalidArgumentException");
+
 ?>
 ===DONE===
 <?php exit(0); ?>

tests/bson/bson-utcdatetime_error-001.phpt

@@ -4,18 +4,16 @@ BSON BSON\UTCDateTime #001 error
 date.timezone=America/Los_Angeles
 --SKIPIF--
 <?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM handles parameter parsing differently"); ?>
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
 
-$manager = new MongoDB\Driver\Manager(STANDALONE);
-
-$classname = BSON_NAMESPACE . "\\UTCDateTime";
-
-throws(function() use($classname) {
-    $d = new $classname;
+throws(function() {
+    $classname = BSON_NAMESPACE . "\\UTCDateTime";
+    new $classname;
 }, "MongoDB\\Driver\\Exception\\InvalidArgumentException");
+
 ?>
 ===DONE===
 <?php exit(0); ?>