Close #82

Author: neomerx

src/Contracts/Encoder/EncoderInterface.php

@@ -170,6 +170,13 @@ public function withRelationshipSelfLink($resource, string $relationshipName): s
      */
     public function withRelationshipRelatedLink($resource, string $relationshipName): self;
 
+    /**
+     * Reset encoder settings to defaults.
+     *
+     * @return self
+     */
+    public function reset(): self;
+
     /**
      * Encode input as JSON API string.
      *

src/Encoder/Encoder.php

@@ -78,7 +78,7 @@ public function __construct(
         FactoryInterface $factory,
         SchemaContainerInterface $container
     ) {
-        $this->setFactory($factory)->setContainer($container)->resetPropertiesToDefaults();
+        $this->setFactory($factory)->setContainer($container)->reset();
     }
 
     /**
@@ -106,8 +106,6 @@ public function encodeData($data): string
         $array  = $this->encodeDataToArray($data);
         $result = $this->encodeToJson($array);
 
-        $this->resetPropertiesToDefaults();
-
         return $result;
     }
 
@@ -120,8 +118,6 @@ public function encodeIdentifiers($data): string
         $array  = $this->encodeIdentifiersToArray($data);
         $result = $this->encodeToJson($array);
 
-        $this->resetPropertiesToDefaults();
-
         return $result;
     }
 
@@ -134,8 +130,6 @@ public function encodeError(ErrorInterface $error): string
         $array  = $this->encodeErrorToArray($error);
         $result = $this->encodeToJson($array);
 
-        $this->resetPropertiesToDefaults();
-
         return $result;
     }
 
@@ -148,8 +142,6 @@ public function encodeErrors(iterable $errors): string
         $array  = $this->encodeErrorsToArray($errors);
         $result = $this->encodeToJson($array);
 
-        $this->resetPropertiesToDefaults();
-
         return $result;
     }
 
@@ -162,8 +154,6 @@ public function encodeMeta($meta): string
         $array  = $this->encodeMetaToArray($meta);
         $result = $this->encodeToJson($array);
 
-        $this->resetPropertiesToDefaults();
-
         return $result;
     }
 
@@ -441,18 +431,4 @@ private function createErrorWriter(): ErrorWriterInterface
 
         return $writer;
     }
-
-    /**
-     * @return self
-     */
-    private function resetPropertiesToDefaults(): self
-    {
-        return $this->reset(
-            static::DEFAULT_URL_PREFIX,
-            static::DEFAULT_INCLUDE_PATHS,
-            static::DEFAULT_FIELD_SET_FILTERS,
-            static::DEFAULT_JSON_ENCODE_OPTIONS,
-            static::DEFAULT_JSON_ENCODE_DEPTH
-        );
-    }
 }

src/Encoder/EncoderPropertiesTrait.php

@@ -22,6 +22,7 @@
 use Neomerx\JsonApi\Contracts\Factories\FactoryInterface;
 use Neomerx\JsonApi\Contracts\Schema\LinkInterface;
 use Neomerx\JsonApi\Contracts\Schema\SchemaContainerInterface;
+use Traversable;
 
 /**
  * @package Neomerx\JsonApi
@@ -107,15 +108,15 @@ trait EncoderPropertiesTrait
      * @param int      $encodeOptions
      * @param int      $encodeDepth
      *
-     * @return EncoderPropertiesTrait
-     */
-    protected function reset(
-        string $urlPrefix,
-        iterable $includePaths,
-        array $fieldSets,
-        int $encodeOptions,
-        int $encodeDepth
-    ): self {
+     * @return self|EncoderInterface
+     */
+    public function reset(
+        string $urlPrefix = Encoder::DEFAULT_URL_PREFIX,
+        iterable $includePaths = Encoder::DEFAULT_INCLUDE_PATHS,
+        array $fieldSets = Encoder::DEFAULT_FIELD_SET_FILTERS,
+        int $encodeOptions = Encoder::DEFAULT_JSON_ENCODE_OPTIONS,
+        int $encodeDepth = Encoder::DEFAULT_JSON_ENCODE_DEPTH
+    ): EncoderInterface {
         $this->links          = null;
         $this->profile        = null;
         $this->hasMeta        = false;
@@ -297,7 +298,12 @@ protected function getEncodeDepth(): int
      */
     public function withLinks(iterable $links): EncoderInterface
     {
-        $this->links = $this->hasLinks() === true ? $this->mergeIterables($this->links, $links) : $links;
+        $this->links = $this->hasLinks() === false ?
+            $links :
+            $this->links = array_merge(
+                $this->iterableToArray($this->getLinks()),
+                $this->iterableToArray($links)
+            );
 
         return $this;
     }
@@ -467,14 +473,13 @@ public function withRelationshipRelatedLink($resource, string $relationshipName)
     }
 
     /**
-     * @param iterable $iterable1
-     * @param iterable $iterable2
+     * @param iterable $value
      *
-     * @return iterable
+     * @return array
      */
-    private function mergeIterables(iterable $iterable1, iterable $iterable2): iterable
+    private function iterableToArray(iterable $value): array
     {
-        yield from $iterable1;
-        yield from $iterable2;
+        /** @var Traversable|array $value */
+        return is_array($value) === true ? $value : iterator_to_array($value);
     }
 }