Merge pull request #10 from tmconsulting/develop

Next release

Author: roquie

.gitignore

@@ -1,3 +1,4 @@
 .idea/
 vendor/
-.php_cs.cache
+.php_cs.cache
+scratch/

src/Method/AbstractMethod.php

@@ -75,7 +75,7 @@ protected function getResultObject($result, $items = null, $resultClass = Result
     {
         try {
             if (!$items) {
-                $items = $this->performResult($result, $needsErrors);
+                $items = $this->performResult($result, [], $needsErrors);
             }
             return (new ReflectionClass($resultClass))->newInstanceArgs(array_merge($items, [$needsErrors]));
         } catch (ReflectionException $e) {

src/Method/Book.php

@@ -13,6 +13,7 @@
 
 use Hotelbook\Method\Builder\Book as BookBuilder;
 use Hotelbook\Method\Former\Book as BookFormer;
+use Hotelbook\ResultProceeder;
 use Money\Parser\StringToUnitsParser;
 
 /**
@@ -30,7 +31,7 @@ class Book extends AbstractMethod
     public function handle($xml)
     {
         $response = $this->connector->request('POST', 'add_order', $xml);
-        return $this->getResultObject($response);
+        return $this->getResultObject($response, null, ResultProceeder::class, false);
     }
 
     /**

src/Method/Former/Detail.php

@@ -43,6 +43,7 @@ public function form($results)
             'builtIn' => (string)$detail->BuiltIn,
             'buildingType' => (string)$detail->BuildingType,
             'numberLifts' => (int)$detail->NumberLifts,
+            'numberFloors' => (int)$detail->NumberFloors,
             'conference' => (string)$detail->Conference,
             'voltage' => (string)$detail->Voltage,
             'childAgeFrom' => (string)$detail->ChildAgeFrom,

src/ResultProceeder.php

@@ -20,19 +20,13 @@ class ResultProceeder
 
     /**
      * ResultProceeder constructor.
-     *
      * @param array $items
      * @param array $errors
-     * @param bool $throwsException
      */
-    public function __construct(array $items, array $errors = [], $throwsException = true)
+    public function __construct(array $items, array $errors = [])
     {
         $this->setItems($items);
         $this->setErrors($errors);
-
-        if ($throwsException) {
-            $this->throwExceptionIfNeeded();
-        }
     }
 
     /**
@@ -92,6 +86,18 @@ public function getItems()
         return $this->items;
     }
 
+    /**
+     *
+     */
+    public function getItem()
+    {
+        if (count($this->items) === 1) {
+            return current($this->items);
+        } else {
+            return $this->getItems();
+        }
+    }
+
     /**
      * @param array $items
      * @return $this
@@ -101,11 +107,4 @@ public function setItems(array $items)
         $this->items = $items;
         return $this;
     }
-
-    protected function throwExceptionIfNeeded()
-    {
-        if($this->hasErrors()) {
-            throw new ResponseException(1, 'Something went wrong with request. Run $result->getErrors() to get this data. ');
-        }
-    }
 }