Skip to content

Commit 0a7d1ba

Browse files
jmikolajmikola
committed
Merge pull request #639 
2 parents 7db4c0d + 991cbe8 commit 0a7d1ba

19 files changed

+30
-30
lines changed

‎config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ if test "$MONGODB" != "no"; then
180180
src/MongoDB/BulkWrite.c \
181181
src/MongoDB/Command.c \
182182
src/MongoDB/Cursor.c \
183-
src/MongoDB/CursorId.c \
183+
src/MongoDB/CursorID.c \
184184
src/MongoDB/Manager.c \
185185
src/MongoDB/Query.c \
186186
src/MongoDB/ReadConcern.c \

‎config.w32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ if (PHP_MONGODB != "no") {
8585
EXTENSION("mongodb", "php_phongo.c phongo_compat.c", null, PHP_MONGODB_CFLAGS);
8686
ADD_SOURCES(configure_module_dirname + "/src", "bson.c bson-encode.c", "mongodb");
8787
ADD_SOURCES(configure_module_dirname + "/src/BSON", "Binary.c BinaryInterface.c Decimal128.c Decimal128Interface.c Javascript.c JavascriptInterface.c MaxKey.c MaxKeyInterface.c MinKey.c MinKeyInterface.c ObjectID.c ObjectIDInterface.c Persistable.c Regex.c RegexInterface.c Serializable.c Timestamp.c TimestampInterface.c Type.c Unserializable.c UTCDateTime.c UTCDateTimeInterface.c functions.c", "mongodb");
88-
ADD_SOURCES(configure_module_dirname + "/src/MongoDB", "BulkWrite.c Command.c Cursor.c CursorId.c Manager.c Query.c ReadConcern.c ReadPreference.c Server.c WriteConcern.c WriteConcernError.c WriteError.c WriteResult.c", "mongodb");
88+
ADD_SOURCES(configure_module_dirname + "/src/MongoDB", "BulkWrite.c Command.c Cursor.c CursorID.c Manager.c Query.c ReadConcern.c ReadPreference.c Server.c WriteConcern.c WriteConcernError.c WriteError.c WriteResult.c", "mongodb");
8989
ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Exception", "AuthenticationException.c BulkWriteException.c ConnectionException.c ConnectionTimeoutException.c Exception.c ExecutionTimeoutException.c InvalidArgumentException.c LogicException.c RuntimeException.c SSLConnectionException.c UnexpectedValueException.c WriteException.c", "mongodb");
9090
ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Monitoring", "CommandFailedEvent.c CommandStartedEvent.c CommandSubscriber.c CommandSucceededEvent.c Subscriber.c functions.c", "mongodb");
9191
ADD_SOURCES(configure_module_dirname + "/src/libbson/src/bson", PHP_MONGODB_BSON_SOURCES, "mongodb");

‎src/MongoDB/Cursor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ static PHP_METHOD(Cursor, toArray)
270270
}
271271
} /* }}} */
272272

273-
/* {{{ proto MongoDB\Driver\CursorId MongoDB\Driver\Cursor::getId()
273+
/* {{{ proto MongoDB\Driver\CursorID MongoDB\Driver\Cursor::getId()
274274
Returns the CursorId for this cursor */
275275
static PHP_METHOD(Cursor, getId)
276276
{

‎src/MongoDB/CursorId.c renamed to ‎src/MongoDB/CursorID.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626

2727
zend_class_entry *php_phongo_cursorid_ce;
2828

29-
/* {{{ proto string MongoDB\Driver\CursorId::__toString()
30-
Returns the string representation of the CursorId */
31-
static PHP_METHOD(CursorId, __toString)
29+
/* {{{ proto string MongoDB\Driver\CursorID::__toString()
30+
Returns the string representation of the CursorID */
31+
static PHP_METHOD(CursorID, __toString)
3232
{
3333
php_phongo_cursorid_t *intern;
3434
char *tmp;
@@ -46,19 +46,19 @@ static PHP_METHOD(CursorId, __toString)
4646
efree(tmp);
4747
} /* }}} */
4848

49-
/* {{{ MongoDB\Driver\CursorId function entries */
50-
ZEND_BEGIN_ARG_INFO_EX(ai_CursorId_void, 0, 0, 0)
49+
/* {{{ MongoDB\Driver\CursorID function entries */
50+
ZEND_BEGIN_ARG_INFO_EX(ai_CursorID_void, 0, 0, 0)
5151
ZEND_END_ARG_INFO()
5252

5353
static zend_function_entry php_phongo_cursorid_me[] = {
54-
PHP_ME(CursorId, __toString, ai_CursorId_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
55-
ZEND_NAMED_ME(__construct, PHP_FN(MongoDB_disabled___construct), ai_CursorId_void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
56-
ZEND_NAMED_ME(__wakeup, PHP_FN(MongoDB_disabled___wakeup), ai_CursorId_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
54+
PHP_ME(CursorID, __toString, ai_CursorID_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
55+
ZEND_NAMED_ME(__construct, PHP_FN(MongoDB_disabled___construct), ai_CursorID_void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
56+
ZEND_NAMED_ME(__wakeup, PHP_FN(MongoDB_disabled___wakeup), ai_CursorID_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
5757
PHP_FE_END
5858
};
5959
/* }}} */
6060

61-
/* {{{ MongoDB\Driver\CursorId object handlers */
61+
/* {{{ MongoDB\Driver\CursorID object handlers */
6262
static zend_object_handlers php_phongo_handler_cursorid;
6363

6464
static void php_phongo_cursorid_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
@@ -131,7 +131,7 @@ void php_phongo_cursorid_init_ce(INIT_FUNC_ARGS) /* {{{ */
131131
{
132132
zend_class_entry ce;
133133

134-
INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "CursorId", php_phongo_cursorid_me);
134+
INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "CursorID", php_phongo_cursorid_me);
135135
php_phongo_cursorid_ce = zend_register_internal_class(&ce TSRMLS_CC);
136136
php_phongo_cursorid_ce->create_object = php_phongo_cursorid_create_object;
137137
PHONGO_CE_FINAL(php_phongo_cursorid_ce);

‎src/bson-encode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ static void php_phongo_bson_append_object(bson_t *bson, php_phongo_bson_flags_t
207207
bson_oid_t oid;
208208
php_phongo_objectid_t *intern = Z_OBJECTID_OBJ_P(object);
209209

210-
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding ObjectId");
210+
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding ObjectID");
211211
bson_oid_init_from_string(&oid, intern->oid);
212212
bson_append_oid(bson, key, key_len, &oid);
213213
return;

‎tests/bson-corpus/oid-decodeError-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
ObjectId: OID truncated
2+
ObjectID: OID truncated
33
--DESCRIPTION--
44
Generated by scripts/convert-bson-corpus-tests.php
55

‎tests/bson-corpus/oid-valid-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
ObjectId: All zeroes
2+
ObjectID: All zeroes
33
--DESCRIPTION--
44
Generated by scripts/convert-bson-corpus-tests.php
55

‎tests/bson-corpus/oid-valid-002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
ObjectId: All ones
2+
ObjectID: All ones
33
--DESCRIPTION--
44
Generated by scripts/convert-bson-corpus-tests.php
55

‎tests/bson-corpus/oid-valid-003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
ObjectId: Random
2+
ObjectID: Random
33
--DESCRIPTION--
44
Generated by scripts/convert-bson-corpus-tests.php
55

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $tests = array(
1515
new MongoDB\BSON\Javascript('function foo(bar) {var baz = bar; var bar = foo; return bar; }'),
1616
new MongoDB\BSON\MinKey,
1717
new MongoDB\BSON\MaxKey,
18-
new MongoDB\BSON\ObjectId,
18+
new MongoDB\BSON\ObjectID,
1919
new MongoDB\BSON\Regex('regexp', 'i'),
2020
new MongoDB\BSON\Timestamp(1234, 5678),
2121
new MongoDB\BSON\UTCDateTime('1416445411987'),

‎tests/bson/bson-javascript-getCode-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $tests = [
77
['function foo(bar) { return bar; }', null],
88
['function foo(bar) { return bar; }', []],
99
['function foo() { return foo; }', ['foo' => 42]],
10-
['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectId('53e2a1c40640fd72175d4603')]],
10+
['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectID('53e2a1c40640fd72175d4603')]],
1111
];
1212

1313
foreach ($tests as $test) {

‎tests/bson/bson-javascript-getScope-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $tests = [
77
['function foo(bar) { return bar; }', null],
88
['function foo(bar) { return bar; }', []],
99
['function foo() { return foo; }', ['foo' => 42]],
10-
['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectId('53e2a1c40640fd72175d4603')]],
10+
['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectID('53e2a1c40640fd72175d4603')]],
1111
];
1212

1313
foreach ($tests as $test) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $tests = [
77
['function foo(bar) { return bar; }', null],
88
['function foo(bar) { return bar; }', []],
99
['function foo() { return foo; }', ['foo' => 42]],
10-
['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectId('53e2a1c40640fd72175d4603')]],
10+
['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectID('53e2a1c40640fd72175d4603')]],
1111
];
1212

1313
foreach ($tests as $test) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $tests = [
77
['function foo(bar) { return bar; }', null],
88
['function foo(bar) { return bar; }', []],
99
['function foo() { return foo; }', ['foo' => 42]],
10-
['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectId('53e2a1c40640fd72175d4603')]],
10+
['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectID('53e2a1c40640fd72175d4603')]],
1111
];
1212

1313
foreach ($tests as $test) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ MongoDB\BSON\toCanonicalExtendedJSON(): Encoding extended JSON types
66
require_once __DIR__ . '/../utils/tools.php';
77

88
$tests = [
9-
[ '_id' => new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1') ],
9+
[ '_id' => new MongoDB\BSON\ObjectID('56315a7c6118fd1b920270b1') ],
1010
[ 'binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC) ],
1111
[ 'date' => new MongoDB\BSON\UTCDateTime(1445990400000) ],
1212
[ 'timestamp' => new MongoDB\BSON\Timestamp(1234, 5678) ],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ MongoDB\BSON\toJSON(): Encoding extended JSON types
66
require_once __DIR__ . '/../utils/tools.php';
77

88
$tests = [
9-
[ '_id' => new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1') ],
9+
[ '_id' => new MongoDB\BSON\ObjectID('56315a7c6118fd1b920270b1') ],
1010
[ 'binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC) ],
1111
[ 'date' => new MongoDB\BSON\UTCDateTime(1445990400000) ],
1212
[ 'timestamp' => new MongoDB\BSON\Timestamp(1234, 5678) ],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ MongoDB\BSON\toRelaxedExtendedJSON(): Encoding extended JSON types
66
require_once __DIR__ . '/../utils/tools.php';
77

88
$tests = [
9-
[ '_id' => new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1') ],
9+
[ '_id' => new MongoDB\BSON\ObjectID('56315a7c6118fd1b920270b1') ],
1010
[ 'binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC) ],
1111
[ 'date' => new MongoDB\BSON\UTCDateTime(1445990400000) ],
1212
[ 'timestamp' => new MongoDB\BSON\Timestamp(1234, 5678) ],

‎tests/cursorid/cursorid_error-001.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
--TEST--
2-
MongoDB\Driver\CursorId cannot be extended
2+
MongoDB\Driver\CursorID cannot be extended
33
--FILE--
44
<?php
55

6-
class MyCursorId extends MongoDB\Driver\CursorId {}
6+
class MyCursorID extends MongoDB\Driver\CursorID {}
77

88
?>
99
===DONE===
1010
<?php exit(0); ?>
1111
--EXPECTF--
12-
Fatal error: Class MyCursorId may not inherit from final class (MongoDB\Driver\CursorId) in %s on line %d
12+
Fatal error: Class MyCursorID may not inherit from final class (MongoDB\Driver\CursorID) in %s on line %d

‎tests/functional/cursorid-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var_dump($s1 > 0);
3030
===DONE===
3131
<?php exit(0); ?>
3232
--EXPECTF--
33-
object(MongoDB\Driver\CursorId)#%d (%d) {
33+
object(MongoDB\Driver\CursorID)#%d (%d) {
3434
["id"]=>
3535
%rint\(\d+\)|string\(\d+\) "\d+"%r
3636
}

0 commit comments

Comments
 (0)