Fix type issue at Model/Get

phramework · Jun 7, 2017 · 83e148f · 83e148f
1 parent b71ed19
commit 83e148f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/src/FilterAttribute.php b/src/FilterAttribute.php
@@ -156,4 +156,20 @@ public function __get($name)
             $name
         ));
     }
+
+    /**
+     * @param string $name
+     * @return mixed
+     */
+    public function __isset($name)
+    {
+        switch ($name) {
+            case 'operand':
+            case 'operator':
+            case 'attribute':
+                return $this->attribute !== null;
+            default:
+                return false;
+        }
+    }
 }
diff --git a/src/Model/Get.php b/src/Model/Get.php
@@ -101,15 +101,16 @@ public static function getById($id, Fields $fields = null, ...$additionalParamet
             }
         }
 
+        /**
+         * @var string[]
+         */
+        $idAsArray = is_array($id) ? $id : [$id];
+
         //Prepare filter
-        $filter = new Filter((
-            is_array($id)
-            ? $id
-            : [$id]
-        )); //Force array for primary data
+        $filter = new Filter($idAsArray); //Force array for primary data
 
         $collection = static::get(
-            new Page(count($id)), //limit number of requested resources
+            new Page($idAsArray), //limit number of requested resources
             $filter,
             null, //sort
             $fields, //fields