Use public properties instead of array

Author: camillebaronnet

composer.json

@@ -14,9 +14,11 @@
     },
     "require": {
         "php" : "^7.1",
-        "symfony/serializer": "^4.3"
+        "symfony/serializer": "^4.3",
+        "ext-curl": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5"
+        "phpunit/phpunit": "^7.5",
+        "symfony/var-dumper": "^5.0"
     }
 }

composer.lock

@@ -11,13 +11,12 @@ abstract class AbstractExtractor implements ExtractInterface
 
     /**
      * @param array $requiredFields
-     * @param array $params
      * @throws MissingParameter
      */
-    protected function requiredParameters(array $requiredFields, array $params)
+    protected function requiredParameters(array $requiredFields): void
     {
         foreach ($requiredFields as $field) {
-            if (!isset($params[$field])) {
+            if (null === $this->$field) {
                 throw new MissingParameter('Parameter "'.$field.'" is missing.');
             }
         }

src/Extractor/AbstractExtractor.php

@@ -12,6 +12,10 @@
 
 trait SupportDecoders
 {
+    public $decoder;
+
+    public $contextDecoder = [];
+
     /**
      * Content-Type decoders matches.
      */
@@ -91,14 +95,13 @@ protected function findDecoder($contentType)
     /**
      * @param $body
      * @param $typeMime
-     * @param array $context
      * @return mixed
      * @throws BadInterface
      * @throws DecoderNotFound
      */
-    protected function decode($body, $typeMime, $context = [])
+    protected function decode($body, $typeMime)
     {
-        $contextDecoder = $context['decoder'] ?? [];
+        $contextDecoder = $this->decoder ?? [];
         $decoderClass = $contextDecoder['class'] ?? $this->findDecoder($typeMime);
 
         if (null === $decoderClass) {
@@ -114,6 +117,6 @@ protected function decode($body, $typeMime, $context = [])
 
         $format = defined($decoderClass.'::FORMAT') ? $decoderClass::FORMAT : null;
 
-        return $decoder->decode($body, $format, $context);
+        return $decoder->decode($body, $format, $this->contextDecoder);
     }
 }

src/Extractor/Extension/SupportDecoders.php

@@ -4,9 +4,5 @@
 
 interface ExtractInterface
 {
-    /**
-     * @param array $params
-     * @return iterable
-     */
-    public function __invoke(array $params = []): iterable;
+    public function __invoke(): iterable;
 }

src/Extractor/ExtractInterface.php

@@ -3,64 +3,57 @@
 namespace Camillebaronnet\ETL\Extractor;
 
 use Camillebaronnet\ETL\Exception\BadInterface;
+use Camillebaronnet\ETL\Exception\DecoderNotFound;
 use Camillebaronnet\ETL\Exception\MissingParameter;
 
 class Http extends AbstractExtractor
 {
-    /**
-     * Default context.
-     */
-    public const DEFAULT_CONTEXT = [
-        'method' => 'GET',
-        'data' => null,
-        'headers' => [],
-        'curl_opts' => [
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_USERAGENT => '-',
-            CURLOPT_AUTOREFERER => true,
-            CURLOPT_SSL_VERIFYHOST => 2,
-            CURLOPT_SSL_VERIFYPEER => true,
-        ],
+    public $method = 'GET';
+    public $url;
+    public $data;
+    public $curlOpts = [
+        CURLOPT_RETURNTRANSFER => true,
+        CURLOPT_FOLLOWLOCATION => true,
+        CURLOPT_USERAGENT => '-',
+        CURLOPT_AUTOREFERER => true,
+        CURLOPT_SSL_VERIFYHOST => 2,
+        CURLOPT_SSL_VERIFYPEER => true,
     ];
 
     /**
-     * @param array $context
-     * @return iterable
-     * @throws MissingParameter
      * @throws BadInterface
+     * @throws MissingParameter
+     * @throws DecoderNotFound
      */
-    public function __invoke(array $context = []): iterable
+    public function __invoke(): iterable
     {
-        $this->requiredParameters(['url'], $context);
+        $this->requiredParameters(['url']);
 
-        $context = array_merge(static::DEFAULT_CONTEXT, $context);
         $curl_opts = [
-            CURLOPT_URL => $context['url'],
-            CURLOPT_CUSTOMREQUEST => strtoupper($context['method']),
+            CURLOPT_URL => $this->url,
+            CURLOPT_CUSTOMREQUEST => strtoupper($this->method),
         ];
 
-        if (null !== $context['data']) {
+        if (null !== $this->data) {
             $curl_opts += [
                 CURLOPT_POST => true,
-                CURLOPT_POSTFIELDS => $context['data'],
+                CURLOPT_POSTFIELDS => $this->data,
             ];
         }
 
-        if ('HEAD' === strtoupper($context['method'])) {
+        if ('HEAD' === strtoupper($this->method)) {
             $curl_opts += [CURLOPT_NOBODY => 1];
         }
 
         $ch = curl_init();
-        curl_setopt_array($ch, $curl_opts + $context['curl_opts']);
+        curl_setopt_array($ch, $curl_opts + $this->curlOpts);
         $content = curl_exec($ch);
         $contentType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
         curl_close($ch);
 
         return $this->decode(
             $content,
-            $contentType,
-            $context
+            $contentType
         );
     }
 }

src/Extractor/Http.php

@@ -6,24 +6,14 @@
 
 class Display implements LoaderInterface, StreamLoaderInterface
 {
-    /**
-     * @param array $data
-     * @param array $params
-     * @return array
-     */
-    public function __invoke(array $data, array $params = [])
+    public function __invoke(array $data): void
     {
-        return print_r($data);
+        print_r($data);
     }
 
-    /**
-     * @param Generator $collection
-     * @param array $params
-     * @return void
-     */
-    public function stream(Generator $collection, array $params = [])
+    public function stream(Generator $collection): void
     {
-        foreach($collection as $row){
+        foreach ($collection as $row) {
             print_r($row);
         }
     }

src/Loader/Display.php

@@ -6,13 +6,10 @@
 
 class Json implements LoaderInterface
 {
-    /**
-     * @param array $data
-     * @param array $params
-     * @return array
-     */
-    public function __invoke(array $data, array $params = [])
+    public $context = [];
+
+    public function __invoke(array $data)
     {
-        return (new JsonEncoder())->encode($data, JsonEncoder::FORMAT, $params);
+        return (new JsonEncoder())->encode($data, JsonEncoder::FORMAT, $this->context);
     }
 }

src/Loader/Json.php

@@ -4,10 +4,5 @@
 
 interface LoaderInterface
 {
-    /**
-     * @param array $collection
-     * @param array $context
-     * @return mixed
-     */
-    public function __invoke(array $collection, array $context = []);
+    public function __invoke(array $collection);
 }

src/Loader/LoaderInterface.php

@@ -6,10 +6,5 @@
 
 interface StreamLoaderInterface
 {
-    /**
-     * @param Generator $collection
-     * @param array $context
-     * @return void
-     */
-    public function stream(Generator $collection, array $context = []);
+    public function stream(Generator $collection): void;
 }