Merge pull request #8 from MacsiDigital/3.0

3.0 To master

Author: colinhall17

src/Support/Builder.php

@@ -273,26 +273,20 @@ public function all()
 
     }
 
-    public function get()
+    public function get($type = 'get')
     {
         if($this->resource->beforeQuery($this) === false){
             return;
         }
         return $this->handleResponse($this->sendRequest('get', [
             $this->retreiveEndPoint('get'),
             $this->addPagination($this->combineQueries())
-        ]), 'get');
+        ]), $type);
     }
 
     public function getOne()
     {
-        if($this->resource->beforeQuery($this) === false){
-            return;
-        }
-        return $this->handleResponse($this->sendRequest('get', [
-            $this->retreiveEndPoint('get'),
-            $this->addPagination($this->combineQueries())
-        ]), 'individual');
+        return $this->get('individual');
     }
 
     public function post($attributes, $type="individual")

src/Support/ResultSet.php

@@ -116,10 +116,12 @@ protected function populate($array)
 			$this->incrementTotalDownloads(count($array[$this->resource->getApiMultipleDataField()]));
 			return $this;
 		} else{
-			foreach($array[$this->resource->getApiMultipleDataField()] as $object){
-				$this->items->push($this->resource->newFromBuilder($this->resource->passOnAttributes($object)));
-				$this->incrementTotalDownloads();
-			}
+		    if(isset($array[$this->resource->getApiMultipleDataField()])){
+                foreach($array[$this->resource->getApiMultipleDataField()] as $object){
+                    $this->items->push($this->resource->newFromBuilder($this->resource->passOnAttributes($object)));
+                    $this->incrementTotalDownloads();
+                }
+            }
 		}
 	}
 

src/Traits/InteractsWithAPI.php

@@ -387,7 +387,7 @@ protected function performUpdate(Builder $query)
         }
 
         $resource = (new $this->updateResource)->fill($this, 'update');
-        
+
         if($resource->getAttributes() != []){
 
             $validator = $resource->validate();
@@ -613,6 +613,11 @@ public function fresh()
             return;
         }
 
+        if(method_exists($this, 'find'))
+        {
+            return $this->find($this->getKey());
+        }
+
         return $this->newQuery()->find($this->getKey());
     }