Merge pull request #32 from giansalex/feature/http1_1-requests

HTTP 1.1

docs/dni.md

@@ -2,22 +2,25 @@
 Consulta de DNI.
 > Fuente: **JNE**.
 
+## Requerimientos
+- Tener activo [allow_url_fopen](https://www.php.net/manual/es/filesystem.configuration.php#ini.allow-url-fopen).
+
 ## Ejemplo
 
 ```php
-use Peru\Http\ContextClient;
-use Peru\Jne\{Dni, DniParser};
+use Peru\Jne\DniFactory;
 
 require 'vendor/autoload.php';
 
 $dni = '46658592';
 
-$cs = new Dni(new ContextClient(), new DniParser());
+$factory = new DniFactory();
+$cs = $factory->create();
 
 $person = $cs->get($dni);
 if (!$person) {
     echo 'Not found';
-    exit();
+    return;
 }
 
 echo json_encode($person);

docs/ruc.md

@@ -5,31 +5,32 @@ Consulta de RUC.
 
 ## Requerimientos
 - Tener cargada la extension `dom`.
+- Tener activo [allow_url_fopen](https://www.php.net/manual/es/filesystem.configuration.php#ini.allow-url-fopen).
 
 ## Ejemplo
 
 ```php
-use Peru\Http\ContextClient;
-use Peru\Sunat\{HtmlParser, Ruc, RucParser};
+use Peru\Sunat\RucFactory;
 
 require 'vendor/autoload.php';
 
 $ruc = '20100070970';
 
-$cs = new Ruc(new ContextClient(), new RucParser(new HtmlParser()));
+$factory = new RucFactory();
+$cs = $factory->create();
 
 $company = $cs->get($ruc);
 if (!$company) {
     echo 'Not found';
-    exit();
+    return;
 }
 
 echo json_encode($company);
 
 ```
 
 !!! tip "Cambiar URL utilizada"
-    Si necesita cambiar la url utilizada internamente para obtener la información del RUC, puede hacerlo de esta forma:  
+    Si necesita cambiar la url utilizada internamente para obtener la información del RUC, este es un ejemplo:  
     `$cs->urlConsult='http://e-consultaruc.sunat.gob.pe/cl-ti-itmrconsruc/jcrS03Alias';`
 
 ## Resultado

docs/user-sol.md

@@ -17,7 +17,7 @@ $ruc = '20123456789'; // colocar un ruc válido
 $user = 'TGGMMSYY'; // colocar un usuario según el ruc
 
 $cs = new UserValidator(new ContextClient());
-$valid = $cs->valid($dni);
+$valid = $cs->valid($ruc, $user);
 if ($valid) {
     echo 'Válido';
 } else {

src/Peru/Http/Async/HttpClient.php

@@ -13,6 +13,8 @@
  */
 class HttpClient extends Browser implements ClientInterface
 {
+    private const USER_AGENT = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.9) Gecko/20071025 Firefox/3.0.0.1';
+
     /**
      * @var array
      */
@@ -76,12 +78,14 @@ private function saveCookies(array $headers)
 
     private function buildHeaders(array $headers)
     {
-        if (empty($this->cookies)) {
-            return $headers;
-        }
+        $defaultHeaders = [
+            'User-Agent' => self::USER_AGENT,
+        ];
 
-        $headers['Cookie'] = implode('; ', $this->cookies);
+        if (!empty($this->cookies)) {
+            $defaultHeaders['Cookie'] = implode('; ', $this->cookies);
+        }
 
-        return $headers;
+        return array_merge($defaultHeaders, $headers);
     }
 }

src/Peru/Http/ContextClient.php

@@ -17,7 +17,8 @@ class ContextClient implements ClientInterface
 {
     private const FORM_CONTENT_TYPE = 'application/x-www-form-urlencoded';
     private const USER_AGENT = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.9) Gecko/20071025 Firefox/3.0.0.1';
-
+    private const HTTP_VERSION = 1.1;
+
     /**
      * stream_context extra options.
      *
@@ -76,17 +77,19 @@ public function post(string $url, $data, array $headers = [])
      */
     private function getContext(string $method, $data, array $headers)
     {
+        $headers['Connection'] = 'close';
         $defaultOptions = [
             'http' => [
                 'header' => $this->join(': ', $headers),
                 'method' => $method,
                 'content' => $this->getRawData($data),
                 'user_agent' => self::USER_AGENT,
+                'protocol_version' => self::HTTP_VERSION,
             ],
         ];
 
-        if (!empty($this->options)) {
-            $defaultOptions = array_merge_recursive($defaultOptions, $this->options);
+        if (!empty($this->options) && is_array($this->options)) {
+            $defaultOptions = $this->mergeOptions($defaultOptions, $this->options);
         }
 
         if (!empty($this->cookies)) {
@@ -136,4 +139,18 @@ private function getResponseAndSaveCookies(string $url, $ctx)
 
         return $response;
     }
+
+    private function mergeOptions(array $default, array $overwrite): array
+    {
+        $merged = $default;
+        foreach($overwrite as $key => $value) {
+            if (array_key_exists($key, $default) && is_array($value)) {
+                $merged[$key] = $this->mergeOptions($default[$key], $overwrite[$key]);
+            } else {
+                $merged[$key] = $value;
+            }
+        }
+
+        return $merged;
+    }
 }

src/Peru/Jne/DniFactory.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Peru\Jne;
+
+use Peru\Http\ContextClient;
+use Peru\Services\DniInterface;
+
+class DniFactory
+{
+    public function create(): DniInterface
+    {
+        return new Dni(new ContextClient(), new DniParser());
+    }
+}

src/Peru/Sunat/RucFactory.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Peru\Sunat;
+
+use Peru\Http\ContextClient;
+use Peru\Services\RucInterface;
+
+class RucFactory
+{
+    public function create(): RucInterface
+    {
+        return new Ruc(new ContextClient(), new RucParser(new HtmlParser()));
+    }
+}

tests/Peru/Jne/DniFactoryTest.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Peru\Jne;
+
+use Peru\Jne\Dni;
+use Peru\Jne\DniFactory;
+use PHPUnit\Framework\TestCase;
+
+class DniFactoryTest extends TestCase
+{
+    public function testCreate()
+    {
+        $factory = new DniFactory();
+
+        $cs = $factory->create();
+
+        $this->assertInstanceOf(Dni::class, $cs);
+    }
+}

tests/Peru/Sunat/RucFactoryTest.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Peru\Sunat;
+
+use Peru\Sunat\Ruc;
+use Peru\Sunat\RucFactory;
+use PHPUnit\Framework\TestCase;
+
+class RucFactoryTest extends TestCase
+{
+    public function testCreate()
+    {
+        $factory = new RucFactory();
+
+        $cs = $factory->create();
+
+        $this->assertInstanceOf(Ruc::class, $cs);
+    }
+}

tests/Peru/Sunat/RucTest.php

@@ -31,6 +31,9 @@ public function setUp()
     {
         $client = new ContextClient();
         $client->options = [
+            'http' => [
+                'protocol_version' => 1.1
+            ],
             'ssl' => [
                 'allow_self_signed' => true,
                 'verify_peer' => false,