Merge pull request #41 from daniellienert/bugfix-exceptionrendering1

BUGFIX: Fix exception rendering on failed request

If a request to elasticsearch fails, for example in case of a
missing request, the error part of the ES response array is set
as the exception message which is then tried to be rendered
as part of the message and raises an exception due to array
string conversion.

Author: dfeyer

Classes/Flowpack/ElasticSearch/Transfer/Exception.php

@@ -34,7 +34,7 @@ public function __construct($message, $code, \TYPO3\Flow\Http\Response $response
         $this->response = $response;
         $this->request = $request;
         if ($request !== null) {
-            $message = sprintf("[%s %s]: %s\n\nRequest data: %s",
+            $message = sprintf("Elasticsearch request failed.\n[%s %s]: %s\n\nRequest data: %s",
                 $request->getMethod(),
                 $request->getUri(),
                 $message . '; Response body: ' . $response->getContent(),

Classes/Flowpack/ElasticSearch/Transfer/Response.php

@@ -47,7 +47,8 @@ public function __construct(\TYPO3\Flow\Http\Response $response, \TYPO3\Flow\Htt
             }
 
             if (array_key_exists('error', $treatedContent)) {
-                throw new Exception\ApiException($treatedContent['error'], 1338977435, $response, $request);
+                $exceptionMessage = print_r($treatedContent['error'], true);
+                throw new Exception\ApiException($exceptionMessage, 1338977435, $response, $request);
             }
         }
 

Tests/Functional/Fixtures/TweetRepository.php

@@ -17,6 +17,6 @@
 /**
  * @Flow\Scope("singleton")
  */
-class TweetRepository  extends \TYPO3\Flow\Persistence\Repository
+class TweetRepository extends \TYPO3\Flow\Persistence\Repository
 {
 }