Merge remote-tracking branch 'origin/master' into revert-293-revert-121-feat-integration-tests

Author: danog

Cargo.toml

@@ -5,7 +5,7 @@ repository = "https://github.com/davidcole1340/ext-php-rs"
 homepage = "https://github.com/davidcole1340/ext-php-rs"
 license = "MIT OR Apache-2.0"
 keywords = ["php", "ffi", "zend"]
-version = "0.11.0"
+version = "0.12.0"
 authors = ["David Cole <[email protected]>"]
 edition = "2018"
 categories = ["api-bindings"]

src/types/array.rs

@@ -519,15 +519,17 @@ impl ZendHashTable {
     /// # Example
     ///
     /// ```no_run
-    /// use ext_php_rs::types::ZendHashTable;
+    /// use ext_php_rs::types::{ZendHashTable, ArrayKey};
     ///
     /// let mut ht = ZendHashTable::new();
     ///
     /// for (key, val) in ht.iter() {
-    /// //   ^ Index if inserted at an index.
-    /// //        ^ Optional string key, if inserted like a hashtable.
-    /// //             ^ Inserted value.
-    ///
+    ///     match &key {
+    ///         ArrayKey::Long(index) => {
+    ///         }
+    ///         ArrayKey::String(key) => {
+    ///         }
+    ///     }
     ///     dbg!(key, val);
     /// }
     #[inline]

src/types/mod.rs

@@ -13,7 +13,7 @@ mod object;
 mod string;
 mod zval;
 
-pub use array::ZendHashTable;
+pub use array::{ArrayKey, ZendHashTable};
 pub use callable::ZendCallable;
 pub use class_object::ZendClassObject;
 pub use iterable::Iterable;

src/types/zval.rs

@@ -95,7 +95,7 @@ impl Zval {
         if self.is_double() {
             Some(unsafe { self.value.dval })
         } else {
-            self.long().map(|x| x as f64)
+            None
         }
     }
 
@@ -114,17 +114,9 @@ impl Zval {
 
     /// Returns the value of the zval if it is a string.
     ///
-    /// If the zval does not contain a string, the function will check if it
-    /// contains a double or a long, and if so it will convert the value to
-    /// a [`String`] and return it. Don't rely on this logic, as there is
-    /// potential for this to change to match the output of the [`str()`]
-    /// function.
-    ///
     /// [`str()`]: #method.str
     pub fn string(&self) -> Option<String> {
-        self.str()
-            .map(|s| s.to_string())
-            .or_else(|| self.double().map(|x| x.to_string()))
+        self.str().map(|s| s.to_string())
     }
 
     /// Returns the value of the zval if it is a string.