Merge pull request #126

jmikola · jmikola · commit c36781989dce · 2015-10-20T12:22:21.000-04:00
diff --git a/src/BSON/Binary.c b/src/BSON/Binary.c
@@ -123,6 +123,7 @@ static zend_function_entry php_phongo_binary_me[] = {
 	PHP_ME(Binary, __construct, ai_Binary___construct, ZEND_ACC_PUBLIC)
 	PHP_ME(Binary, getData, ai_Binary_getData, ZEND_ACC_PUBLIC)
 	PHP_ME(Binary, getType, ai_Binary_getType, ZEND_ACC_PUBLIC)
+	PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -182,8 +183,9 @@ PHP_MINIT_FUNCTION(Binary)
 	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "Binary", php_phongo_binary_me);
-	ce.create_object = php_phongo_binary_create_object;
 	php_phongo_binary_ce = zend_register_internal_class(&ce TSRMLS_CC);
+	php_phongo_binary_ce->create_object = php_phongo_binary_create_object;
+	PHONGO_CE_INIT(php_phongo_binary_ce);
 
 	zend_class_implements(php_phongo_binary_ce TSRMLS_CC, 1, php_phongo_type_ce);
 
diff --git a/src/BSON/Javascript.c b/src/BSON/Javascript.c
@@ -85,6 +85,7 @@ ZEND_END_ARG_INFO();
 
 static zend_function_entry php_phongo_javascript_me[] = {
 	PHP_ME(Javascript, __construct, ai_Javascript___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
+	PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -167,8 +168,9 @@ PHP_MINIT_FUNCTION(Javascript)
 
 
 	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "Javascript", php_phongo_javascript_me);
-	ce.create_object = php_phongo_javascript_create_object;
 	php_phongo_javascript_ce = zend_register_internal_class(&ce TSRMLS_CC);
+	php_phongo_javascript_ce->create_object = php_phongo_javascript_create_object;
+	PHONGO_CE_INIT(php_phongo_javascript_ce);
 
 	zend_class_implements(php_phongo_javascript_ce TSRMLS_CC, 1, php_phongo_type_ce);
 
diff --git a/src/BSON/MaxKey.c b/src/BSON/MaxKey.c
@@ -50,6 +50,7 @@ PHONGO_API zend_class_entry *php_phongo_maxkey_ce;
 
 
 static zend_function_entry php_phongo_maxkey_me[] = {
+	PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -92,8 +93,9 @@ PHP_MINIT_FUNCTION(MaxKey)
 
 
 	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "MaxKey", php_phongo_maxkey_me);
-	ce.create_object = php_phongo_maxkey_create_object;
 	php_phongo_maxkey_ce = zend_register_internal_class(&ce TSRMLS_CC);
+	php_phongo_maxkey_ce->create_object = php_phongo_maxkey_create_object;
+	PHONGO_CE_INIT(php_phongo_maxkey_ce);
 
 	zend_class_implements(php_phongo_maxkey_ce TSRMLS_CC, 1, php_phongo_type_ce);
 
diff --git a/src/BSON/MinKey.c b/src/BSON/MinKey.c
@@ -50,6 +50,7 @@ PHONGO_API zend_class_entry *php_phongo_minkey_ce;
 
 
 static zend_function_entry php_phongo_minkey_me[] = {
+	PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -92,8 +93,9 @@ PHP_MINIT_FUNCTION(MinKey)
 
 
 	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "MinKey", php_phongo_minkey_me);
-	ce.create_object = php_phongo_minkey_create_object;
 	php_phongo_minkey_ce = zend_register_internal_class(&ce TSRMLS_CC);
+	php_phongo_minkey_ce->create_object = php_phongo_minkey_create_object;
+	PHONGO_CE_INIT(php_phongo_minkey_ce);
 
 	zend_class_implements(php_phongo_minkey_ce TSRMLS_CC, 1, php_phongo_type_ce);
 
diff --git a/src/BSON/ObjectID.c b/src/BSON/ObjectID.c
@@ -116,6 +116,7 @@ ZEND_END_ARG_INFO();
 static zend_function_entry php_phongo_objectid_me[] = {
 	PHP_ME(ObjectID, __construct, ai_ObjectID___construct, ZEND_ACC_PUBLIC)
 	PHP_ME(ObjectID, __toString, ai_ObjectID___toString, ZEND_ACC_PUBLIC)
+	PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -186,6 +187,7 @@ PHP_MINIT_FUNCTION(ObjectID)
 	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "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_INIT(php_phongo_objectid_ce);
 
 	zend_class_implements(php_phongo_objectid_ce TSRMLS_CC, 1, php_phongo_type_ce);
 
diff --git a/src/BSON/Regex.c b/src/BSON/Regex.c
@@ -152,6 +152,7 @@ static zend_function_entry php_phongo_regex_me[] = {
 	PHP_ME(Regex, getPattern, ai_Regex_getPattern, ZEND_ACC_PUBLIC)
 	PHP_ME(Regex, getFlags, ai_Regex_getFlags, ZEND_ACC_PUBLIC)
 	PHP_ME(Regex, __toString, ai_Regex___toString, ZEND_ACC_PUBLIC)
+	PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -217,8 +218,9 @@ PHP_MINIT_FUNCTION(Regex)
 	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "Regex", php_phongo_regex_me);
-	ce.create_object = php_phongo_regex_create_object;
 	php_phongo_regex_ce = zend_register_internal_class(&ce TSRMLS_CC);
+	php_phongo_regex_ce->create_object = php_phongo_regex_create_object;
+	PHONGO_CE_INIT(php_phongo_regex_ce);
 
 	zend_class_implements(php_phongo_regex_ce TSRMLS_CC, 1, php_phongo_type_ce);
 
diff --git a/src/BSON/Timestamp.c b/src/BSON/Timestamp.c
@@ -103,6 +103,7 @@ ZEND_END_ARG_INFO();
 static zend_function_entry php_phongo_timestamp_me[] = {
 	PHP_ME(Timestamp, __construct, ai_Timestamp___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(Timestamp, __toString, ai_Timestamp___toString, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
+	PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -161,8 +162,9 @@ PHP_MINIT_FUNCTION(Timestamp)
 	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "Timestamp", php_phongo_timestamp_me);
-	ce.create_object = php_phongo_timestamp_create_object;
 	php_phongo_timestamp_ce = zend_register_internal_class(&ce TSRMLS_CC);
+	php_phongo_timestamp_ce->create_object = php_phongo_timestamp_create_object;
+	PHONGO_CE_INIT(php_phongo_timestamp_ce);
 
 	zend_class_implements(php_phongo_timestamp_ce TSRMLS_CC, 1, php_phongo_type_ce);
 
diff --git a/src/BSON/UTCDateTime.c b/src/BSON/UTCDateTime.c
@@ -135,6 +135,7 @@ static zend_function_entry php_phongo_utcdatetime_me[] = {
 	PHP_ME(UTCDateTime, __construct, ai_UTCDateTime___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(UTCDateTime, __toString, ai_UTCDateTime___toString, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_ME(UTCDateTime, toDateTime, ai_UTCDateTime_toDateTime, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
+	PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -201,8 +202,9 @@ PHP_MINIT_FUNCTION(UTCDateTime)
 	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "UTCDateTime", php_phongo_utcdatetime_me);
-	ce.create_object = php_phongo_utcdatetime_create_object;
 	php_phongo_utcdatetime_ce = zend_register_internal_class(&ce TSRMLS_CC);
+	php_phongo_utcdatetime_ce->create_object = php_phongo_utcdatetime_create_object;
+	PHONGO_CE_INIT(php_phongo_utcdatetime_ce);
 
 	zend_class_implements(php_phongo_utcdatetime_ce TSRMLS_CC, 1, php_phongo_type_ce);
 
diff --git a/src/MongoDB/Exception/ConnectionTimeoutException.c b/src/MongoDB/Exception/ConnectionTimeoutException.c
@@ -62,7 +62,6 @@ PHP_MINIT_FUNCTION(ConnectionTimeoutException)
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "ConnectionTimeoutException", php_phongo_connectiontimeoutexception_me);
 	php_phongo_connectiontimeoutexception_ce = zend_register_internal_class_ex(&ce, php_phongo_connectionexception_ce, NULL TSRMLS_CC);
-	PHONGO_CE_INIT(php_phongo_connectiontimeoutexception_ce);
 
 	return SUCCESS;
 }
diff --git a/src/MongoDB/Exception/DuplicateKeyException.c b/src/MongoDB/Exception/DuplicateKeyException.c
@@ -62,7 +62,6 @@ PHP_MINIT_FUNCTION(DuplicateKeyException)
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "DuplicateKeyException", php_phongo_duplicatekeyexception_me);
 	php_phongo_duplicatekeyexception_ce = zend_register_internal_class_ex(&ce, php_phongo_writeexception_ce, NULL TSRMLS_CC);
-	PHONGO_CE_INIT(php_phongo_duplicatekeyexception_ce);
 
 	return SUCCESS;
 }
diff --git a/src/MongoDB/Exception/ExecutionTimeoutException.c b/src/MongoDB/Exception/ExecutionTimeoutException.c
@@ -62,7 +62,6 @@ PHP_MINIT_FUNCTION(ExecutionTimeoutException)
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "ExecutionTimeoutException", php_phongo_executiontimeoutexception_me);
 	php_phongo_executiontimeoutexception_ce = zend_register_internal_class_ex(&ce, php_phongo_runtimeexception_ce, NULL TSRMLS_CC);
-	PHONGO_CE_INIT(php_phongo_executiontimeoutexception_ce);
 
 	return SUCCESS;
 }
diff --git a/src/MongoDB/Exception/SSLConnectionException.c b/src/MongoDB/Exception/SSLConnectionException.c
@@ -62,7 +62,6 @@ PHP_MINIT_FUNCTION(SSLConnectionException)
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "SSLConnectionException", php_phongo_sslconnectionexception_me);
 	php_phongo_sslconnectionexception_ce = zend_register_internal_class_ex(&ce, php_phongo_connectionexception_ce, NULL TSRMLS_CC);
-	PHONGO_CE_INIT(php_phongo_sslconnectionexception_ce);
 
 	return SUCCESS;
 }
diff --git a/tests/bson/bson-binary_error-002.phpt b/tests/bson/bson-binary_error-002.phpt
@@ -0,0 +1,17 @@
+--TEST--
+BSON BSON\Binary cannot be extended
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+use MongoDB\BSON as BSON;
+
+class MyBinary extends BSON\Binary {}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Fatal error: Class MyBinary may not inherit from final class (%SBSON\Binary) in %s on line %d
diff --git a/tests/bson/bson-binary_error-003.phpt b/tests/bson/bson-binary_error-003.phpt
@@ -0,0 +1,28 @@
+--TEST--
+BSON BSON\Binary cannot be serialized
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+use MongoDB\BSON as BSON;
+
+echo throws(function() {
+    serialize(new BSON\Binary('foo', BSON\Binary::TYPE_GENERIC));
+}, 'Exception'), "\n";
+
+echo throws(function() {
+    $classname = BSON_NAMESPACE . '\Binary';
+    unserialize(sprintf('C:%d:"%s":0:{}', strlen($classname), $classname));
+}, 'Exception'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+OK: Got Exception
+Serialization of '%SBSON\Binary' is not allowed
+OK: Got Exception
+Unserialization of '%SBSON\Binary' is not allowed
+===DONE===
diff --git a/tests/bson/bson-javascript_error-002.phpt b/tests/bson/bson-javascript_error-002.phpt
@@ -0,0 +1,17 @@
+--TEST--
+BSON BSON\Javascript cannot be extended
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+use MongoDB\BSON as BSON;
+
+class MyJavascript extends BSON\Javascript {}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Fatal error: Class MyJavascript may not inherit from final class (%SBSON\Javascript) in %s on line %d
diff --git a/tests/bson/bson-javascript_error-003.phpt b/tests/bson/bson-javascript_error-003.phpt
@@ -0,0 +1,28 @@
+--TEST--
+BSON BSON\Javascript cannot be serialized
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+use MongoDB\BSON as BSON;
+
+echo throws(function() {
+    serialize(new BSON\Javascript('function() {}'));
+}, 'Exception'), "\n";
+
+echo throws(function() {
+    $classname = BSON_NAMESPACE . '\Javascript';
+    unserialize(sprintf('C:%d:"%s":0:{}', strlen($classname), $classname));
+}, 'Exception'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+OK: Got Exception
+Serialization of '%SBSON\Javascript' is not allowed
+OK: Got Exception
+Unserialization of '%SBSON\Javascript' is not allowed
+===DONE===
diff --git a/tests/bson/bson-maxkey_error-001.phpt b/tests/bson/bson-maxkey_error-001.phpt
@@ -0,0 +1,17 @@
+--TEST--
+BSON BSON\MaxKey cannot be extended
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+use MongoDB\BSON as BSON;
+
+class MyMaxKey extends BSON\MaxKey {}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Fatal error: Class MyMaxKey may not inherit from final class (%SBSON\MaxKey) in %s on line %d
diff --git a/tests/bson/bson-maxkey_error-002.phpt b/tests/bson/bson-maxkey_error-002.phpt
@@ -0,0 +1,28 @@
+--TEST--
+BSON BSON\MaxKey cannot be serialized
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+use MongoDB\BSON as BSON;
+
+echo throws(function() {
+    serialize(new BSON\MaxKey());
+}, 'Exception'), "\n";
+
+echo throws(function() {
+    $classname = BSON_NAMESPACE . '\MaxKey';
+    unserialize(sprintf('C:%d:"%s":0:{}', strlen($classname), $classname));
+}, 'Exception'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+OK: Got Exception
+Serialization of '%SBSON\MaxKey' is not allowed
+OK: Got Exception
+Unserialization of '%SBSON\MaxKey' is not allowed
+===DONE===
diff --git a/tests/bson/bson-minkey_error-001.phpt b/tests/bson/bson-minkey_error-001.phpt
@@ -0,0 +1,17 @@
+--TEST--
+BSON BSON\MinKey cannot be extended
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+use MongoDB\BSON as BSON;
+
+class MyMinKey extends BSON\MinKey {}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Fatal error: Class MyMinKey may not inherit from final class (%SBSON\MinKey) in %s on line %d
diff --git a/tests/bson/bson-minkey_error-002.phpt b/tests/bson/bson-minkey_error-002.phpt
@@ -0,0 +1,28 @@
+--TEST--
+BSON BSON\MinKey cannot be serialized
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+use MongoDB\BSON as BSON;
+
+echo throws(function() {
+    serialize(new BSON\MinKey());
+}, 'Exception'), "\n";
+
+echo throws(function() {
+    $classname = BSON_NAMESPACE . '\MinKey';
+    unserialize(sprintf('C:%d:"%s":0:{}', strlen($classname), $classname));
+}, 'Exception'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+OK: Got Exception
+Serialization of '%SBSON\MinKey' is not allowed
+OK: Got Exception
+Unserialization of '%SBSON\MinKey' is not allowed
+===DONE===
diff --git a/tests/bson/bson-objectid_error-002.phpt b/tests/bson/bson-objectid_error-002.phpt
@@ -0,0 +1,17 @@
+--TEST--
+BSON BSON\ObjectID cannot be extended
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+use MongoDB\BSON as BSON;
+
+class MyObjectID extends BSON\ObjectID {}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Fatal error: Class MyObjectID may not inherit from final class (%SBSON\ObjectID) in %s on line %d
diff --git a/tests/bson/bson-objectid_error-003.phpt b/tests/bson/bson-objectid_error-003.phpt
diff --git a/tests/bson/bson-regex_error-002.phpt b/tests/bson/bson-regex_error-002.phpt
diff --git a/tests/bson/bson-regex_error-003.phpt b/tests/bson/bson-regex_error-003.phpt
diff --git a/tests/bson/bson-timestamp_error-002.phpt b/tests/bson/bson-timestamp_error-002.phpt
diff --git a/tests/bson/bson-timestamp_error-003.phpt b/tests/bson/bson-timestamp_error-003.phpt
diff --git a/tests/bson/bson-utcdatetime_error-002.phpt b/tests/bson/bson-utcdatetime_error-002.phpt
diff --git a/tests/bson/bson-utcdatetime_error-003.phpt b/tests/bson/bson-utcdatetime_error-003.phpt

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ PHP_MINIT_FUNCTION(ConnectionTimeoutException)`
`62`	`62`
`63`	`63`	`INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "ConnectionTimeoutException", php_phongo_connectiontimeoutexception_me);`
`64`	`64`	`php_phongo_connectiontimeoutexception_ce = zend_register_internal_class_ex(&ce, php_phongo_connectionexception_ce, NULL TSRMLS_CC);`
`65`		`- PHONGO_CE_INIT(php_phongo_connectiontimeoutexception_ce);`
`66`	`65`
`67`	`66`	`return SUCCESS;`
`68`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ PHP_MINIT_FUNCTION(DuplicateKeyException)`
`62`	`62`
`63`	`63`	`INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "DuplicateKeyException", php_phongo_duplicatekeyexception_me);`
`64`	`64`	`php_phongo_duplicatekeyexception_ce = zend_register_internal_class_ex(&ce, php_phongo_writeexception_ce, NULL TSRMLS_CC);`
`65`		`- PHONGO_CE_INIT(php_phongo_duplicatekeyexception_ce);`
`66`	`65`
`67`	`66`	`return SUCCESS;`
`68`	`67`	`}`