mongodb · jmikola · Aug 5, 2016 · Aug 4, 2016 · Aug 4, 2016 · Aug 4, 2016
diff --git a/php_bson.h b/php_bson.h
@@ -26,13 +26,6 @@
 /* PHP Core stuff */
 #include <php.h>
 
-/* Check if we are part of pecl/mongodb or standalone (pecl/bson) */
-#ifdef HAVE_MONGOC
-#define BSON_NAMESPACE "MongoDB\\BSON"
-#else
-#define BSON_NAMESPACE "BSON"
-#endif
-
 #define BSON_UNSERIALIZE_FUNC_NAME    "bsonUnserialize"
 #define BSON_SERIALIZE_FUNC_NAME      "bsonSerialize"
 

diff --git a/php_phongo.c b/php_phongo.c
@@ -2507,7 +2507,6 @@ PHP_MINIT_FUNCTION(mongodb)
 
 	REGISTER_STRING_CONSTANT("MONGODB_VERSION", (char *)MONGODB_VERSION_S, CONST_CS | CONST_PERSISTENT);
 	REGISTER_STRING_CONSTANT("MONGODB_STABILITY", (char *)MONGODB_STABILITY_S, CONST_CS | CONST_PERSISTENT);
-	REGISTER_STRING_CONSTANT("BSON_NAMESPACE", (char *)BSON_NAMESPACE, CONST_CS | CONST_PERSISTENT);
 
 	return SUCCESS;
 }
@@ -2586,10 +2585,10 @@ ZEND_BEGIN_ARG_INFO_EX(ai_bson_fromJSON, 0, 0, 1)
 ZEND_END_ARG_INFO();
 
 const zend_function_entry mongodb_functions[] = {
-	ZEND_NS_FE(BSON_NAMESPACE, fromPHP, ai_bson_fromPHP)
-	ZEND_NS_FE(BSON_NAMESPACE, toPHP,   ai_bson_toPHP)
-	ZEND_NS_FE(BSON_NAMESPACE, toJSON,    ai_bson_toJSON)
-	ZEND_NS_FE(BSON_NAMESPACE, fromJSON,  ai_bson_fromJSON)
+	ZEND_NS_FE("MongoDB\\BSON", fromPHP, ai_bson_fromPHP)
+	ZEND_NS_FE("MongoDB\\BSON", toPHP,   ai_bson_toPHP)
+	ZEND_NS_FE("MongoDB\\BSON", toJSON,    ai_bson_toJSON)
+	ZEND_NS_FE("MongoDB\\BSON", fromJSON,  ai_bson_fromJSON)
 	PHP_FE_END
 };
 /* }}} */

diff --git a/src/BSON/Binary.c b/src/BSON/Binary.c
@@ -312,7 +312,7 @@ PHP_MINIT_FUNCTION(Binary)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "Binary", php_phongo_binary_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\BSON", "Binary", php_phongo_binary_me);
 	php_phongo_binary_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_binary_ce->create_object = php_phongo_binary_create_object;
 	PHONGO_CE_FINAL(php_phongo_binary_ce);

diff --git a/src/BSON/Decimal128.c b/src/BSON/Decimal128.c
@@ -267,7 +267,7 @@ PHP_MINIT_FUNCTION(Decimal128)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "Decimal128", php_phongo_decimal128_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\BSON", "Decimal128", php_phongo_decimal128_me);
 	php_phongo_decimal128_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_decimal128_ce->create_object = php_phongo_decimal128_create_object;
 	PHONGO_CE_FINAL(php_phongo_decimal128_ce);

diff --git a/src/BSON/Javascript.c b/src/BSON/Javascript.c
@@ -370,7 +370,7 @@ PHP_MINIT_FUNCTION(Javascript)
 	(void)type;(void)module_number;
 
 
-	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "Javascript", php_phongo_javascript_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\BSON", "Javascript", php_phongo_javascript_me);
 	php_phongo_javascript_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_javascript_ce->create_object = php_phongo_javascript_create_object;
 	PHONGO_CE_FINAL(php_phongo_javascript_ce);

diff --git a/src/BSON/MaxKey.c b/src/BSON/MaxKey.c
@@ -129,7 +129,7 @@ PHP_MINIT_FUNCTION(MaxKey)
 	(void)type;(void)module_number;
 
 
-	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "MaxKey", php_phongo_maxkey_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\BSON", "MaxKey", php_phongo_maxkey_me);
 	php_phongo_maxkey_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_maxkey_ce->create_object = php_phongo_maxkey_create_object;
 	PHONGO_CE_FINAL(php_phongo_maxkey_ce);

diff --git a/src/BSON/MinKey.c b/src/BSON/MinKey.c
@@ -130,7 +130,7 @@ PHP_MINIT_FUNCTION(MinKey)
 	(void)type;(void)module_number;
 
 
-	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "MinKey", php_phongo_minkey_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\BSON", "MinKey", php_phongo_minkey_me);
 	php_phongo_minkey_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_minkey_ce->create_object = php_phongo_minkey_create_object;
 	PHONGO_CE_FINAL(php_phongo_minkey_ce);

diff --git a/src/BSON/ObjectID.c b/src/BSON/ObjectID.c
@@ -301,7 +301,7 @@ PHP_MINIT_FUNCTION(ObjectID)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "ObjectID", php_phongo_objectid_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\BSON", "ObjectID", php_phongo_objectid_me);
 	php_phongo_objectid_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_objectid_ce->create_object = php_phongo_objectid_create_object;
 	PHONGO_CE_FINAL(php_phongo_objectid_ce);

diff --git a/src/BSON/Persistable.c b/src/BSON/Persistable.c
@@ -63,7 +63,7 @@ PHP_MINIT_FUNCTION(Persistable)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "Persistable", php_phongo_persistable_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\BSON", "Persistable", php_phongo_persistable_me);
 	php_phongo_persistable_ce = zend_register_internal_interface(&ce TSRMLS_CC);
 	zend_class_implements(php_phongo_persistable_ce TSRMLS_CC, 2, php_phongo_unserializable_ce, php_phongo_serializable_ce);
 

diff --git a/src/BSON/Regex.c b/src/BSON/Regex.c
@@ -352,7 +352,7 @@ PHP_MINIT_FUNCTION(Regex)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "Regex", php_phongo_regex_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\BSON", "Regex", php_phongo_regex_me);
 	php_phongo_regex_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_regex_ce->create_object = php_phongo_regex_create_object;
 	PHONGO_CE_FINAL(php_phongo_regex_ce);

diff --git a/src/BSON/Serializable.c b/src/BSON/Serializable.c
@@ -66,7 +66,7 @@ PHP_MINIT_FUNCTION(Serializable)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "Serializable", php_phongo_serializable_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\BSON", "Serializable", php_phongo_serializable_me);
 	php_phongo_serializable_ce = zend_register_internal_interface(&ce TSRMLS_CC);
 	zend_class_implements(php_phongo_serializable_ce TSRMLS_CC, 1, php_phongo_type_ce);
 

diff --git a/src/BSON/Timestamp.c b/src/BSON/Timestamp.c
@@ -303,7 +303,7 @@ PHP_MINIT_FUNCTION(Timestamp)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "Timestamp", php_phongo_timestamp_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\BSON", "Timestamp", php_phongo_timestamp_me);
 	php_phongo_timestamp_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_timestamp_ce->create_object = php_phongo_timestamp_create_object;
 	PHONGO_CE_FINAL(php_phongo_timestamp_ce);

diff --git a/src/BSON/Type.c b/src/BSON/Type.c
@@ -63,7 +63,7 @@ PHP_MINIT_FUNCTION(Type)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "Type", php_phongo_type_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\BSON", "Type", php_phongo_type_me);
 	php_phongo_type_ce = zend_register_internal_interface(&ce TSRMLS_CC);
 
 	return SUCCESS;

diff --git a/src/BSON/UTCDateTime.c b/src/BSON/UTCDateTime.c
@@ -421,7 +421,7 @@ PHP_MINIT_FUNCTION(UTCDateTime)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "UTCDateTime", php_phongo_utcdatetime_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\BSON", "UTCDateTime", php_phongo_utcdatetime_me);
 	php_phongo_utcdatetime_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	php_phongo_utcdatetime_ce->create_object = php_phongo_utcdatetime_create_object;
 	PHONGO_CE_FINAL(php_phongo_utcdatetime_ce);

diff --git a/src/BSON/Unserializable.c b/src/BSON/Unserializable.c
@@ -67,7 +67,7 @@ PHP_MINIT_FUNCTION(Unserializable)
 	zend_class_entry ce;
 	(void)type;(void)module_number;
 
-	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "Unserializable", php_phongo_unserializable_me);
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\BSON", "Unserializable", php_phongo_unserializable_me);
 	php_phongo_unserializable_ce = zend_register_internal_interface(&ce TSRMLS_CC);
 
 	return SUCCESS;

diff --git a/src/bson.c b/src/bson.c
@@ -1552,7 +1552,7 @@ static void apply_classname_to_state(const char *classname, int classname_len, p
 		} else if (!PHONGO_IS_CLASS_INSTANTIATABLE(found_ce)) {
 			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Class %s is not instantiatable", classname);
 		} else if (!instanceof_function(found_ce, php_phongo_unserializable_ce TSRMLS_CC)) {
-			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Class %s does not implement %s\\Unserializable", classname, BSON_NAMESPACE);
+			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Class %s does not implement %s", classname, ZSTR_VAL(php_phongo_unserializable_ce->name));
 		} else {
 			*type = PHONGO_TYPEMAP_CLASS;
 			*type_ce = found_ce;

diff --git a/tests/bson/bson-binary-001.phpt b/tests/bson/bson-binary-001.phpt
@@ -1,25 +1,23 @@
 --TEST--
-BSON BSON\Binary #001
+MongoDB\BSON\Binary #001
 --FILE--
 <?php
 
 require_once __DIR__ . '/../utils/tools.php';
 
-$classname = BSON_NAMESPACE . "\\Binary";
-
 $types = array(
-    $classname::TYPE_GENERIC,
-    $classname::TYPE_FUNCTION,
-    $classname::TYPE_OLD_BINARY,
-    $classname::TYPE_OLD_UUID,
-    $classname::TYPE_UUID,
-    $classname::TYPE_MD5,
-    $classname::TYPE_USER_DEFINED,
-    $classname::TYPE_USER_DEFINED+5,
+    MongoDB\BSON\Binary::TYPE_GENERIC,
+    MongoDB\BSON\Binary::TYPE_FUNCTION,
+    MongoDB\BSON\Binary::TYPE_OLD_BINARY,
+    MongoDB\BSON\Binary::TYPE_OLD_UUID,
+    MongoDB\BSON\Binary::TYPE_UUID,
+    MongoDB\BSON\Binary::TYPE_MD5,
+    MongoDB\BSON\Binary::TYPE_USER_DEFINED,
+    MongoDB\BSON\Binary::TYPE_USER_DEFINED+5,
 );
 $tests = array();
 foreach($types as $type) {
-    $binary = new $classname("random binary data", $type);
+    $binary = new MongoDB\BSON\Binary("random binary data", $type);
     var_dump($binary->getData() == "random binary data");
     var_dump($binary->getType() == $type);
     $tests[] = array("binary" => $binary);

diff --git a/tests/bson/bson-binary_error-001.phpt b/tests/bson/bson-binary_error-001.phpt
@@ -1,29 +1,27 @@
 --TEST--
-BSON BSON\Binary #001 error
+MongoDB\BSON\Binary #001 error
 --SKIPIF--
 <?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM handles parameter parsing differently"); ?>
 --FILE--
 <?php
 
 require_once __DIR__ . '/../utils/tools.php';
 
-$classname = BSON_NAMESPACE . "\\Binary";
-
-$binary = new $classname("random binary data", $classname::TYPE_GENERIC);
+$binary = new MongoDB\BSON\Binary("random binary data", MongoDB\BSON\Binary::TYPE_GENERIC);
 $binary->getData(2);
 $binary->getType(2);
 
-throws(function() use($classname) {
-    new $classname("random binary data without type");
+throws(function() {
+    new MongoDB\BSON\Binary("random binary data without type");
 }, "MongoDB\\Driver\\Exception\\InvalidArgumentException");
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Warning: %s\Binary::getData() expects exactly 0 parameters, 1 given in %s on line %d
+Warning: MongoDB\BSON\Binary::getData() expects exactly 0 parameters, 1 given in %s on line %d
 
-Warning: %s\Binary::getType() expects exactly 0 parameters, 1 given in %s on line %d
+Warning: MongoDB\BSON\Binary::getType() expects exactly 0 parameters, 1 given in %s on line %d
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 ===DONE===
 
diff --git a/tests/bson/bson-binary_error-002.phpt b/tests/bson/bson-binary_error-002.phpt
@@ -1,14 +1,12 @@
 --TEST--
-BSON BSON\Binary cannot be extended
+MongoDB\BSON\Binary cannot be extended
 --FILE--
 <?php
 
-use MongoDB\BSON as BSON;
-
-class MyBinary extends BSON\Binary {}
+class MyBinary extends MongoDB\BSON\Binary {}
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Fatal error: Class MyBinary may not inherit from final class (%SBSON\Binary) in %s on line %d
+Fatal error: Class MyBinary may not inherit from final class (MongoDB\BSON\Binary) in %s on line %d
diff --git a/tests/bson/bson-binary_error-003.phpt b/tests/bson/bson-binary_error-003.phpt
@@ -1,18 +1,16 @@
 --TEST--
-BSON BSON\Binary constructor requires unsigned 8-bit integer for type
+MongoDB\BSON\Binary constructor requires unsigned 8-bit integer for type
 --FILE--
 <?php
 
 require_once __DIR__ . '/../utils/tools.php';
 
-use MongoDB\BSON as BSON;
-
 echo throws(function() {
-    new BSON\Binary('foo', -1);
+    new MongoDB\BSON\Binary('foo', -1);
 }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
 
 echo throws(function() {
-    new BSON\Binary('foo', 256);
+    new MongoDB\BSON\Binary('foo', 256);
 }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
 
 ?>

diff --git a/tests/bson/bson-decimal128-001.phpt b/tests/bson/bson-decimal128-001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-BSON\Decimal128
+MongoDB\BSON\Decimal128
 --SKIPIF--
 <?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
 --FILE--

diff --git a/tests/bson/bson-decimal128-002.phpt b/tests/bson/bson-decimal128-002.phpt
@@ -1,5 +1,5 @@
 --TEST--
-BSON\Decimal128 NaN values
+MongoDB\BSON\Decimal128 NaN values
 --SKIPIF--
 <?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
 --FILE--

diff --git a/tests/bson/bson-decimal128-003.phpt b/tests/bson/bson-decimal128-003.phpt
@@ -1,5 +1,5 @@
 --TEST--
-BSON\Decimal128 Infinity values
+MongoDB\BSON\Decimal128 Infinity values
 --SKIPIF--
 <?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
 --FILE--

diff --git a/tests/bson/bson-decimal128-004.phpt b/tests/bson/bson-decimal128-004.phpt
@@ -1,5 +1,5 @@
 --TEST--
-BSON\Decimal128 debug handler
+MongoDB\BSON\Decimal128 debug handler
 --SKIPIF--
 <?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
 --FILE--

diff --git a/tests/bson/bson-decode-002.phpt b/tests/bson/bson-decode-002.phpt
@@ -2,11 +2,10 @@
 BSON encoding: Encoding object/arrays data into user specificied classes
 --FILE--
 <?php
-use MongoDB\BSON as BSON;
 
 require_once __DIR__ . '/../utils/tools.php';
 
-class MyArrayObject extends ArrayObject implements BSON\Unserializable {
+class MyArrayObject extends ArrayObject implements MongoDB\BSON\Unserializable {
     function bsonUnserialize(array $data) {
         parent::__construct($data);
     }

diff --git a/tests/bson/bson-encode-001.phpt b/tests/bson/bson-encode-001.phpt
@@ -2,7 +2,6 @@
 BSON encoding: Encoding data into BSON representation, and BSON into Extended JSON
 --FILE--
 <?php
-use MongoDB\BSON as BSON;
 
 require_once __DIR__ . '/../utils/tools.php';
 

diff --git a/tests/bson/bson-encode-002.phpt b/tests/bson/bson-encode-002.phpt
@@ -2,11 +2,10 @@
 BSON encoding: Encoding objects into BSON representation
 --FILE--
 <?php
-use MongoDB\BSON as BSON;
 
 require_once __DIR__ . '/../utils/tools.php';
 
-class AssociativeArray implements BSON\Serializable, BSON\Unserializable
+class AssociativeArray implements MongoDB\BSON\Serializable, MongoDB\BSON\Unserializable
 {
     public function bsonSerialize()
     {
@@ -20,7 +19,7 @@ class AssociativeArray implements BSON\Serializable, BSON\Unserializable
     }
 }
 
-class NumericArray implements BSON\Serializable, BSON\Unserializable
+class NumericArray implements MongoDB\BSON\Serializable, MongoDB\BSON\Unserializable
 {
     public function bsonSerialize()
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     BSON encoding: Encoding data into BSON representation, and BSON into Extended JSON
     --FILE--
     <?php
-    use MongoDB\BSON as BSON;
     require_once __DIR__ . '/../utils/tools.php';
@@ Expand Down @@