Revert "Use canonical ObjectID class name in tests"

This reverts commit 991cbe8.

Author: jmikola

src/bson-encode.c

@@ -207,7 +207,7 @@ static void php_phongo_bson_append_object(bson_t *bson, php_phongo_bson_flags_t
 			bson_oid_t oid;
 			php_phongo_objectid_t *intern = Z_OBJECTID_OBJ_P(object);
 
-			mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding ObjectID");
+			mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding ObjectId");
 			bson_oid_init_from_string(&oid, intern->oid);
 			bson_append_oid(bson, key, key_len, &oid);
 			return;

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

@@ -1,5 +1,5 @@
 --TEST--
-ObjectID: OID truncated
+ObjectId: OID truncated
 --DESCRIPTION--
 Generated by scripts/convert-bson-corpus-tests.php
 

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

@@ -1,5 +1,5 @@
 --TEST--
-ObjectID: All zeroes
+ObjectId: All zeroes
 --DESCRIPTION--
 Generated by scripts/convert-bson-corpus-tests.php
 

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

@@ -1,5 +1,5 @@
 --TEST--
-ObjectID: All ones
+ObjectId: All ones
 --DESCRIPTION--
 Generated by scripts/convert-bson-corpus-tests.php
 

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

@@ -1,5 +1,5 @@
 --TEST--
-ObjectID: Random
+ObjectId: Random
 --DESCRIPTION--
 Generated by scripts/convert-bson-corpus-tests.php
 

tests/bson/bson-fromPHP_error-003.phpt

@@ -15,7 +15,7 @@ $tests = array(
     new MongoDB\BSON\Javascript('function foo(bar) {var baz = bar; var bar = foo; return bar; }'),
     new MongoDB\BSON\MinKey,
     new MongoDB\BSON\MaxKey,
-    new MongoDB\BSON\ObjectID,
+    new MongoDB\BSON\ObjectId,
     new MongoDB\BSON\Regex('regexp', 'i'),
     new MongoDB\BSON\Timestamp(1234, 5678),
     new MongoDB\BSON\UTCDateTime('1416445411987'),

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

@@ -7,7 +7,7 @@ $tests = [
     ['function foo(bar) { return bar; }', null],
     ['function foo(bar) { return bar; }', []],
     ['function foo() { return foo; }', ['foo' => 42]],
-    ['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectID('53e2a1c40640fd72175d4603')]],
+    ['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectId('53e2a1c40640fd72175d4603')]],
 ];
 
 foreach ($tests as $test) {

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

@@ -7,7 +7,7 @@ $tests = [
     ['function foo(bar) { return bar; }', null],
     ['function foo(bar) { return bar; }', []],
     ['function foo() { return foo; }', ['foo' => 42]],
-    ['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectID('53e2a1c40640fd72175d4603')]],
+    ['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectId('53e2a1c40640fd72175d4603')]],
 ];
 
 foreach ($tests as $test) {

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

@@ -7,7 +7,7 @@ $tests = [
     ['function foo(bar) { return bar; }', null],
     ['function foo(bar) { return bar; }', []],
     ['function foo() { return foo; }', ['foo' => 42]],
-    ['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectID('53e2a1c40640fd72175d4603')]],
+    ['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectId('53e2a1c40640fd72175d4603')]],
 ];
 
 foreach ($tests as $test) {

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

@@ -7,7 +7,7 @@ $tests = [
     ['function foo(bar) { return bar; }', null],
     ['function foo(bar) { return bar; }', []],
     ['function foo() { return foo; }', ['foo' => 42]],
-    ['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectID('53e2a1c40640fd72175d4603')]],
+    ['function foo() { return id; }', ['id' => new MongoDB\BSON\ObjectId('53e2a1c40640fd72175d4603')]],
 ];
 
 foreach ($tests as $test) {

tests/bson/bson-toCanonicalJSON-002.phpt

@@ -6,7 +6,7 @@ MongoDB\BSON\toCanonicalExtendedJSON(): Encoding extended JSON types
 require_once __DIR__ . '/../utils/tools.php';
 
 $tests = [
-    [ '_id' => new MongoDB\BSON\ObjectID('56315a7c6118fd1b920270b1') ],
+    [ '_id' => new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1') ],
     [ 'binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC) ],
     [ 'date' => new MongoDB\BSON\UTCDateTime(1445990400000) ],
     [ 'timestamp' => new MongoDB\BSON\Timestamp(1234, 5678) ],

tests/bson/bson-toJSON-002.phpt

@@ -6,7 +6,7 @@ MongoDB\BSON\toJSON(): Encoding extended JSON types
 require_once __DIR__ . '/../utils/tools.php';
 
 $tests = [
-    [ '_id' => new MongoDB\BSON\ObjectID('56315a7c6118fd1b920270b1') ],
+    [ '_id' => new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1') ],
     [ 'binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC) ],
     [ 'date' => new MongoDB\BSON\UTCDateTime(1445990400000) ],
     [ 'timestamp' => new MongoDB\BSON\Timestamp(1234, 5678) ],

tests/bson/bson-toRelaxedJSON-002.phpt

@@ -6,7 +6,7 @@ MongoDB\BSON\toRelaxedExtendedJSON(): Encoding extended JSON types
 require_once __DIR__ . '/../utils/tools.php';
 
 $tests = [
-    [ '_id' => new MongoDB\BSON\ObjectID('56315a7c6118fd1b920270b1') ],
+    [ '_id' => new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1') ],
     [ 'binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC) ],
     [ 'date' => new MongoDB\BSON\UTCDateTime(1445990400000) ],
     [ 'timestamp' => new MongoDB\BSON\Timestamp(1234, 5678) ],