Merge pull request #60

Author: jmikola

config.m4

@@ -109,7 +109,7 @@ if test "$MONGODB" != "no"; then
     PHP_CHECK_GCC_ARG(-Wempty-body,                     _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wempty-body")
     PHP_CHECK_GCC_ARG(-Wparentheses,                    _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wparentheses")
     PHP_CHECK_GCC_ARG(-Wdeclaration-after-statement,    _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wdeclaration-after-statement")
-    PHP_CHECK_GCC_ARG(-Werror,                          _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Werror")
+    dnl PHP_CHECK_GCC_ARG(-Werror,                          _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Werror")
 
 
     MAINTAINER_CFLAGS="-Wextra $_MAINTAINER_CFLAGS  -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-missing-field-initializers"

src/bson.c

@@ -212,10 +212,6 @@ bool php_phongo_bson_visit_binary(const bson_iter_t *iter ARG_UNUSED, const char
 
 	if (v_subtype == 0x80 && strcmp(key, PHONGO_ODM_FIELD_NAME) ==0) {
 		((php_phongo_bson_state *)data)->odm = zend_fetch_class((char *)v_binary, v_binary_len, ZEND_FETCH_CLASS_AUTO|ZEND_FETCH_CLASS_SILENT TSRMLS_CC);
-		if (((php_phongo_bson_state *)data)->odm) {
-			return false;
-		}
-		/* Couldn't resolve the classname, resolve the type as binary */
 	}
 
 	MAKE_STD_ZVAL(zchild);

tests/bson/bson-encode-003.phpt

@@ -57,7 +57,10 @@ object(stdClass)#%d (1) {
   ["stuff"]=>
   object(MyClass)#%d (1) {
     ["props"]=>
-    array(2) {
+    array(3) {
+      ["__pclass"]=>
+      object(%sBSON\Binary)#%d (0) {
+      }
       ["random"]=>
       string(5) "class"
       [0]=>
@@ -74,7 +77,10 @@ object(stdClass)#%d (1) {
   ["stuff"]=>
   object(MyClass2)#%d (1) {
     ["props"]=>
-    array(3) {
+    array(4) {
+      ["__pclass"]=>
+      object(%sBSON\Binary)#%d (0) {
+      }
       [0]=>
       int(1)
       [1]=>
@@ -100,7 +106,10 @@ object(stdClass)#%d (1) {
     [0]=>
     object(MyClass)#%d (1) {
       ["props"]=>
-      array(2) {
+      array(3) {
+        ["__pclass"]=>
+        object(%sBSON\Binary)#%d (0) {
+        }
         ["random"]=>
         string(5) "class"
         [0]=>
@@ -110,7 +119,10 @@ object(stdClass)#%d (1) {
     [1]=>
     object(MyClass2)#%d (1) {
       ["props"]=>
-      array(3) {
+      array(4) {
+        ["__pclass"]=>
+        object(%sBSON\Binary)#%d (0) {
+        }
         [0]=>
         int(1)
         [1]=>