Merge pull request #32 from ngmy/fix-bug

Fix bugs
ngmy · Apr 3, 2021 · 8dc4407 · 8dc4407
2 parents 107a930 + 0e8f3a0
commit 8dc4407
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/docs/api/classes/Ngmy-TypedArray-TypedArray.html b/docs/api/classes/Ngmy-TypedArray-TypedArray.html
@@ -982,7 +982,7 @@ <h4 class="phpdocumentor-element__name" id="method_count">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/TypedArray.php"><a href="files/src-typedarray.html"><abbr title="src/TypedArray.php">TypedArray.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">792</span>
+    <span class="phpdocumentor-element-found-in__line">789</span>
 </aside>
 
 
@@ -1048,7 +1048,7 @@ <h4 class="phpdocumentor-element__name" id="method_getIterator">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/TypedArray.php"><a href="files/src-typedarray.html"><abbr title="src/TypedArray.php">TypedArray.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">809</span>
+    <span class="phpdocumentor-element-found-in__line">806</span>
 </aside>
 
 
@@ -1461,7 +1461,7 @@ <h4 class="phpdocumentor-element__name" id="method_offsetUnset">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/TypedArray.php"><a href="files/src-typedarray.html"><abbr title="src/TypedArray.php">TypedArray.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">769</span>
+    <span class="phpdocumentor-element-found-in__line">766</span>
 </aside>
 
 
@@ -3106,7 +3106,7 @@ <h4 class="phpdocumentor-element__name" id="method___construct">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/TypedArray.php"><a href="files/src-typedarray.html"><abbr title="src/TypedArray.php">TypedArray.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">814</span>
+    <span class="phpdocumentor-element-found-in__line">811</span>
 </aside>
 
 
@@ -3169,7 +3169,7 @@ <h4 class="phpdocumentor-element__name" id="method_getKeyHashCode">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/TypedArray.php"><a href="files/src-typedarray.html"><abbr title="src/TypedArray.php">TypedArray.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">836</span>
+    <span class="phpdocumentor-element-found-in__line">833</span>
 </aside>
 
 
@@ -3255,7 +3255,7 @@ <h4 class="phpdocumentor-element__name" id="method_keyExists">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="src/TypedArray.php"><a href="files/src-typedarray.html"><abbr title="src/TypedArray.php">TypedArray.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">896</span>
+    <span class="phpdocumentor-element-found-in__line">890</span>
 </aside>
 
 

diff --git a/src/TypedArray.php b/src/TypedArray.php
@@ -728,18 +728,15 @@ public function offsetSet($key, $value): void
             || ($this->valueType == self::VALUE_TYPES['string'] && !is_string($value))
             || (
                 $this->valueClassKind == self::VALUE_CLASS_KINDS['class']
-                && (is_object($value) || is_string($value))
-                && !is_a($value, $this->valueType)
+                && (!is_object($value) || !is_a($value, $this->valueType))
             )
             || (
                 $this->valueClassKind == self::VALUE_CLASS_KINDS['interface']
-                && (is_object($value) || is_string($value))
-                && !is_subclass_of($value, $this->valueType)
+                && (!is_object($value) || !is_subclass_of($value, $this->valueType))
             )
             || (
                 $this->valueClassKind == self::VALUE_CLASS_KINDS['trait']
-                && (is_object($value) || (is_string($value) && class_exists($value)))
-                && !array_key_exists($this->valueType, class_uses_recursive($value))
+                && (!is_object($value) || !array_key_exists($this->valueType, class_uses_recursive($value)))
             )
         ) {
             $givenValueType = is_object($value) ? get_class($value) : gettype($value);
@@ -844,18 +841,15 @@ private function getKeyHashCode($key)
             || ($this->keyType == self::KEY_TYPES['string'] && !is_string($key))
             || (
                 $this->keyClassKind == self::KEY_CLASS_KINDS['class']
-                && (is_object($key) || is_string($key))
-                && !is_a($key, $this->keyType)
+                && (!is_object($key) || !is_a($key, $this->keyType))
             )
             || (
                 $this->keyClassKind == self::KEY_CLASS_KINDS['interface']
-                && (is_object($key) || is_string($key))
-                && !is_subclass_of($key, $this->keyType)
+                && (!is_object($key) || !is_subclass_of($key, $this->keyType))
             )
             || (
                 $this->keyClassKind == self::KEY_CLASS_KINDS['trait']
-                && (is_object($key) || (is_string($key) && class_exists($key)))
-                && !array_key_exists($this->keyType, class_uses_recursive($key))
+                && (!is_object($key) || !array_key_exists($this->keyType, class_uses_recursive($key)))
             )
         ) {
             $givenKeyType = is_object($key) ? get_class($key) : gettype($key);