Merge branch 'czPechy-master'

src/Request/Queue.php

@@ -6,6 +6,7 @@
 	h4kuna\Fio,
 	h4kuna\Fio\Response\Pay,
 	Nette\Utils;
+use Psr\Http\Message\ResponseInterface;
 
 class Queue implements IQueue
 {
@@ -117,6 +118,13 @@ private function request($token, $fallback, $action)
 				}
 				self::sleep($tempFile);
 				$next = true;
+			} catch (GuzzleHttp\Exception\ServerException $e) {
+				if($e->hasResponse()) {
+					self::detectDownloadResponse($e->getResponse());
+				}
+				throw self::createServiceUnavailableException();
+			} catch (GuzzleHttp\Exception\ConnectException $e) {
+				throw self::createServiceUnavailableException();
 			}
 		} while ($next);
 		fclose($file);
@@ -129,6 +137,10 @@ private function request($token, $fallback, $action)
 		return $response->getBody();
 	}
 
+	/**
+	 * @param ResponseInterface $response
+	 * @throws Fio\ServiceUnavailableException
+	 */
 	private static function detectDownloadResponse($response)
 	{
 		/* @var $contentTypeHeaders array */
@@ -170,12 +182,18 @@ private static function safeProtocol($filename)
 	}
 
 	/**
-	 * @param $response
+	 * @param ResponseInterface|GuzzleHttp\Psr7\Stream $response
 	 * @return Pay\XMLResponse
 	 */
 	private static function createXmlResponse($response)
 	{
-		return new Pay\XMLResponse($response->getContents());
+		return new Pay\XMLResponse($response->getBody()->getContents());
+	}
+
+
+	private static function createServiceUnavailableException()
+	{
+		return new Fio\ServiceUnavailableException('Fio server does not response.');
 	}
 
 }

tests/data/tests/server-exception.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <response xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.fio.cz/schema/response.xsd"> <result> <errorCode>15</errorCode> <status>error</status> <message>Služba je momentálně nedostupná</message> </result> </response>

tests/src/Response/Read/ServerExceptionTest.phpt

@@ -0,0 +1,24 @@
+<?php
+namespace h4kuna\Fio;
+
+use Tester,
+	Tester\Assert,
+	Salamium\Testinium;
+
+require __DIR__ . '/../../../bootstrap.php';
+
+/**
+ * @author Martin Pecha
+ */
+class ServerExceptionTest extends Tester\TestCase
+{
+
+	public function testResponse()
+	{
+		$xml = Testinium\File::load('server-exception.xml');
+		$xmlResponse = new Response\Pay\XMLResponse($xml);
+		Assert::false($xmlResponse->isOk());
+	}
+}
+
+(new ServerExceptionTest())->run();