Unify collections

orca-services · May 29, 2020 · 8929e43 · 8929e43
1 parent 7fd2cf4
commit 8929e43
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 70 deletions.
diff --git a/src/Method/NovaConfirmReceiptsMethod.php b/src/Method/NovaConfirmReceiptsMethod.php
@@ -173,7 +173,7 @@ private function createResult(XmlDocument $xml): NovaConfirmReceiptsResult
             $serviceItem->vatAmount = $xml->getAttributeValue('verkaufsPreis/mwstAnteil/@betrag', $serviceNode);
             $serviceItem->vatPercent = $xml->getAttributeValue('verkaufsPreis/mwstAnteil/@mwstSatz', $serviceNode);
 
-            $result->addService($serviceItem);
+            $result->services[] = $serviceItem;
         }
 
         return $result;

diff --git a/src/Method/NovaCreateOffersMethod.php b/src/Method/NovaCreateOffersMethod.php
@@ -275,7 +275,7 @@ private function createResult(XmlDocument $xml): NovaCreateOffersResult
             $travelClass = $xml->getAttributeValue('produktEinflussFaktoren/@klasse', $offerNode);
             $offer->travelClass = $travelClass;
 
-            $result->addOffer($offer);
+            $result->offers[] = $offer;
         }
 
         return $result;

diff --git a/src/Method/NovaCreateServicesMethod.php b/src/Method/NovaCreateServicesMethod.php
@@ -191,7 +191,7 @@ private function createResult(XmlDocument $xml): NovaCreateServicesResult
             $serviceItem->vatAmount = $xml->getAttributeValue('verkaufsPreis/mwstAnteil/@betrag', $serviceNode);
             $serviceItem->vatPercent = $xml->getAttributeValue('verkaufsPreis/mwstAnteil/@mwstSatz', $serviceNode);
 
-            $result->addService($serviceItem);
+            $result->services[] = $serviceItem;
         }
 
         return $result;

diff --git a/src/Result/NovaConfirmReceiptsResult.php b/src/Result/NovaConfirmReceiptsResult.php
@@ -14,27 +14,5 @@ final class NovaConfirmReceiptsResult
      *
      * @var NovaServiceItem[]
      */
-    private $services = [];
-
-    /**
-     * Add service.
-     *
-     * @param NovaServiceItem $novaService The nova service
-     *
-     * @return void
-     */
-    public function addService(NovaServiceItem $novaService)
-    {
-        $this->services[] = $novaService;
-    }
-
-    /**
-     * Get services.
-     *
-     * @return array|NovaServiceItem[] The items
-     */
-    public function getServices(): array
-    {
-        return $this->services;
-    }
+    public $services = [];
 }
diff --git a/src/Result/NovaCreateOffersResult.php b/src/Result/NovaCreateOffersResult.php
@@ -14,27 +14,5 @@ final class NovaCreateOffersResult
      *
      * @var NovaOffer[]
      */
-    private $offers = [];
-
-    /**
-     * Set value.
-     *
-     * @param NovaOffer $offer The nova offer
-     *
-     * @return void
-     */
-    public function addOffer(NovaOffer $offer)
-    {
-        $this->offers[] = $offer;
-    }
-
-    /**
-     * Get a list of offers.
-     *
-     * @return array|NovaOffer[] The offers
-     */
-    public function getOffers(): array
-    {
-        return $this->offers;
-    }
+    public $offers = [];
 }
diff --git a/src/Result/NovaCreateServicesResult.php b/src/Result/NovaCreateServicesResult.php
@@ -14,19 +14,7 @@ final class NovaCreateServicesResult
      *
      * @var NovaServiceItem[]
      */
-    private $services = [];
-
-    /**
-     * Add service.
-     *
-     * @param NovaServiceItem $novaService The nova service
-     *
-     * @return void
-     */
-    public function addService(NovaServiceItem $novaService)
-    {
-        $this->services[] = $novaService;
-    }
+    public $services = [];
 
     /**
      * Get services.

diff --git a/tests/TestCase/Client/NovaApiClientTest.php b/tests/TestCase/Client/NovaApiClientTest.php
@@ -314,9 +314,9 @@ public function testCreateOffersClass2()
 
         $actual = $client->createOffers($parameter);
 
-        static::assertCount(1, $actual->getOffers());
+        static::assertCount(1, $actual->offers);
 
-        $offer = $actual->getOffers()[0];
+        $offer = $actual->offers[0];
 
         static::assertSame('_5c63dc7d-62e5-4f3a-a761-464488e92000', $offer->novaOfferId);
         static::assertSame('105.00', $offer->price);
@@ -365,10 +365,10 @@ public function testCreateService()
 
         $actual = $client->createService($parameter);
 
-        static::assertCount(1, $actual->getServices());
-        static::assertSame('OFFERIERT', $actual->getServices()[0]->serviceStatus);
+        static::assertCount(1, $actual->services);
+        static::assertSame('OFFERIERT', $actual->services[0]->serviceStatus);
 
-        $service = (array)$actual->getServices()[0];
+        $service = (array)$actual->services[0];
 
         static::assertSame(
             [
@@ -500,10 +500,10 @@ public function testConfirmReceipt()
 
         $actual = $client->confirmReceipt($parameter);
 
-        static::assertCount(1, $actual->getServices());
-        static::assertSame('PRODUKTION_ERFOLGREICH', $actual->getServices()[0]->serviceStatus);
+        static::assertCount(1, $actual->services);
+        static::assertSame('PRODUKTION_ERFOLGREICH', $actual->services[0]->serviceStatus);
 
-        $service = (array)$actual->getServices()[0];
+        $service = (array)$actual->services[0];
 
         static::assertSame(
             [