Fixup

Author: danog

src/exception.rs

@@ -69,8 +69,8 @@ impl PhpException {
 
     /// Set the Zval object for the exception.
     ///
-    /// Exceptions can be based of instantiated Zval objects when you are throwing a custom exception with
-    /// stateful properties.
+    /// Exceptions can be based of instantiated Zval objects when you are
+    /// throwing a custom exception with stateful properties.
     ///
     /// # Parameters
     ///

src/types/zval.rs

@@ -222,7 +222,8 @@ impl Zval {
         }
     }
 
-    /// Returns a mutable reference to the zval if it is an internal indirect reference.
+    /// Returns a mutable reference to the zval if it is an internal indirect
+    /// reference.
     pub fn indirect_mut(&self) -> Option<&mut Zval> {
         if self.is_indirect() {
             Some(unsafe { &mut *(self.value.zv as *mut Zval) })

src/zend/globals.rs

@@ -1,6 +1,7 @@
 //! Types related to the PHP executor, sapi and process globals.
 
 use std::collections::HashMap;
+use std::ffi::CStr;
 use std::ops::{Deref, DerefMut};
 use std::slice;
 use std::str;
@@ -11,26 +12,21 @@ use crate::boxed::ZBox;
 #[cfg(php82)]
 use crate::ffi::zend_atomic_bool_store;
 use crate::ffi::{
-    _zend_executor_globals, ext_php_rs_executor_globals, ext_php_rs_file_globals,
-    ext_php_rs_process_globals, ext_php_rs_sapi_globals, php_core_globals, php_file_globals,
-    sapi_globals_struct, sapi_header_struct, sapi_headers_struct, sapi_request_info,
+    _sapi_module_struct, _zend_executor_globals, ext_php_rs_executor_globals,
+    ext_php_rs_file_globals, ext_php_rs_process_globals, ext_php_rs_sapi_globals,
+    ext_php_rs_sapi_module, php_core_globals, php_file_globals, sapi_globals_struct,
+    sapi_header_struct, sapi_headers_struct, sapi_request_info, zend_ini_entry,
     zend_is_auto_global, TRACK_VARS_COOKIE, TRACK_VARS_ENV, TRACK_VARS_FILES, TRACK_VARS_GET,
     TRACK_VARS_POST, TRACK_VARS_REQUEST, TRACK_VARS_SERVER,
-    _sapi_globals_struct, _sapi_module_struct, _zend_executor_globals, ext_php_rs_executor_globals,
-    ext_php_rs_sapi_globals, ext_php_rs_sapi_module, zend_ini_entry,
 };
 
 use crate::types::{ZendHashTable, ZendObject, ZendStr};
 
 use super::linked_list::ZendLinkedListIterator;
-use crate::types::{ZendHashTable, ZendObject};
 
 /// Stores global variables used in the PHP executor.
 pub type ExecutorGlobals = _zend_executor_globals;
 
-/// Stores global SAPI variables used in the PHP executor.
-pub type SapiGlobals = _sapi_globals_struct;
-
 /// Stores the SAPI module used in the PHP executor.
 pub type SapiModule = _sapi_module_struct;
 
@@ -157,40 +153,6 @@ impl ExecutorGlobals {
     }
 }
 
-impl SapiGlobals {
-    /// Returns a reference to the PHP SAPI globals.
-    ///
-    /// The executor globals are guarded by a RwLock. There can be multiple
-    /// immutable references at one time but only ever one mutable reference.
-    /// Attempting to retrieve the globals while already holding the global
-    /// guard will lead to a deadlock. Dropping the globals guard will release
-    /// the lock.
-    pub fn get() -> GlobalReadGuard<Self> {
-        // SAFETY: PHP executor globals are statically declared therefore should never
-        // return an invalid pointer.
-        let globals = unsafe { ext_php_rs_sapi_globals().as_ref() }
-            .expect("Static executor globals were invalid");
-        let guard = SAPI_LOCK.read();
-        GlobalReadGuard { globals, guard }
-    }
-
-    /// Returns a mutable reference to the PHP executor globals.
-    ///
-    /// The executor globals are guarded by a RwLock. There can be multiple
-    /// immutable references at one time but only ever one mutable reference.
-    /// Attempting to retrieve the globals while already holding the global
-    /// guard will lead to a deadlock. Dropping the globals guard will release
-    /// the lock.
-    pub fn get_mut() -> GlobalWriteGuard<Self> {
-        // SAFETY: PHP executor globals are statically declared therefore should never
-        // return an invalid pointer.
-        let globals = unsafe { ext_php_rs_sapi_globals().as_mut() }
-            .expect("Static executor globals were invalid");
-        let guard = SAPI_LOCK.write();
-        GlobalWriteGuard { globals, guard }
-    }
-}
-
 impl SapiModule {
     /// Returns a reference to the PHP SAPI module.
     ///
@@ -556,12 +518,6 @@ static PROCESS_GLOBALS_LOCK: RwLock<()> = const_rwlock(());
 static SAPI_GLOBALS_LOCK: RwLock<()> = const_rwlock(());
 static FILE_GLOBALS_LOCK: RwLock<()> = const_rwlock(());
 
-/// SAPI globals rwlock.
-///
-/// PHP provides no indication if the executor globals are being accessed so
-/// this is only effective on the Rust side.
-static SAPI_LOCK: RwLock<()> = const_rwlock(());
-
 /// SAPI globals rwlock.
 ///
 /// PHP provides no indication if the executor globals are being accessed so

src/zend/mod.rs

@@ -7,8 +7,8 @@ mod ex;
 mod function;
 mod globals;
 mod handlers;
-mod linked_list;
 mod ini_entry_def;
+mod linked_list;
 mod module;
 mod try_catch;
 
@@ -27,12 +27,10 @@ pub use globals::ExecutorGlobals;
 pub use globals::FileGlobals;
 pub use globals::ProcessGlobals;
 pub use globals::SapiGlobals;
-pub use handlers::ZendObjectHandlers;
-pub use linked_list::ZendLinkedList;
-pub use globals::SapiGlobals;
 pub use globals::SapiModule;
 pub use handlers::ZendObjectHandlers;
 pub use ini_entry_def::IniEntryDef;
+pub use linked_list::ZendLinkedList;
 pub use module::ModuleEntry;
 #[cfg(feature = "embed")]
 pub(crate) use try_catch::panic_wrapper;