Small refactories

mrprompt · Dec 11, 2020 · 0424fd5 · 0424fd5
1 parent c6e1de5
commit 0424fd5
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 20 deletions.
diff --git a/composer.json b/composer.json
@@ -5,6 +5,7 @@
     "require": {
         "php": "^7.4|^8",
         "ext-json": "*",
+        "ext-simplexml": "*",
         "guzzlehttp/guzzle": "^7.2"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist → phpunit.xml b/phpunit.xml.dist → phpunit.xml
diff --git a/src/Anuncios/Anuncios.php b/src/Anuncios/Anuncios.php
@@ -14,7 +14,7 @@ class Anuncios extends Base
      * @param array $args
      * @return mixed
      */
-    public function resumo(string $imobiliaria, array $args = [])
+    public function resumo(string $imobiliaria, array $args = []): array
     {
         try {
             $uri = "imobiliarias/{$imobiliaria}/anuncios/online/resumo";
@@ -23,6 +23,9 @@ public function resumo(string $imobiliaria, array $args = [])
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 
@@ -33,7 +36,7 @@ public function resumo(string $imobiliaria, array $args = [])
      * @param string $anuncio
      * @return mixed
      */
-    public function remover(string $imobiliaria, string $anuncio)
+    public function remover(string $imobiliaria, string $anuncio): array
     {
         try {
             $uri = "imobiliarias/{$imobiliaria}/anuncios//{$anuncio}";
@@ -42,6 +45,9 @@ public function remover(string $imobiliaria, string $anuncio)
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 
@@ -52,7 +58,7 @@ public function remover(string $imobiliaria, string $anuncio)
      * @param string $anuncio
      * @return mixed
      */
-    public function info(string $imobiliaria, string $anuncio)
+    public function info(string $imobiliaria, string $anuncio): array
     {
         try {
             $uri = "imobiliarias/{$imobiliaria}/anuncios/{$anuncio}";
@@ -61,6 +67,9 @@ public function info(string $imobiliaria, string $anuncio)
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 
@@ -72,7 +81,7 @@ public function info(string $imobiliaria, string $anuncio)
      * @param array $detalhes
      * @return mixed
      */
-    public function atualizar(string $imobiliaria, string $anuncio, array $detalhes = [])
+    public function atualizar(string $imobiliaria, string $anuncio, array $detalhes = []): array
     {
         try {
             $uri = "imobiliarias/{$imobiliaria}/anuncios/{$anuncio}";
@@ -82,6 +91,9 @@ public function atualizar(string $imobiliaria, string $anuncio, array $detalhes
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 
@@ -93,7 +105,7 @@ public function atualizar(string $imobiliaria, string $anuncio, array $detalhes
      * @param array $detalhes
      * @return mixed
      */
-    public function associar(string $imobiliaria, string $origem, string $destino)
+    public function associar(string $imobiliaria, string $origem, string $destino): array
     {
         try {
             $uri = "imobiliarias/{$imobiliaria}/anuncios/{$origem}/{$destino}";
@@ -102,6 +114,9 @@ public function associar(string $imobiliaria, string $origem, string $destino)
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 
@@ -112,7 +127,7 @@ public function associar(string $imobiliaria, string $origem, string $destino)
      * @param string $anuncio
      * @return mixed
      */
-    public function qualidade(string $imobiliaria, string $anuncio)
+    public function qualidade(string $imobiliaria, string $anuncio): array
     {
         try {
             $uri = "imobiliarias/{$imobiliaria}/anuncios/{$anuncio}/qualidade";
@@ -121,6 +136,9 @@ public function qualidade(string $imobiliaria, string $anuncio)
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 
@@ -131,7 +149,7 @@ public function qualidade(string $imobiliaria, string $anuncio)
      * @param string $anuncio
      * @return mixed
      */
-    public function status(string $imobiliaria, string $anuncio)
+    public function status(string $imobiliaria, string $anuncio): array
     {
         try {
             $uri = "imobiliarias/{$imobiliaria}/anuncios/{$anuncio}/status";
@@ -140,6 +158,9 @@ public function status(string $imobiliaria, string $anuncio)
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 }
diff --git a/src/Anuncios/Lancamentos.php b/src/Anuncios/Lancamentos.php
@@ -21,6 +21,9 @@ public function resumo(string $imobiliaria, string $lancamento)
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 
@@ -40,6 +43,9 @@ public function info(string $imobiliaria, string $lancamento)
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 
@@ -61,6 +67,9 @@ public function atualizar(string $imobiliaria, string $lancamento, array $detalh
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 }
diff --git a/src/Application/Authentication.php b/src/Application/Authentication.php
@@ -6,6 +6,14 @@
 
 class Authentication extends Base
 {
+    /**
+     * Application login
+     *
+     * @param string $clientId
+     * @param string $clientSecret
+     * @param string $grantType
+     * @return mixed
+     */
     public function login(string $clientId, string $clientSecret, string $grantType = 'client_credentials')
     {
         try {
@@ -23,9 +31,20 @@ public function login(string $clientId, string $clientSecret, string $grantType
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 
+    /**
+     * Logout de usuario
+     *
+     * @param string $clientId
+     * @param string $clientSecret
+     * @param string $token
+     * @return mixed
+     */
     public function logout(string $clientId, string $clientSecret, string $token)
     {
         try {
@@ -43,6 +62,9 @@ public function logout(string $clientId, string $clientSecret, string $token)
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 }
diff --git a/src/Configuracao/Callbacks.php b/src/Configuracao/Callbacks.php
@@ -18,7 +18,9 @@ public function listar()
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
-            return [];
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 
@@ -36,7 +38,9 @@ public function atualizar(array $configuracoes)
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
-            return [];
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 }
diff --git a/src/Imobiliarias/Imobiliarias.php b/src/Imobiliarias/Imobiliarias.php
@@ -18,7 +18,9 @@ public function listar()
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
-            return [];
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 
@@ -35,7 +37,9 @@ public function desvincular(string $imobiliaria)
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
-            return [];
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 
@@ -52,7 +56,9 @@ public function ftp(string $imobiliaria)
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
-            return [];
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 
@@ -69,7 +75,9 @@ public function qualidade(string $imobiliaria)
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
-            return [];
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 }
diff --git a/src/Vendas/Vendas.php b/src/Vendas/Vendas.php
@@ -19,7 +19,9 @@ public function disponibilidade(string $imobiliaria)
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
-            return [];
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 
@@ -36,7 +38,9 @@ public function grade(string $imobiliaria)
 
             return json_decode($response->getBody(), true);
         } catch (ClientException $clientException) {
-            return [];
+            $xml = simplexml_load_string($clientException->getResponse()->getBody());
+
+            return json_decode(json_encode($xml), true);
         }
     }
 }
diff --git a/tests/Application/AuthenticationTest.php b/tests/Application/AuthenticationTest.php
@@ -45,15 +45,16 @@ public function loginWithInvalidCredentials()
             $this->faker->randomNumber(6)
         );
 
-        $this->assertEmpty($result);
+        $this->assertArrayHasKey('error', $result);
+        $this->assertArrayHasKey('error_description', $result);
     }
 
     /**
      * @test
      */
     public function logoutWithValidCredentials()
     {
-        $handleResponse = '';
+        $handleResponse = $this->fixture(__FUNCTION__, 'Responses');
         $handlerStack = [new Response(204, [], $handleResponse)];
 
         $this->client = $this->getClient($handlerStack);
@@ -85,6 +86,7 @@ public function logoutWithoutClientId()
             $this->faker->uuid,
         );
 
-        $this->assertEmpty($result);
+        $this->assertArrayHasKey('error', $result);
+        $this->assertArrayHasKey('error_description', $result);
     }
 }
diff --git a/tests/Application/Responses/logoutWithValidCredentials.json b/tests/Application/Responses/logoutWithValidCredentials.json
@@ -0,0 +1 @@
+{}