retrieve ClassEntry for called scope

Author: brettmc

phper-sys/php_wrapper.c

@@ -348,6 +348,10 @@ zval *phper_get_this(zend_execute_data *execute_data) {
     return getThis();
 }
 
+zend_class_entry *phper_get_called_scope(zend_execute_data *execute_data) {
+    return zend_get_called_scope(execute_data);
+}
+
 size_t phper_zend_object_properties_size(zend_class_entry *ce) {
     return zend_object_properties_size(ce);
 }

phper/src/values.rs

@@ -12,6 +12,7 @@
 
 use crate::{
     arrays::{ZArr, ZArray},
+    classes::ClassEntry,
     errors::ExpectTypeError,
     functions::{ZFunc, call_internal},
     objects::{StateObject, ZObj, ZObject},
@@ -192,10 +193,14 @@ impl ExecuteData {
     }
 
     /// Gets associated called scope if it exists
-    pub fn get_called_scope(&mut self) -> Option<&ZStr> {
+    pub fn get_called_scope(&mut self) -> Option<&ClassEntry> {
         unsafe {
-            let val = ZVal::from_ptr(phper_get_called_scope(&mut self.inner));
-            val.as_z_str()
+            let ptr = phper_get_called_scope(&mut self.inner);
+            if ptr.is_null() {
+                None
+            } else {
+                Some(ClassEntry::from_ptr(ptr))
+            }
         }
     }