Really fix undefined index issues

woohoolabs · Dec 6, 2017 · cb56aa8 · cb56aa8
1 parent bb4238c
commit cb56aa8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/JsonApi/Request/JsonApiRequestBuilder.php b/src/JsonApi/Request/JsonApiRequestBuilder.php
@@ -311,6 +311,6 @@ private function setListQueryParam(string $name, $queryParam): void
 
     private function isBlankKey(array $array, string $key): bool
     {
-        return empty($array[$key]) && !is_numeric($array[$key]);
+        return array_key_exists($key, $array) === false || (empty($array[$key]) && is_numeric($array[$key]) === false);
     }
 }
diff --git a/src/JsonApi/Request/ResourceObject.php b/src/JsonApi/Request/ResourceObject.php
@@ -95,8 +95,8 @@ public function toArray(): array
         return $resource;
     }
 
-    private function isBlank($value): bool
+    private function isBlank(string $value): bool
     {
-        return empty($value) && !is_numeric($value);
+        return empty($value) && is_numeric($value) === false;
     }
 }
diff --git a/src/JsonApi/Schema/Document.php b/src/JsonApi/Schema/Document.php
@@ -217,6 +217,6 @@ public function error(int $number): ?Error
 
     private static function isAssociativeArray(array $array): bool
     {
-        return (bool)count(array_filter(array_keys($array), 'is_string'));
+        return (bool) count(array_filter(array_keys($array), "is_string"));
     }
 }
diff --git a/src/JsonApi/Schema/Relationship.php b/src/JsonApi/Schema/Relationship.php
@@ -285,7 +285,7 @@ public function resourceLinkMeta(string $type, string $id): ?array
 
     private static function isAssociativeArray(array $array): bool
     {
-        return (bool) count(array_filter(array_keys($array), 'is_string'));
+        return (bool) count(array_filter(array_keys($array), "is_string"));
     }
 
     private static function isArrayKey(array $array, string $key): bool
@@ -295,6 +295,6 @@ private static function isArrayKey(array $array, string $key): bool
 
     private static function isBlankKey(array $array, string $key): bool
     {
-        return empty($array[$key]) && !is_numeric($array[$key]);
+        return array_key_exists($key, $array) === false || (empty($array[$key]) && is_numeric($array[$key]) === false);
     }
 }