Skip to content

Commit 0b200dd

Browse files
jmikolajmikola
committed
PHPC-1133: Remove unused includes in SKIPIF and FILE sections
1 parent 05c83bd commit 0b200dd

40 files changed

+44
-140
lines changed

‎tests/bulk/bug0667.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
--TEST--
22
PHPC-667: BulkWrite::insert() does not generate ObjectId if another field has "_id" prefix
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
85

96
$bulk = new MongoDB\Driver\BulkWrite;
107
var_dump($bulk->insert(['_ids' => 1]));

‎tests/bulk/bulkwrite-count-001.phpt

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

96
$bulk = new MongoDB\Driver\BulkWrite;
107
var_dump($bulk->count());

‎tests/bulk/bulkwrite-countable-001.phpt

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

96
$bulk = new MongoDB\Driver\BulkWrite;
107
var_dump($bulk instanceof Countable);

‎tests/bulk/bulkwrite-debug-001.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
--TEST--
22
MongoDB\Driver\BulkWrite debug output before execution
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
[],

‎tests/manager/manager-ctor-002.phpt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
--TEST--
22
MongoDB\Driver\Manager::__construct() with URI
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
5-
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
63
--FILE--
74
<?php
8-
require_once __DIR__ . "/../utils/basic.inc";
95

10-
$manager = new MongoDB\Driver\Manager(STANDALONE);
6+
$manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/');
117

128
?>
139
===DONE===

‎tests/manager/manager-executeBulkWrite_error-007.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
MongoDB\Driver\Manager::executeBulkWrite() should not issue warning before exception
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
53
--FILE--
64
<?php
75
require_once __DIR__ . "/../utils/basic.inc";

‎tests/manager/manager-executeCommand_error-001.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
MongoDB\Driver\Manager::executeCommand() should not issue warning before exception
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
53
--FILE--
64
<?php
75
require_once __DIR__ . "/../utils/basic.inc";

‎tests/manager/manager-executeQuery_error-001.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
MongoDB\Driver\Manager::executeQuery() should not issue warning before exception
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
53
--FILE--
64
<?php
75
require_once __DIR__ . "/../utils/basic.inc";

‎tests/manager/manager-getreadconcern-001.phpt

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

96
$tests = [
10-
[STANDALONE, []],
11-
[STANDALONE . '/?readconcernlevel=local', []],
12-
[STANDALONE . '/?readconcernlevel=majority', []],
13-
[STANDALONE . '/?readconcernlevel=not-yet-supported', []],
14-
[STANDALONE, ['readconcernlevel' => 'local']],
15-
[STANDALONE, ['readconcernlevel' => 'majority']],
16-
[STANDALONE, ['readconcernlevel' => 'not-yet-supported']],
17-
[STANDALONE . '/?readconcernlevel=local', ['readconcernlevel' => 'majority']],
7+
[null, []],
8+
['mongodb://127.0.0.1/?readconcernlevel=local', []],
9+
['mongodb://127.0.0.1/?readconcernlevel=majority', []],
10+
['mongodb://127.0.0.1/?readconcernlevel=not-yet-supported', []],
11+
[null, ['readconcernlevel' => 'local']],
12+
[null, ['readconcernlevel' => 'majority']],
13+
[null, ['readconcernlevel' => 'not-yet-supported']],
14+
['mongodb://127.0.0.1/?readconcernlevel=local', ['readconcernlevel' => 'majority']],
1815
];
1916

2017
foreach ($tests as $i => $test) {

‎tests/manager/manager-getreadpreference-001.phpt

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

96
$tests = array(
10-
array(STANDALONE, array()),
11-
array(STANDALONE . '/?readPreference=secondary', array()),
12-
array(STANDALONE, array('readPreference' => 'primaryPreferred')),
13-
array(STANDALONE . '/?readPreference=secondary', array('readPreference' => 'secondaryPreferred')),
14-
array(STANDALONE . '/?readPreference=secondary&readPreferenceTags=dc:ny,use:reports&readPreferenceTags=', array()),
15-
array(STANDALONE . '/?readPreference=secondary', array('readPreferenceTags' => array(array('dc' => 'ny', 'use' => 'reports'), array()))),
16-
array(STANDALONE . '/?readPreference=secondary&readPreferenceTags=dc:ny,use:reports', array('readPreferenceTags' => array(array('dc' => 'ca')))),
7+
array(null, array()),
8+
array('mongodb://127.0.0.1/?readPreference=secondary', array()),
9+
array(null, array('readPreference' => 'primaryPreferred')),
10+
array('mongodb://127.0.0.1/?readPreference=secondary', array('readPreference' => 'secondaryPreferred')),
11+
array('mongodb://127.0.0.1/?readPreference=secondary&readPreferenceTags=dc:ny,use:reports&readPreferenceTags=', array()),
12+
array('mongodb://127.0.0.1/?readPreference=secondary', array('readPreferenceTags' => array(array('dc' => 'ny', 'use' => 'reports'), array()))),
13+
array('mongodb://127.0.0.1/?readPreference=secondary&readPreferenceTags=dc:ny,use:reports', array('readPreferenceTags' => array(array('dc' => 'ca')))),
1714
);
1815

1916
foreach ($tests as $i => $test) {

‎tests/manager/manager-getwriteconcern-001.phpt

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

96
$tests = array(
10-
array(STANDALONE, array()),
11-
array(STANDALONE . '/?w=1', array()),
12-
array(STANDALONE . '/?w=majority', array()),
13-
array(STANDALONE, array('w' => 1, 'journal' => true)),
14-
array(STANDALONE, array('w' => 'majority', 'journal' => true)),
15-
array(STANDALONE . '/?w=majority&journal=true', array('w' => 1, 'journal' => false)),
7+
array(null, array()),
8+
array('mongodb://127.0.0.1/?w=1', array()),
9+
array('mongodb://127.0.0.1/?w=majority', array()),
10+
array(null, array('w' => 1, 'journal' => true)),
11+
array(null, array('w' => 'majority', 'journal' => true)),
12+
array('mongodb://127.0.0.1/?w=majority&journal=true', array('w' => 1, 'journal' => false)),
1613
// wtimeoutms does not get applied unless w > 1, w = majority, or tag sets are used
17-
array(STANDALONE . '/?wtimeoutms=1000', array()),
18-
array(STANDALONE, array('wtimeoutms' => 1000)),
19-
array(STANDALONE . '/?w=2', array('wtimeoutms' => 1000)),
20-
array(STANDALONE . '/?w=majority', array('wtimeoutms' => 1000)),
21-
array(STANDALONE . '/?w=customTagSet', array('wtimeoutms' => 1000)),
14+
array('mongodb://127.0.0.1/?wtimeoutms=1000', array()),
15+
array(null, array('wtimeoutms' => 1000)),
16+
array('mongodb://127.0.0.1/?w=2', array('wtimeoutms' => 1000)),
17+
array('mongodb://127.0.0.1/?w=majority', array('wtimeoutms' => 1000)),
18+
array('mongodb://127.0.0.1/?w=customTagSet', array('wtimeoutms' => 1000)),
2219
);
2320

2421
foreach ($tests as $i => $test) {

‎tests/manager/manager-invalidnamespace.phpt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
--TEST--
22
MongoDB\Driver\Manager: Invalid namespace
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
85

9-
$manager = new MongoDB\Driver\Manager(STANDALONE);
6+
require_once __DIR__ . '/../utils/tools.php';
7+
8+
$manager = new MongoDB\Driver\Manager();
109
$bulk = new MongoDB\Driver\BulkWrite;
1110
$bulk->insert(array("my" => "value"));
1211

‎tests/manager/manager-selectserver_error-001.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
MongoDB\Driver\Manager::selectServer() should not issue warning before exception
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
53
--FILE--
64
<?php
75
require_once __DIR__ . "/../utils/basic.inc";

‎tests/manager/manager-wakeup.phpt

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

9-
$manager = new MongoDB\Driver\Manager(STANDALONE);
6+
require_once __DIR__ . '/../utils/tools.php';
7+
8+
$manager = new MongoDB\Driver\Manager();
109
throws(function() use($manager) {
1110
$manager->__wakeup();
1211
}, "MongoDB\Driver\Exception\RuntimeException");

‎tests/query/bug0430-001.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
--TEST--
22
PHPC-430: Query constructor arguments are modified
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
85

96
$filter = [];
107
$options = ['sort' => ['x' => 1]];

‎tests/query/bug0430-002.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
--TEST--
22
PHPC-430: Query constructor arguments are modified
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
85

96
$options = ['sort' => ['x' => 1]];
107

‎tests/query/bug0430-003.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
--TEST--
22
PHPC-430: Query constructor arguments are modified
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
85

96
function buildQuery($filter, $options)
107
{

‎tests/query/query-ctor_error-001.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
MongoDB\Driver\Query construction (invalid readConcern type)
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
53
--FILE--
64
<?php
75
require_once __DIR__ . "/../utils/basic.inc";

‎tests/query/query-debug-001.phpt

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

96
var_dump(new MongoDB\Driver\Query(
107
['a' => 123],

‎tests/readConcern/readconcern-constants.phpt

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

96
var_dump(MongoDB\Driver\ReadConcern::LINEARIZABLE);
107
var_dump(MongoDB\Driver\ReadConcern::LOCAL);

‎tests/readConcern/readconcern-ctor-001.phpt

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

96
var_dump(new MongoDB\Driver\ReadConcern());
107
var_dump(new MongoDB\Driver\ReadConcern(null));

‎tests/readConcern/readconcern-ctor_error-001.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
MongoDB\Driver\ReadConcern construction (invalid arguments)
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
53
--FILE--
64
<?php
75
require_once __DIR__ . "/../utils/basic.inc";

‎tests/readConcern/readconcern-ctor_error-002.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
MongoDB\Driver\ReadConcern construction (invalid level type)
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
53
--FILE--
64
<?php
75
require_once __DIR__ . "/../utils/basic.inc";

‎tests/readConcern/readconcern-getlevel-001.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
--TEST--
22
MongoDB\Driver\ReadConcern::getLevel()
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
null,

‎tests/server/server-constants.phpt

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

96
var_dump(MongoDB\Driver\Server::TYPE_UNKNOWN);
107
var_dump(MongoDB\Driver\Server::TYPE_STANDALONE);

‎tests/standalone/bug0357.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
--TEST--
22
PHPC-357: The exception for "invalid namespace" does not list the broken name
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
53
--FILE--
64
<?php
75
require_once __DIR__ . "/../utils/basic.inc";
86

9-
$m = new MongoDB\Driver\Manager(STANDALONE);
7+
$m = new MongoDB\Driver\Manager(null);
108
$c = new MongoDB\Driver\Query(array());
119

1210
echo throws(function() use($m, $c) {

‎tests/standalone/bug0655.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
PHPC-655: Use case insensitive parsing for Manager connectTimeoutMS array option
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
53
--FILE--
64
<?php
75
require_once __DIR__ . "/../utils/basic.inc";

‎tests/standalone/query-errors.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
--TEST--
22
MongoDB\Driver\Query: Invalid types
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
53
--FILE--
64
<?php
75
require_once __DIR__ . "/../utils/basic.inc";

‎tests/writeConcern/writeconcern-constants.phpt

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

96
var_dump(MongoDB\Driver\WriteConcern::MAJORITY);
107

‎tests/writeConcern/writeconcern-ctor-001.phpt

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

96
var_dump(new MongoDB\Driver\WriteConcern(MongoDB\Driver\WriteConcern::MAJORITY));
107
var_dump(new MongoDB\Driver\WriteConcern(MongoDB\Driver\WriteConcern::MAJORITY, 1000));

‎tests/writeConcern/writeconcern-ctor_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\Driver\WriteConcern construction (invalid arguments)
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
new MongoDB\Driver\WriteConcern("string", 10000, false, 1);

0 commit comments

Comments
 (0)