Merge pull request #40 from tobscure/analysis-8jJGr8

Applied fixes from StyleCI

Author: tobyzerner

src/AbstractSerializer.php

@@ -11,8 +11,8 @@
 
 namespace Tobscure\JsonApi;
 
-use Tobscure\JsonApi\Elements\Resource;
 use Tobscure\JsonApi\Elements\Collection;
+use Tobscure\JsonApi\Elements\Resource;
 
 /**
  * This is the abstract serializer class.
@@ -48,12 +48,14 @@ public function __construct(array $include = [], array $link = [])
 
     /**
      * @param $model
+     *
      * @return mixed
      */
     abstract protected function getAttributes($model);
 
     /**
      * @param $model
+     *
      * @return mixed
      */
     protected function getId($model)
@@ -79,12 +81,13 @@ public function setLink($link)
 
     /**
      * @param $data
+     *
      * @return Collection|null
      */
     public function collection($data)
     {
         if (empty($data)) {
-            return null;
+            return;
         }
 
         $resources = [];
@@ -98,23 +101,24 @@ public function collection($data)
 
     /**
      * @param object|array $data
+     *
      * @return Resource|null
      */
     public function resource($data)
     {
         if (empty($data)) {
-            return null;
+            return;
         }
 
-        if (! is_object($data)) {
+        if (!is_object($data)) {
             return new Resource($this->type, $data);
         }
 
         $included = $links = [];
 
         $relationships = [
             'link' => $this->parseRelationshipPaths($this->link),
-            'include' => $this->parseRelationshipPaths($this->include)
+            'include' => $this->parseRelationshipPaths($this->include),
         ];
 
         foreach (['link', 'include'] as $type) {
@@ -133,7 +137,7 @@ public function resource($data)
                 }
 
                 if ($method && $element) {
-                    if (! ($element instanceof Relationship)) {
+                    if (!($element instanceof Relationship)) {
                         $element = new Relationship($element);
                     }
                     if ($include) {
@@ -161,7 +165,7 @@ protected function getRelationshipFromMethod($name)
     }
 
     /**
-     * Given a flat array of relationship paths like:
+     * Given a flat array of relationship paths like:.
      *
      *     ['user', 'user.employer', 'user.employer.country', 'comments']
      *
@@ -171,6 +175,7 @@ protected function getRelationshipFromMethod($name)
      *     ['user' => ['employer', 'employer.country'], 'comments' => []]
      *
      * @param array $paths
+     *
      * @return array
      */
     protected function parseRelationshipPaths(array $paths)
@@ -180,7 +185,7 @@ protected function parseRelationshipPaths(array $paths)
         foreach ($paths as $path) {
             list($primary, $nested) = array_pad(explode('.', $path, 2), 2, null);
 
-            if (! isset($tree[$primary])) {
+            if (!isset($tree[$primary])) {
                 $tree[$primary] = [];
             }
 

src/Document.php

@@ -37,7 +37,7 @@ public function addIncluded($link)
         foreach ($resources as $k => $resource) {
             // If the resource doesn't have any attributes, then we don't need to
             // put it into the included part of the document.
-            if (! $resource->getAttributes()) {
+            if (!$resource->getAttributes()) {
                 unset($resources[$k]);
             } else {
                 foreach ($resource->getIncluded() as $link) {
@@ -111,27 +111,27 @@ public function toArray()
     {
         $document = [];
 
-        if (! empty($this->links)) {
+        if (!empty($this->links)) {
             ksort($this->links);
             $document['links'] = $this->links;
         }
 
-        if (! empty($this->data)) {
+        if (!empty($this->data)) {
             $document['data'] = $this->data->toArray();
         }
 
-        if (! empty($this->included)) {
+        if (!empty($this->included)) {
             $document['included'] = [];
             foreach ($this->included as $resource) {
                 $document['included'][] = $resource->toArray();
             }
         }
 
-        if (! empty($this->meta)) {
+        if (!empty($this->meta)) {
             $document['meta'] = $this->meta;
         }
 
-        if (! empty($this->errors)) {
+        if (!empty($this->errors)) {
             $document['errors'] = $this->errors;
         }
 

src/Relationship.php

@@ -80,19 +80,19 @@ public function toArray()
     {
         $link = [];
 
-        if (! empty($this->data)) {
+        if (!empty($this->data)) {
             $link['data'] = $this->data->toArray(false);
         }
 
-        if (! empty($this->self)) {
+        if (!empty($this->self)) {
             $link['self'] = $this->self;
         }
 
-        if (! empty($this->related)) {
+        if (!empty($this->related)) {
             $link['related'] = $this->related;
         }
 
-        if (! empty($this->meta)) {
+        if (!empty($this->meta)) {
             $link['meta'] = $this->meta;
         }