Merge pull request #526

Author: jmikola

tests/bson/bson-decode-001.phpt

@@ -10,8 +10,7 @@ $tests = array(
     array((object)array("hello" => "world")),
     array(null),
     array(123),
-
-    array(4.23),
+    array(4.125),
     array(true),
     array(false),
     array("string"),
@@ -60,7 +59,7 @@ Test#2 { "0" : null }
 OK
 Test#3 { "0" : 123 }
 OK
-Test#4 { "0" : 4.23 }
+Test#4 { "0" : 4.125 }
 OK
 Test#5 { "0" : true }
 OK

tests/bson/bson-encode-001.phpt

@@ -15,7 +15,7 @@ $tests = array(
     array(array("0" => 1, "1" => 2, "2" => 3, "3" => 4, "4" => 5, "5" => 6, "6" => 7, "7" => 8, "8" => 9)),
     array(null),
     array(123),
-    array(4.23),
+    array(4.125),
     array(true),
     array(false),
     array("string"),
@@ -74,8 +74,8 @@ Test#7 { "0" : null }
      0 : 08 00 00 00 0a 30 00 00                          [.....0..]
 Test#8 { "0" : 123 }
      0 : 0c 00 00 00 10 30 00 7b 00 00 00 00              [.....0.{....]
-Test#9 { "0" : 4.23 }
-     0 : 10 00 00 00 01 30 00 ec 51 b8 1e 85 eb 10 40 00  [.....0..Q.....@.]
+Test#9 { "0" : 4.125 }
+     0 : 10 00 00 00 01 30 00 00 00 00 00 00 80 10 40 00  [.....0........@.]
 Test#10 { "0" : true }
      0 : 09 00 00 00 08 30 00 01 00                       [.....0...]
 Test#11 { "0" : false }

tests/bson/bson-fromJSON_error-001.phpt

@@ -5,17 +5,13 @@ MongoDB\BSON\fromJSON(): invalid JSON
 
 require_once __DIR__ . '/../utils/tools.php';
 
-echo throws(function() {
+throws(function() {
     fromJSON('foo');
-}, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n";
+}, 'MongoDB\Driver\Exception\UnexpectedValueException');
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
 OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-lexical error: invalid string in json text.
-                                       foo
-                     (right here) ------^
-
 ===DONE===

tests/bson/bson-javascript-jsonserialize-003.phpt

@@ -20,9 +20,9 @@ var_dump(toPHP(fromJSON($json)));
 {"foo":{"$code":"function foo(bar) { return bar; }"}}
 object(stdClass)#%d (%d) {
   ["foo"]=>
-  object(stdClass)#%d (%d) {
-    ["$code"]=>
+  object(%r(stdClass|MongoDB\\BSON\\Javascript)%r)#%d (%d) {
+    ["%r(\$?)%rcode"]=>
     string(33) "function foo(bar) { return bar; }"
-  }
+  %A}
 }
 ===DONE===

tests/bson/bson-javascript-jsonserialize-004.phpt

@@ -20,10 +20,10 @@ var_dump(toPHP(fromJSON($json)));
 {"foo":{"$code":"function foo(bar) { return bar; }","$scope":{"foo":42}}}
 object(stdClass)#%d (%d) {
   ["foo"]=>
-  object(stdClass)#%d (%d) {
-    ["$code"]=>
+  object(%r(stdClass|MongoDB\\BSON\\Javascript)%r)#%d (%d) {
+    ["%r(\$?)%rcode"]=>
     string(33) "function foo(bar) { return bar; }"
-    ["$scope"]=>
+    ["%r(\$?)%rscope"]=>
     object(stdClass)#%d (%d) {
       ["foo"]=>
       int(42)

tests/functional/phpinfo-1.phpt

@@ -1,11 +1,9 @@
 --TEST--
-phpinfo()
+phpinfo() reports mongodb.debug (no value)
 --SKIPIF--
 <?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM does not do phpinfo() this way"); ?>
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
 phpinfo();
 
@@ -14,22 +12,6 @@ phpinfo();
 <?php exit(0); ?>
 --EXPECTF--
 %a
-mongodb
-
-MongoDB support => enabled
-MongoDB extension version => 1.%d.%d%S
-MongoDB extension stability => %s
-libbson bundled version => 1.%d.%d%S
-libmongoc bundled version => 1.%d.%d%S
-libmongoc SSL => enabled
-libmongoc SSL library => %s
-libmongoc crypto => enabled
-libmongoc crypto library => %s
-libmongoc crypto system profile => %s
-libmongoc SASL => enabled
-
-Directive => Local Value => Master Value
 mongodb.debug => no value => no value
-
 %a
 ===DONE===

tests/functional/phpinfo-2.phpt

@@ -1,13 +1,11 @@
 --TEST--
-phpinfo()
+phpinfo() reports mongodb.debug (default and overridden)
 --INI--
 mongodb.debug=stderr
 --SKIPIF--
 <?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM does not do phpinfo() this way"); ?>
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
 ini_set("mongodb.debug", "stdout");
 phpinfo();
@@ -17,22 +15,6 @@ phpinfo();
 <?php exit(0); ?>
 --EXPECTF--
 %a
-mongodb
-
-MongoDB support => enabled
-MongoDB extension version => 1.%d.%d%S
-MongoDB extension stability => %s
-libbson bundled version => 1.%d.%d%S
-libmongoc bundled version => 1.%d.%d%S
-libmongoc SSL => enabled
-libmongoc SSL library => %s
-libmongoc crypto => enabled
-libmongoc crypto library => %s
-libmongoc crypto system profile => %s
-libmongoc SASL => enabled
-
-Directive => Local Value => Master Value
 mongodb.debug => stdout => stderr
-
 %a
 ===DONE===

tests/manager/manager-debug-001.phpt

@@ -2,38 +2,27 @@
 MongoDB\Driver\Manager: Writing debug log files
 --SKIPIF--
 <?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM uses HHVM's logging functionality"); ?>
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
 $name = tempnam(sys_get_temp_dir(), "PHONGO");
 unlink($name);
 mkdir($name);
+
 ini_set('mongodb.debug', $name);
-$manager = new MongoDB\Driver\Manager(STANDALONE);
-$bulk = new MongoDB\Driver\BulkWrite();
-$bulk->insert(array('_id' => 1, 'x' => 1));
-$result = $manager->executeBulkWrite(NS, $bulk);
+$manager = new MongoDB\Driver\Manager;
 ini_set('mongodb.debug', 'off');
-foreach(glob($name."/*") as $file);
-$content = file($file);
-unlink($file);
-rmdir($name);
 
-echo $content[0], $content[1];
-foreach($content as $line) {
-    if (strpos($line, "mongoc_bulk_operation_execute")) {
-        echo $line;
-    }
+foreach (glob($name."/*") as $file) {
+    echo file_get_contents($file);
+    unlink($file);
 }
+rmdir($name);
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-[%s]     PHONGO: DEBUG   > Connection string: '%s'
+%A[%s]     PHONGO: DEBUG   > Connection string: '%s'
 [%s]     PHONGO: DEBUG   > Creating Manager, phongo-1.%d.%d%S[%s] - mongoc-1.%s(%s), libbson-1.%s(%s), php-%s
-[%s]     mongoc: TRACE   > ENTRY: mongoc_bulk_operation_execute():%d
-[%s]     mongoc: TRACE   >  EXIT: mongoc_bulk_operation_execute():%d
-===DONE===
+%A===DONE===%A

tests/manager/manager-debug-002.phpt

@@ -2,24 +2,17 @@
 MongoDB\Driver\Manager: mongodb.debug=stderr
 --SKIPIF--
 <?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM uses HHVM's logging functionality"); ?>
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
 --INI--
 mongodb.debug=stderr
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
-$manager = new MongoDB\Driver\Manager(STANDALONE);
-$bulk = new MongoDB\Driver\BulkWrite();
-$bulk->insert(array('_id' => 1, 'x' => 1));
-$result = $manager->executeBulkWrite(NS, $bulk);
+$manager = new MongoDB\Driver\Manager;
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-%a
+%A[%s]     PHONGO: DEBUG   > Connection string: '%s'
 [%s]     PHONGO: DEBUG   > Creating Manager, phongo-1.%d.%d%S[%s] - mongoc-1.%s(%s), libbson-1.%s(%s), php-%s
-%a
-===DONE===
-%a
+%A===DONE===%A