Merge branch 'master' into 453_ZendHashTable_numeric_keys

Author: kakserpom

crates/cli/src/lib.rs

@@ -90,6 +90,7 @@ enum Args {
     Stubs(Stubs),
 }
 
+#[allow(clippy::struct_excessive_bools)]
 #[derive(Parser)]
 #[allow(clippy::struct_excessive_bools)]
 struct Install {
@@ -272,7 +273,7 @@ fn get_ext_dir() -> AResult<PathBuf> {
         bail!("Failed to call PHP: {:?}", cmd);
     }
     let stdout = String::from_utf8_lossy(&cmd.stdout);
-    let ext_dir = PathBuf::from(&*stdout);
+    let ext_dir = PathBuf::from(stdout.rsplit('\n').next().unwrap());
     if !ext_dir.is_dir() {
         if ext_dir.exists() {
             bail!(
@@ -302,7 +303,7 @@ fn get_php_ini() -> AResult<PathBuf> {
         bail!("Failed to call PHP: {:?}", cmd);
     }
     let stdout = String::from_utf8_lossy(&cmd.stdout);
-    let ini = PathBuf::from(&*stdout);
+    let ini = PathBuf::from(stdout.rsplit('\n').next().unwrap());
     if !ini.is_file() {
         bail!(
             "php.ini does not exist or is not a file at the given path: {:?}",

flake.lock

@@ -17,7 +17,8 @@
       system = "x86_64-linux";
       overlays = [ (import rust-overlay) ];
       pkgs = import nixpkgs { inherit system overlays; };
-      php-dev = pkgs.php.unwrapped.dev;
+      php = pkgs.php.buildEnv { embedSupport = true; };
+      php-dev = php.unwrapped.dev;
     in
     {
       devShells.${system} = {
@@ -32,7 +33,7 @@
           nativeBuildInputs = [ pkgs.rust-bin.stable.latest.default ];
 
           shellHook = ''
-            export LIBCLANG_PATH="''$LIBCLANG_PATH ${pkgs.libclang.lib}/lib"
+            export LIBCLANG_PATH="${pkgs.libclang.lib}/lib"
           '';
         };
       };

flake.nix

@@ -138,7 +138,7 @@ impl<'a> FunctionBuilder<'a> {
     pub fn returns(mut self, type_: DataType, as_ref: bool, allow_null: bool) -> Self {
         self.retval = Some(type_);
         self.ret_as_ref = as_ref;
-        self.ret_as_null = allow_null;
+        self.ret_as_null = allow_null && type_ != DataType::Void && type_ != DataType::Mixed;
         self
     }
 

src/builders/function.rs

@@ -253,6 +253,9 @@ impl ZendHashTable {
     /// ht.insert("test", "hello world");
     /// assert_eq!(ht.get("test").and_then(|zv| zv.str()), Some("hello world"));
     /// ```
+    // TODO: Verify if this is safe to use, as it allows mutating the
+    // hashtable while only having a reference to it. #461
+    #[allow(clippy::mut_from_ref)]
     #[must_use]
     #[allow(clippy::mut_from_ref)]
     pub fn get_mut<'a, K>(&self, key: K) -> Option<&mut Zval>
@@ -349,6 +352,9 @@ impl ZendHashTable {
     /// ht.push(100);
     /// assert_eq!(ht.get_index(0).and_then(|zv| zv.long()), Some(100));
     /// ```
+    // TODO: Verify if this is safe to use, as it allows mutating the
+    // hashtable while only having a reference to it. #461
+    #[allow(clippy::mut_from_ref)]
     #[must_use]
     #[allow(clippy::mut_from_ref)]
     pub fn get_index_mut(&self, key: i64) -> Option<&mut Zval> {

src/types/array.rs

@@ -173,6 +173,8 @@ impl<T: RegisteredClass> ZendClassObject<T> {
         Self::internal_from_zend_obj(std)
     }
 
+    // TODO: Verify if this is safe to use, as it allows mutating the
+    // hashtable while only having a reference to it. #461
     #[allow(clippy::mut_from_ref)]
     fn internal_from_zend_obj(std: &zend_object) -> Option<&mut Self> {
         let std = ptr::from_ref(std).cast::<c_char>();

src/types/class_object.rs

@@ -261,6 +261,9 @@ impl Zval {
 
     /// Returns a mutable reference to the zval if it is an internal indirect
     /// reference.
+    // TODO: Verify if this is safe to use, as it allows mutating the
+    // hashtable while only having a reference to it. #461
+    #[allow(clippy::mut_from_ref)]
     #[must_use]
     #[allow(clippy::mut_from_ref)]
     pub fn indirect_mut(&self) -> Option<&mut Zval> {

src/types/zval.rs

@@ -113,6 +113,9 @@ impl ClassEntry {
     /// Returns the iterator for the class for a specific instance
     ///
     /// Returns [`None`] if there is no associated iterator for the class.
+    // TODO: Verify if this is safe to use, as it allows mutating the
+    // hashtable while only having a reference to it. #461
+    #[allow(clippy::mut_from_ref)]
     #[must_use]
     #[allow(clippy::mut_from_ref)]
     pub fn get_iterator<'a>(&self, zval: &'a Zval, by_ref: bool) -> Option<&'a mut ZendIterator> {

src/zend/class.rs

@@ -105,6 +105,9 @@ impl ExecutorGlobals {
     }
 
     /// Attempts to retrieve the global functions hash table as mutable.
+    // TODO: Verify if this is safe to use, as it allows mutating the
+    // hashtable while only having a reference to it. #461
+    #[allow(clippy::mut_from_ref)]
     #[must_use]
     #[allow(clippy::mut_from_ref)]
     pub fn function_table_mut(&self) -> Option<&mut ZendHashTable> {