Skip to content

Commit 441a1d7

Browse files
jmikolajmikola
committed
Merge pull request #368 
2 parents 0730fa1 + 59b0751 commit 441a1d7

File tree

147 files changed

+208
-420
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+208
-420
lines changed

‎tests/bson/bson-binary-001.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
--TEST--
22
BSON BSON\Binary #001
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
5+
6+
require_once __DIR__ . '/../utils/tools.php';
87

98
$classname = BSON_NAMESPACE . "\\Binary";
109

‎tests/bson/bson-binary-serialization-001.phpt

-112 Bytes
Binary file not shown.

‎tests/bson/bson-binary-serialization_error-001.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
--TEST--
22
MongoDB\BSON\Binary unserialization requires "data" string and "type" integer fields
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
5+
6+
require_once __DIR__ . '/../utils/tools.php';
87

98
echo throws(function() {
109
unserialize('O:19:"MongoDB\BSON\Binary":1:{s:4:"data";s:6:"foobar";}');

‎tests/bson/bson-binary-serialization_error-002.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
--TEST--
22
MongoDB\BSON\Binary unserialization requires unsigned 8-bit integer for type
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
5+
6+
require_once __DIR__ . '/../utils/tools.php';
87

98
echo throws(function() {
109
unserialize('O:19:"MongoDB\BSON\Binary":2:{s:4:"data";s:6:"foobar";s:4:"type";i:-1;}');

‎tests/bson/bson-binary-set_state-001.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
--TEST--
22
MongoDB\BSON\Binary::__set_state()
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
85

96
$tests = [
107
['foobar', MongoDB\BSON\Binary::TYPE_GENERIC],

‎tests/bson/bson-binary-set_state_error-001.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
--TEST--
22
MongoDB\BSON\Binary::__set_state() requires "data" string and "type" integer fields
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
5+
6+
require_once __DIR__ . '/../utils/tools.php';
87

98
echo throws(function() {
109
MongoDB\BSON\Binary::__set_state(['data' => 'foobar']);

‎tests/bson/bson-binary-set_state_error-002.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
--TEST--
22
MongoDB\BSON\Binary::__set_state() requires unsigned 8-bit integer for type
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
5+
6+
require_once __DIR__ . '/../utils/tools.php';
87

98
echo throws(function() {
109
MongoDB\BSON\Binary::__set_state(['data' => 'foobar', 'type' => -1]);

‎tests/bson/bson-binary_error-001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
BSON BSON\Binary #001 error
33
--SKIPIF--
44
<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM handles parameter parsing differently"); ?>
5-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
65
--FILE--
76
<?php
8-
require_once __DIR__ . "/../utils/basic.inc";
7+
8+
require_once __DIR__ . '/../utils/tools.php';
99

1010
$classname = BSON_NAMESPACE . "\\Binary";
1111

‎tests/bson/bson-binary_error-002.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
--TEST--
22
BSON BSON\Binary cannot be extended
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
85

96
use MongoDB\BSON as BSON;
107

‎tests/bson/bson-binary_error-003.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
--TEST--
22
BSON BSON\Binary constructor requires unsigned 8-bit integer for type
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
5+
6+
require_once __DIR__ . '/../utils/tools.php';
87

98
use MongoDB\BSON as BSON;
109

‎tests/bson/bson-decimal128-001.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
BSON\Decimal128
33
--SKIPIF--
44
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
5-
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
65
--FILE--
76
<?php
8-
require_once __DIR__ . '/../utils/basic.inc';
97

108
$tests = [
119
'1234.5678',

‎tests/bson/bson-decimal128-002.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
BSON\Decimal128 NaN values
33
--SKIPIF--
44
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
5-
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
65
--FILE--
76
<?php
8-
require_once __DIR__ . '/../utils/basic.inc';
97

108
$tests = [
119
acos(8),

‎tests/bson/bson-decimal128-003.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
BSON\Decimal128 Infinity values
33
--SKIPIF--
44
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
5-
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
65
--FILE--
76
<?php
8-
require_once __DIR__ . '/../utils/basic.inc';
97

108
$tests = [
119
1.7976931348623158e+308+1.7976931348623158e+308,

‎tests/bson/bson-decimal128-004.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
BSON\Decimal128 debug handler
33
--SKIPIF--
44
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
5-
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
65
--FILE--
76
<?php
8-
require_once __DIR__ . '/../utils/basic.inc';
97

108
$tests = [
119
1234.5678,

‎tests/bson/bson-decimal128-serialization-001.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
MongoDB\BSON\Decimal128 serialization
33
--SKIPIF--
44
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
5-
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
65
--FILE--
76
<?php
8-
require_once __DIR__ . '/../utils/basic.inc';
97

108
$tests = [
119
'1234.5678',

‎tests/bson/bson-decimal128-serialization_error-001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
MongoDB\BSON\Decimal128 unserialization requires "dec" string field
33
--SKIPIF--
44
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
5-
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
65
--FILE--
76
<?php
8-
require_once __DIR__ . '/../utils/basic.inc';
7+
8+
require_once __DIR__ . '/../utils/tools.php';
99

1010
echo throws(function() {
1111
unserialize('O:23:"MongoDB\BSON\Decimal128":1:{s:3:"dec";i:0;}');

‎tests/bson/bson-decimal128-serialization_error-002.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
MongoDB\BSON\Decimal128 unserialization requires valid decimal string
33
--SKIPIF--
44
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
5-
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
65
--FILE--
76
<?php
8-
require_once __DIR__ . '/../utils/basic.inc';
7+
8+
require_once __DIR__ . '/../utils/tools.php';
99

1010
echo throws(function() {
1111
unserialize('O:23:"MongoDB\BSON\Decimal128":1:{s:3:"dec";s:7:"INVALID";}');

‎tests/bson/bson-decimal128-set_state-001.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
MongoDB\BSON\Decimal128::__set_state()
33
--SKIPIF--
44
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
5-
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
65
--FILE--
76
<?php
8-
require_once __DIR__ . '/../utils/basic.inc';
97

108
$tests = [
119
'1234.5678',

‎tests/bson/bson-decimal128-set_state_error-001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
MongoDB\BSON\Decimal128::__set_state() requires "dec" string field
33
--SKIPIF--
44
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
5-
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
65
--FILE--
76
<?php
8-
require_once __DIR__ . '/../utils/basic.inc';
7+
8+
require_once __DIR__ . '/../utils/tools.php';
99

1010
echo throws(function() {
1111
MongoDB\BSON\Decimal128::__set_state(['dec' => 0]);

‎tests/bson/bson-decimal128-set_state_error-002.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
MongoDB\BSON\Decimal128::__set_state() requires valid decimal string
33
--SKIPIF--
44
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
5-
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
65
--FILE--
76
<?php
8-
require_once __DIR__ . '/../utils/basic.inc';
7+
8+
require_once __DIR__ . '/../utils/tools.php';
99

1010
echo throws(function() {
1111
MongoDB\BSON\Decimal128::__set_state(['dec' => 'INVALID']);

‎tests/bson/bson-decimal128_error-001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ MongoDB\BSON\Decimal128 requires valid decimal string
33
--SKIPIF--
44
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
55
<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM handles parameter parsing differently"); ?>
6-
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
76
--FILE--
87
<?php
9-
require_once __DIR__ . '/../utils/basic.inc';
8+
9+
require_once __DIR__ . '/../utils/tools.php';
1010

1111
echo throws(function() {
1212
new MongoDB\BSON\Decimal128([]);

‎tests/bson/bson-decode-001.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
--TEST--
22
BSON encoding: Encoding data into BSON representation, and BSON into Extended JSON
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
75

8-
require_once __DIR__ . "/../utils/basic.inc";
6+
require_once __DIR__ . '/../utils/tools.php';
97

108
$tests = array(
119
array("hello" => "world"),

‎tests/bson/bson-decode-002.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
--TEST--
22
BSON encoding: Encoding object/arrays data into user specificied classes
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
75
use MongoDB\BSON as BSON;
86

9-
require_once __DIR__ . "/../utils/basic.inc";
7+
require_once __DIR__ . '/../utils/tools.php';
108

119
class MyArrayObject extends ArrayObject implements BSON\Unserializable {
1210
function bsonUnserialize(array $data) {

‎tests/bson/bson-encode-001.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
--TEST--
22
BSON encoding: Encoding data into BSON representation, and BSON into Extended JSON
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
75
use MongoDB\BSON as BSON;
86

9-
require_once __DIR__ . "/../utils/basic.inc";
7+
require_once __DIR__ . '/../utils/tools.php';
108

119
$tests = array(
1210
array("hello" => "world"),

‎tests/bson/bson-encode-002.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
--TEST--
22
BSON encoding: Encoding objects into BSON representation
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
75
use MongoDB\BSON as BSON;
8-
require_once __DIR__ . "/../utils/basic.inc";
6+
7+
require_once __DIR__ . '/../utils/tools.php';
98

109
class AssociativeArray implements BSON\Serializable, BSON\Unserializable
1110
{

‎tests/bson/bson-encode-003.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
BSON encoding: Encoding objects into BSON representation
33
--SKIPIF--
44
<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM encodes __pclass last"); ?>
5-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
65
--FILE--
76
<?php
87
use MongoDB\BSON as BSON;
98

10-
require_once __DIR__ . "/../utils/basic.inc";
9+
require_once __DIR__ . '/../utils/tools.php';
1110

1211
class MyClass implements BSON\Persistable {
1312
function bsonSerialize() {

‎tests/bson/bson-encode-004.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
BSON encoding: Object Document Mapper
33
--SKIPIF--
44
<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM encodes __pclass last"); ?>
5-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
65
--FILE--
76
<?php
87
use MongoDB\BSON as BSON;
98

10-
require_once __DIR__ . "/../utils/basic.inc";
9+
require_once __DIR__ . '/../utils/tools.php';
1110
require_once __DIR__ . "/../utils/classes.inc";
1211

1312
$hannes = new Person("Hannes", 42);

‎tests/bson/bson-encode-005.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
--TEST--
22
BSON encoding: Object Document Mapper
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
75
use MongoDB\BSON as BSON;
86

9-
require_once __DIR__ . "/../utils/basic.inc";
7+
require_once __DIR__ . '/../utils/tools.php';
108

119
$data = array(
1210
"emptyarray" => array(),

‎tests/bson/bson-fromJSON-001.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
--TEST--
22
BSON\fromJSON(): Decoding JSON
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
75

8-
require_once __DIR__ . "/../utils/basic.inc";
6+
require_once __DIR__ . '/../utils/tools.php';
97

108
$tests = [
119
'{}',

‎tests/bson/bson-fromJSON-002.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
--TEST--
22
BSON\fromJSON(): Decoding extended JSON types
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
75

8-
require_once __DIR__ . "/../utils/basic.inc";
6+
require_once __DIR__ . '/../utils/tools.php';
97

108
$tests = [
119
'{ "_id": { "$oid": "56315a7c6118fd1b920270b1" }}',

‎tests/bson/bson-fromJSON_error-001.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
--TEST--
22
BSON\fromJSON(): invalid JSON
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
75

8-
require_once __DIR__ . "/../utils/basic.inc";
6+
require_once __DIR__ . '/../utils/tools.php';
97

108
echo throws(function() {
119
fromJSON('foo');

‎tests/bson/bson-fromPHP-001.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
--TEST--
22
BSON\fromPHP(): bsonSerialize() allows array and stdClass
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
75
use MongoDB\BSON as BSON;
86

9-
require_once __DIR__ . "/../utils/basic.inc";
7+
require_once __DIR__ . '/../utils/tools.php';
108

119
class MyDocument implements BSON\Serializable
1210
{

0 commit comments

Comments
 (0)