Merge pull request #289 from bburnichon/improvement/always-call-with-…

…parambag Always returns a ParamBag
thephpleague · Jul 21, 2016 · 56ad893 · 56ad893
2 parents d064765 + efb4366
commit 56ad893
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/Manager.php b/src/Manager.php
@@ -98,15 +98,11 @@ public function createData(ResourceInterface $resource, $scopeIdentifier = null,
      *
      * @param string $include
      *
-     * @return \League\Fractal\ParamBag|null
+     * @return \League\Fractal\ParamBag
      */
     public function getIncludeParams($include)
     {
-        if (! isset($this->includeParams[$include])) {
-            return;
-        }
-
-        $params = $this->includeParams[$include];
+        $params = isset($this->includeParams[$include]) ? $this->includeParams[$include] : [];
 
         return new ParamBag($params);
     }

diff --git a/src/TransformerAbstract.php b/src/TransformerAbstract.php
@@ -14,7 +14,7 @@
 use League\Fractal\Resource\Collection;
 use League\Fractal\Resource\Item;
 use League\Fractal\Resource\NullResource;
-use League\Fractal\Resource\ResourceAbstract;
+use League\Fractal\Resource\ResourceInterface;
 
 /**
  * Transformer Abstract
@@ -188,13 +188,13 @@ protected function callIncludeMethod(Scope $scope, $includeName, $data)
             return false;
         }
 
-        if (! $resource instanceof ResourceAbstract) {
+        if (! $resource instanceof ResourceInterface) {
             throw new \Exception(sprintf(
                 'Invalid return value from %s::%s(). Expected %s, received %s.',
                 __CLASS__,
                 $methodName,
-                'League\Fractal\Resource\ResourceAbstract',
-                gettype($resource)
+                'League\Fractal\Resource\ResourceInterface',
+                is_object($resource) ? get_class($resource) : gettype($resource)
             ));
         }