Merge branch 'process-globals' into streams-api

Author: joehoyle

src/builders/module.rs

@@ -131,7 +131,8 @@ impl ModuleBuilder {
     /// This function can be useful if you need to do any final cleanup at the
     /// very end of a request, after all other resources have been released. For
     /// example, if your extension creates any persistent resources that last
-    /// beyond a single request, you could use this function to clean those up. # Arguments
+    /// beyond a single request, you could use this function to clean those up.
+    /// # Arguments
     ///
     /// * `func` - The function to be called when shutdown is requested.
     pub fn post_deactivate_function(mut self, func: extern "C" fn() -> i32) -> Self {

src/wrapper.h

@@ -17,6 +17,7 @@
 #include "php.h"
 
 #include "ext/standard/info.h"
+#include "ext/standard/php_var.h"
 #include "ext/standard/file.h"
 #include "zend_exceptions.h"
 #include "zend_inheritance.h"

src/zend/globals.rs

@@ -9,10 +9,10 @@ use parking_lot::{const_rwlock, RwLock, RwLockReadGuard, RwLockWriteGuard};
 use crate::boxed::ZBox;
 use crate::ffi::{
     _zend_executor_globals, ext_php_rs_executor_globals, ext_php_rs_process_globals,
-    ext_php_rs_sapi_globals, php_core_globals, sapi_globals_struct, sapi_header_struct,
-    sapi_headers_struct, sapi_request_info, 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,
-    php_file_globals, file_globals
+    ext_php_rs_sapi_globals, file_globals, php_core_globals, php_file_globals, sapi_globals_struct,
+    sapi_header_struct, sapi_headers_struct, sapi_request_info, 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,
 };
 
 use crate::types::{ZendHashTable, ZendObject, ZendStr};

src/zend/mod.rs

@@ -19,9 +19,9 @@ pub use class::ClassEntry;
 pub use ex::ExecuteData;
 pub use function::FunctionEntry;
 pub use globals::ExecutorGlobals;
+pub use globals::FileGlobals;
 pub use globals::ProcessGlobals;
 pub use globals::SapiGlobals;
-pub use globals::FileGlobals;
 pub use handlers::ZendObjectHandlers;
 pub use linked_list::ZendLinkedList;
 pub use module::ModuleEntry;