Reorginize classes -> part1

Signed-off-by: Dusan Malusev <dusan@dusanmalusev.dev>
MalusevDevelopment · Jan 1, 2024 · 211fcc6 · 211fcc6
1 parent fbd386f
commit 211fcc6
Show file tree

Hide file tree

Showing 23 changed files with 1,049 additions and 975 deletions.
diff --git a/examples/complex/src/lib.rs b/examples/complex/src/lib.rs
@@ -10,7 +10,7 @@
 
 use phper::{
     arrays::ZArray,
-    classes::{ClassEntity, Visibility},
+    classes::{entity::ClassEntity, Visibility},
     functions::Argument,
     ini::{ini_get, Policy},
     modules::Module,

diff --git a/examples/http-client/src/client.rs b/examples/http-client/src/client.rs
@@ -11,7 +11,7 @@
 use crate::{errors::HttpClientError, request::REQUEST_BUILDER_CLASS};
 use phper::{
     alloc::ToRefOwned,
-    classes::{ClassEntity, StaticStateClass, Visibility},
+    classes::{entity::ClassEntity, StaticStateClass, Visibility},
     functions::Argument,
 };
 use reqwest::blocking::{Client, ClientBuilder};

diff --git a/examples/http-client/src/errors.rs b/examples/http-client/src/errors.rs
@@ -9,7 +9,7 @@
 // See the Mulan PSL v2 for more details.
 
 use phper::{
-    classes::{ClassEntity, ClassEntry},
+    classes::{entity::ClassEntity, entry::ClassEntry},
     errors::{exception_class, Throwable},
 };
 

diff --git a/examples/http-client/src/request.rs b/examples/http-client/src/request.rs
@@ -9,7 +9,7 @@
 // See the Mulan PSL v2 for more details.
 
 use crate::{errors::HttpClientError, response::RESPONSE_CLASS};
-use phper::classes::{ClassEntity, StaticStateClass, Visibility};
+use phper::classes::{entity::ClassEntity, StaticStateClass, Visibility};
 use reqwest::blocking::RequestBuilder;
 use std::{convert::Infallible, mem::take};
 

diff --git a/examples/http-client/src/response.rs b/examples/http-client/src/response.rs
@@ -11,7 +11,7 @@
 use crate::errors::HttpClientError;
 use phper::{
     arrays::{InsertKey, ZArray},
-    classes::{ClassEntity, StaticStateClass, Visibility},
+    classes::{entity::ClassEntity, StaticStateClass, Visibility},
     values::ZVal,
 };
 use reqwest::blocking::Response;

diff --git a/examples/http-server/src/errors.rs b/examples/http-server/src/errors.rs
@@ -9,7 +9,7 @@
 // See the Mulan PSL v2 for more details.
 
 use phper::{
-    classes::{ClassEntity, ClassEntry},
+    classes::{entity::ClassEntity, entry::ClassEntry},
     errors::{exception_class, Throwable},
 };
 use std::error::Error;

diff --git a/examples/http-server/src/request.rs b/examples/http-server/src/request.rs
@@ -10,7 +10,7 @@
 
 use phper::{
     arrays::ZArray,
-    classes::{ClassEntity, StaticStateClass, Visibility},
+    classes::{entity::ClassEntity, StaticStateClass, Visibility},
     objects::StateObject,
 };
 use std::convert::Infallible;

diff --git a/examples/http-server/src/response.rs b/examples/http-server/src/response.rs
@@ -14,7 +14,7 @@ use axum::{
     http::{HeaderName, HeaderValue, Response},
 };
 use phper::{
-    classes::{ClassEntity, StaticStateClass, Visibility},
+    classes::{entity::ClassEntity, StaticStateClass, Visibility},
     functions::Argument,
     objects::StateObject,
 };

diff --git a/examples/http-server/src/server.rs b/examples/http-server/src/server.rs
@@ -18,7 +18,7 @@ use axum::{
 use hyper::body;
 use phper::{
     alloc::ToRefOwned,
-    classes::{ClassEntity, Visibility},
+    classes::{entity::ClassEntity, Visibility},
     functions::Argument,
     values::ZVal,
 };

diff --git a/phper-sys/build.rs b/phper-sys/build.rs
@@ -13,6 +13,7 @@ use std::{env, ffi::OsStr, fmt::Debug, path::PathBuf, process::Command};
 
 fn main() {
     println!("cargo:rerun-if-env-changed=PHP_CONFIG");
+    println!("cargo:rerun-if-changed=build.rs");
     let current_dir = std::env::current_dir().unwrap();
     let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
 
@@ -41,9 +42,9 @@ fn main() {
 
     builder
         .cpp(false)
-        // .debug(false)
+        .debug(false)
         .files(&c_files)
-        // .extra_warnings(true)
+        .extra_warnings(true)
         .include("include")
         // .flag("-falign-functions")
         // .flag("-flto=auto")

diff --git a/phper/src/arrays.rs b/phper/src/arrays.rs
@@ -225,9 +225,7 @@ impl ZArr {
         let ptr = self.as_ptr() as *mut _;
         unsafe {
             match key {
-                Key::Index(i) => {
-                    phper_zend_hash_index_exists(ptr, i)
-                },
+                Key::Index(i) => phper_zend_hash_index_exists(ptr, i),
                 Key::Str(s) => {
                     phper_zend_str_exists(ptr, s.as_ptr().cast(), s.len().try_into().unwrap())
                 }