Check instance_of() so subclasses also work

Author: joehoyle

src/types/class_object.rs

@@ -167,7 +167,7 @@ impl<T: RegisteredClass> ZendClassObject<T> {
             (ptr as *mut Self).as_mut()?
         };
 
-        if ptr.std.is_instance::<T>() {
+        if ptr.std.instance_of(T::get_metadata().ce()) {
             Some(ptr)
         } else {
             None

src/zend/handlers.rs

@@ -52,13 +52,13 @@ impl ZendObjectHandlers {
     }
 
     unsafe extern "C" fn free_obj<T: RegisteredClass>(object: *mut ZendObject) {
-        object
+        let obj = object
             .as_mut()
             .and_then(|obj| ZendClassObject::<T>::from_zend_obj_mut(obj))
-            .map(|obj|ptr::drop_in_place(&mut obj.obj));
+            .expect("Invalid object pointer given for `free_obj`");
 
         // Manually drop the object as we don't want to free the underlying memory.
-
+        ptr::drop_in_place(&mut obj.obj);
 
         zend_object_std_dtor(object)
     }