Merge pull request #4 from MacsiDigital/3.0

Update 3.0 to master

Author: colinhall17

src/Support/PersistResource.php

@@ -28,6 +28,7 @@ public function fill(object $object, $type="insert")
             }
         }
         $this->processEmpties();
+
         return $this;
     }
 
@@ -231,9 +232,18 @@ public function getRelation($name)
         return $this->relations[$name];
     }
 
-    public function getAttributes()
+    public function getAttributes($wrapped='', $emptyArray = false)
     {
-        return $this->attributes;
+        if($emptyArray){
+            $return = [$this->attributes];
+        } else {
+            $return = $this->attributes;
+        }
+
+        if($wrapped == ''){
+            return $return;
+        }
+        return [$wrapped => $return];
     }
 
     public function validate()

src/Support/ResultSet.php

@@ -47,7 +47,7 @@ class ResultSet implements Arrayable, ArrayAccess, Countable, IteratorAggregate,
 	protected $resource;
 
 	public function __construct($builder, $response, $resource, $all=false)
-	{		
+	{
 		$this->all = $all;
 		$this->builder = $builder;
 		$this->resource = $resource;
@@ -73,15 +73,15 @@ protected function setRawStatus(bool $status=false)
 		$this->raw = $status;
 	}
 
-	protected function processResponse($response) 
+	protected function processResponse($response)
 	{
 		$this->addResponse($response);
 		$this->populate($response->json());
 		$this->processMeta($response->json());
 		$this->incrementQueries();
 	}
 
-	protected function incrementQueries() 
+	protected function incrementQueries()
 	{
 		$this->queries++;
 	}
@@ -94,22 +94,22 @@ protected function canQuery()
 		return $this->maxQueries > $this->queries;
 	}
 
-	protected function incrementTotalDownloads($i=1) 
+	protected function incrementTotalDownloads($i=1)
 	{
 		$this->downloaded += $i;
 	}
 
-	public function resetQueryCount() 
+	public function resetQueryCount()
 	{
 		$this->queries = 0;
 	}
 
-	protected function addResponse($response) 
+	protected function addResponse($response)
 	{
 		$this->responses[] = $response;
 	}
 
-	protected function populate($array) 
+	protected function populate($array)
 	{
 		if($this->raw){
 			$this->items = array_merge($this->items, $array[$this->resource->getApiMultipleDataField()]);
@@ -123,7 +123,7 @@ protected function populate($array)
 		}
 	}
 
-	protected function processMeta($array) 
+	protected function processMeta($array)
 	{
 		if(Arr::has($array, $this->resource->client->getResultsPageField())){
 			$this->apiCurrentPage = (int) Arr::get($array, $this->resource->client->getResultsPageField());
@@ -176,50 +176,50 @@ protected function apiPageHasBeenDownloaded($page)
 		return in_array($page, $this->apiPagesDownloaded);
 	}
 
-	protected function apiHasMorePages() 
+	protected function apiHasMorePages()
 	{
 		if($this->apiLastPage() == null){
 			return true;
 		}
 		return $this->apiLastPage() > $this->apiCurrentPage();
 	}
 
-	protected function apiHasPerPage() 
+	protected function apiHasPerPage()
 	{
 		return $this->apiPerPage != '';
 	}
 
-	protected function apiIsFirstPage() 
+	protected function apiIsFirstPage()
 	{
 		return $this->apiCurrentPage() <= 1;
 	}
 
-	protected function apiLastPage() 
+	protected function apiLastPage()
 	{
 		return $this->apiLastPage;
 	}
 
-	protected function apiFirstPage() 
+	protected function apiFirstPage()
 	{
 		return 1;
 	}
 
-	protected function apiPerPage() 
+	protected function apiPerPage()
 	{
 		return $this->apiPerPage;
 	}
 
-	protected function apiCurrentPage() 
+	protected function apiCurrentPage()
 	{
 		return $this->apiCurrentPage;
 	}
 
-	protected function apiNextPageNumber() 
+	protected function apiNextPageNumber()
 	{
 		return $this->apiCurrentPage + 1;
 	}
 
-	protected function apiPreviousPageNumber() 
+	protected function apiPreviousPageNumber()
 	{
 		return $this->apiCurrentPage - 1;
 	}
@@ -229,7 +229,7 @@ protected function apiTotalRecords()
 		return $this->apiTotalRecords;
 	}
 
-	public function hasMorePages() 
+	public function hasMorePages()
 	{
 		if($this->hasOwnMeta){
 			return $this->lastPage() > $this->currentPage();
@@ -238,7 +238,7 @@ public function hasMorePages()
 		}
 	}
 
-	public function hasPerPage() 
+	public function hasPerPage()
 	{
 		if($this->hasOwnMeta){
 			return true;
@@ -247,7 +247,7 @@ public function hasPerPage()
 		}
 	}
 
-	public function isFirstPage() 
+	public function isFirstPage()
 	{
 		if($this->hasOwnMeta){
 			return $this->currentPage() <= 1;
@@ -256,7 +256,7 @@ public function isFirstPage()
 		}
 	}
 
-	public function totalRecords() 
+	public function totalRecords()
 	{
 		if($this->totalRecords){
 			return $this->totalRecords;
@@ -265,7 +265,7 @@ public function totalRecords()
 		}
 	}
 
-	public function lastPage() 
+	public function lastPage()
 	{
 		if($this->hasOwnMeta){
 			return $this->lastPage;
@@ -274,7 +274,7 @@ public function lastPage()
 		}
 	}
 
-	public function firstPage() 
+	public function firstPage()
 	{
 		if($this->hasOwnMeta){
 			return 1;
@@ -283,7 +283,7 @@ public function firstPage()
 		}
 	}
 
-	public function perPage() 
+	public function perPage()
 	{
 		if($this->hasOwnMeta){
 			return $this->perPage;
@@ -292,7 +292,7 @@ public function perPage()
 		}
 	}
 
-	public function currentPage() 
+	public function currentPage()
 	{
 		if($this->hasOwnMeta){
 			return $this->currentPage;
@@ -301,7 +301,7 @@ public function currentPage()
 		}
 	}
 
-	public function nextPageNumber() 
+	public function nextPageNumber()
 	{
 		if($this->hasOwnMeta){
 			return $this->currentPage + 1;
@@ -310,7 +310,7 @@ public function nextPageNumber()
 		}
 	}
 
-	public function previousPageNumber() 
+	public function previousPageNumber()
 	{
 		if($this->hasOwnMeta){
 			return $this->currentPage -1;
@@ -319,7 +319,7 @@ public function previousPageNumber()
 		}
 	}
 
-	public function processRecordSweep() 
+	public function processRecordSweep()
 	{
 		if($this->all || !$this->builder->shouldPaginate()){
 			$this->recursiveRecordCollection();
@@ -342,7 +342,7 @@ public function recursiveRecordCollection()
 		}
 	}
 
-	public function updateMeta() 
+	public function updateMeta()
 	{
 		$this->hasOwnMeta = true;
 		$this->perPage = $this->maxQueries * $this->apiPerPage;
@@ -363,7 +363,7 @@ public function getNextRecords()
 		return $this;
 	}
 
-	public function resetPage() 
+	public function resetPage()
 	{
 		$this->items = new Collection;
 	}
@@ -395,7 +395,7 @@ public function previousPage()
 		} else {
 			throw new OutOfResultSetException();
 		}
-			
+
 		return $this;
 	}
 
@@ -419,7 +419,7 @@ public function getCollection()
         return $this->items;
     }
 
-	public function getResults() 
+	public function getResults()
 	{
 		return $this->getCollection();
 	}
@@ -461,7 +461,7 @@ public function toArray()
         ];
     }
 
-    public function itemsToArray() 
+    public function itemsToArray()
     {
     	$data = [];
     	foreach($this->items as $item){
@@ -485,4 +485,4 @@ public function __call($method, $parameters)
         return $this->forwardCallTo($this->getCollection(), $method, $parameters);
     }
 
-}
+}

src/Traits/HasAttributes.php

@@ -66,7 +66,7 @@ public function setAttribute($key, $value)
                 if($this->relationLoaded($key)){
                     $this->updateRelationAttribute($key, $value);
                     return $this;
-                }    
+                }
             }
         }
 
@@ -110,7 +110,7 @@ public function setAttribute($key, $value)
         return $this;
     }
 
-    protected function setRelationAttribute($key, $value) 
+    protected function setRelationAttribute($key, $value)
     {
         if($this->loadRaw || in_array($key, $this->dontAutoloadRelation)){
             return;
@@ -130,12 +130,12 @@ protected function setRelationAttribute($key, $value)
         }
     }
 
-    protected function updateRelationAttribute($key, $value) 
+    protected function updateRelationAttribute($key, $value)
     {
         if($this->loadRaw || in_array($key, $this->dontAutoloadRelation)){
             return;
         }
-        
+
         if ($this->isRelationship($key)){
             $this->getRelation($key)->update($value);
         } elseif ($this->isRelationship(Str::plural($key))) {
@@ -152,8 +152,8 @@ public function getAttribute($key)
         if (! $key) {
             return;
         }
-        
-        // need to check for a relationship first - otherwise we will be passing back the 
+
+        // need to check for a relationship first - otherwise we will be passing back the
         // array if relationship is passed as attributes in the API call
         if(method_exists($this, 'setRelation') && $this->isRelationship($key)){
             return $this->getRelationValue($key);
@@ -191,7 +191,7 @@ public function getRelationValue($key)
         // it is a relationship and will load and return results from the query
         // and hydrate the relationship's value on the "relationships" array.
         if (method_exists($this, $key)) {
-            return $this->getRelationshipFromMethod($key);
+            return $this->getRelationshipFromMethod($key)->getResults();
         }
     }
 
@@ -218,10 +218,12 @@ protected function getRelationshipFromMethod($method)
                 '%s::%s must return a relationship instance.', static::class, $method
             ));
         }
+        $this->setRelation($method, $relation);
 
-        return tap($relation->getResults(), function ($results) use ($method) {
-            $this->setRelation($method, $results);
-        });
+        return $this->getRelation($method);
+//        return tap($relation->getResults(), function ($results) use ($method) {
+//
+//        });
     }
 
     /**
@@ -233,5 +235,5 @@ protected function getDateFormat()
     {
         return $this->dateFormat ?: 'Y-m-d H:i:s';
     }
-    
-}
+
+}