Skip to content

Commit 7fd2cf4

Browse files
odanodan
committed
Unify collections
1 parent 4d256e6 commit 7fd2cf4

10 files changed

Lines changed: 49 additions & 155 deletions

‎src/Method/NovaCreateReceiptsMethod.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private function createResult(XmlDocument $xml): NovaCreateReceiptsResult
173173
$serviceItem->vatAmount = $xml->getAttributeValue('verkaufsPreis/mwstAnteil/@betrag', $serviceNode);
174174
$serviceItem->vatPercent = $xml->getAttributeValue('verkaufsPreis/mwstAnteil/@mwstSatz', $serviceNode);
175175

176-
$result->addService($serviceItem);
176+
$result->services[] = $serviceItem;
177177
}
178178

179179
return $result;

‎src/Method/NovaPurchaseServicesMethod.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ private function createResult(XmlDocument $xml): NovaPurchaseServicesResult
190190
$serviceItem->vatAmount = $xml->getAttributeValue('verkaufsPreis/mwstAnteil/@betrag', $serviceNode);
191191
$serviceItem->vatPercent = $xml->getAttributeValue('verkaufsPreis/mwstAnteil/@mwstSatz', $serviceNode);
192192

193-
$result->addService($serviceItem);
193+
$result->services[] = $serviceItem;
194194
}
195195

196196
return $result;

‎src/Method/NovaSearchPartnerMethod.php‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -123,19 +123,23 @@ private function createRequestBody(NovaSearchPartnerParameter $parameter): strin
123123

124124
$parameterWriter = new NovaParameterWriter($dom, $partnerSearchParameter);
125125

126-
$parameterWriter->appendToDocument(new NovaParameterMap([
127-
'tkid' => $parameter->tkId,
128-
'grundkartenNummer' => $parameter->cardNumber,
129-
'ckm' => $parameter->ckm,
130-
'name' => $parameter->lastName,
131-
'vorname' => $parameter->firstName,
132-
'mail' => $parameter->mail,
133-
'land' => $parameter->country,
134-
'ort' => $parameter->city,
135-
'plz' => $parameter->postalCode,
136-
'strasseHnr' => $parameter->street,
137-
'geburtsDatum' => $parameter->dateOfBirth ? $parameter->dateOfBirth->format('Y-m-d') : null,
138-
]));
126+
$parameterWriter->appendToDocument(
127+
new NovaParameterMap(
128+
[
129+
'tkid' => $parameter->tkId,
130+
'grundkartenNummer' => $parameter->cardNumber,
131+
'ckm' => $parameter->ckm,
132+
'name' => $parameter->lastName,
133+
'vorname' => $parameter->firstName,
134+
'mail' => $parameter->mail,
135+
'land' => $parameter->country,
136+
'ort' => $parameter->city,
137+
'plz' => $parameter->postalCode,
138+
'strasseHnr' => $parameter->street,
139+
'geburtsDatum' => $parameter->dateOfBirth ? $parameter->dateOfBirth->format('Y-m-d') : null,
140+
]
141+
)
142+
);
139143

140144
$pagingElement = $dom->createElement('novagp:pagingParameter');
141145
$partnerSearchParameter->appendChild($pagingElement);
@@ -167,7 +171,7 @@ private function createResult(XmlDocument $xml): NovaSearchPartnerResult
167171

168172
/** @var DOMElement $partnerNode */
169173
foreach ($partnerNodes as $partnerNode) {
170-
$result->addPartner($this->createPartner($partnerNode, $xml));
174+
$result->partners[] = $this->createPartner($partnerNode, $xml);
171175
}
172176

173177
return $result;

‎src/Method/NovaSearchServicesMethod.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ private function createResult(XmlDocument $xml): NovaSearchServicesResult
164164

165165
/** @var DOMElement $serviceNode */
166166
foreach ($serviceNodes as $serviceNode) {
167-
$result->addService($this->createService($serviceNode, $xml));
167+
$result->services[] = $this->createService($serviceNode, $xml);
168168
}
169169

170170
return $result;
@@ -193,7 +193,7 @@ private function createService(DOMElement $serviceNode, XmlDocument $xml): NovaS
193193
$service->productNumber = $xml->getAttributeValue('@produktNummer', $serviceNode);
194194

195195
foreach ($xml->queryNodes('geltungsBereich/zonenGeltungsBereich/zonenBuendel/zonen', $serviceNode) as $zone) {
196-
$service->addZone($xml->getNodeValue('code', $zone));
196+
$service->zones[] = $xml->getNodeValue('code', $zone);
197197
}
198198

199199
return $service;

‎src/Result/NovaCreateReceiptsResult.php‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,5 @@ final class NovaCreateReceiptsResult
1414
*
1515
* @var NovaServiceItem[]
1616
*/
17-
private $services = [];
18-
19-
/**
20-
* Add service.
21-
*
22-
* @param NovaServiceItem $novaService The nova service
23-
*
24-
* @return void
25-
*/
26-
public function addService(NovaServiceItem $novaService)
27-
{
28-
$this->services[] = $novaService;
29-
}
30-
31-
/**
32-
* Get services.
33-
*
34-
* @return array|NovaServiceItem[] The items
35-
*/
36-
public function getServices(): array
37-
{
38-
return $this->services;
39-
}
17+
public $services = [];
4018
}

‎src/Result/NovaPurchaseServicesResult.php‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,5 @@ final class NovaPurchaseServicesResult
1414
*
1515
* @var NovaServiceItem[]
1616
*/
17-
private $services = [];
18-
19-
/**
20-
* Add service.
21-
*
22-
* @param NovaServiceItem $novaService The nova service
23-
*
24-
* @return void
25-
*/
26-
public function addService(NovaServiceItem $novaService)
27-
{
28-
$this->services[] = $novaService;
29-
}
30-
31-
/**
32-
* Get services.
33-
*
34-
* @return array|NovaServiceItem[] The items
35-
*/
36-
public function getServices(): array
37-
{
38-
return $this->services;
39-
}
17+
public $services = [];
4018
}

‎src/Result/NovaSearchPartnerResult.php‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,5 @@ final class NovaSearchPartnerResult
1414
*
1515
* @var NovaPartner[]
1616
*/
17-
private $partners = [];
18-
19-
/**
20-
* Add partner.
21-
*
22-
* @param NovaPartner $novaPartner The nova partner (customer)
23-
*
24-
* @return void
25-
*/
26-
public function addPartner(NovaPartner $novaPartner)
27-
{
28-
$this->partners[] = $novaPartner;
29-
}
30-
31-
/**
32-
* Get list of partners.
33-
*
34-
* @return NovaPartner[] The list of partners
35-
*/
36-
public function getPartners()
37-
{
38-
return $this->partners;
39-
}
17+
public $partners = [];
4018
}

‎src/Result/NovaSearchServicesResult.php‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,5 @@ final class NovaSearchServicesResult
1414
*
1515
* @var NovaServiceResult[]
1616
*/
17-
private $services = [];
18-
19-
/**
20-
* Add service.
21-
*
22-
* @param NovaServiceResult $service The nova service
23-
*
24-
* @return void
25-
*/
26-
public function addService(NovaServiceResult $service)
27-
{
28-
$this->services[] = $service;
29-
}
30-
31-
/**
32-
* Get services.
33-
*
34-
* @return array|NovaServiceResult[] The items
35-
*/
36-
public function getServices(): array
37-
{
38-
return $this->services;
39-
}
17+
public $services = [];
4018
}

‎src/Result/NovaServiceResult.php‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,27 +42,5 @@ final class NovaServiceResult
4242
*
4343
* @var string[]
4444
*/
45-
private $zones = [];
46-
47-
/**
48-
* Add zones.
49-
*
50-
* @param string $zone The zone
51-
*
52-
* @return void
53-
*/
54-
public function addZone(string $zone)
55-
{
56-
$this->zones[] = $zone;
57-
}
58-
59-
/**
60-
* Get a list of zones.
61-
*
62-
* @return string[] List of zones
63-
*/
64-
public function getZones(): array
65-
{
66-
return $this->zones;
67-
}
45+
public $zones = [];
6846
}

‎tests/TestCase/Client/NovaApiClientTest.php‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ public function testSearchPartnerByTkid()
125125
$actual = $client->searchPartner($parameter);
126126

127127
static::assertEmpty($actual->messages);
128-
static::assertNotEmpty($actual->getPartners());
129-
static::assertCount(1, $actual->getPartners());
128+
static::assertNotEmpty($actual->partners);
129+
static::assertCount(1, $actual->partners);
130130

131-
$partner = $actual->getPartners()[0];
131+
$partner = $actual->partners[0];
132132

133133
static::assertSame('949e2e6a-fdd1-4f07-8784-201e588ae834', $partner->tkId);
134134
static::assertSame('164-937-314-5', $partner->ckm);
@@ -172,10 +172,10 @@ public function testSearchPartnerByCardNumber()
172172
$actual = $client->searchPartner($parameter);
173173

174174
static::assertEmpty($actual->messages);
175-
static::assertNotEmpty($actual->getPartners());
176-
static::assertCount(1, $actual->getPartners());
175+
static::assertNotEmpty($actual->partners);
176+
static::assertCount(1, $actual->partners);
177177

178-
$partner = $actual->getPartners()[0];
178+
$partner = $actual->partners[0];
179179

180180
static::assertSame('949e2e6a-fdd1-4f07-8784-201e588ae834', $partner->tkId);
181181
static::assertSame('164-937-314-5', $partner->ckm);
@@ -211,10 +211,10 @@ public function testSearchPartnerByPassengerInformation()
211211
$actual = $client->searchPartner($parameter);
212212

213213
static::assertEmpty($actual->messages);
214-
static::assertNotEmpty($actual->getPartners());
215-
static::assertCount(1, $actual->getPartners());
214+
static::assertNotEmpty($actual->partners);
215+
static::assertCount(1, $actual->partners);
216216

217-
$partner = $actual->getPartners()[0];
217+
$partner = $actual->partners[0];
218218

219219
static::assertSame('949e2e6a-fdd1-4f07-8784-201e588ae834', $partner->tkId);
220220
static::assertSame('164-937-314-5', $partner->ckm);
@@ -412,10 +412,10 @@ public function testPurchaseService()
412412

413413
$actual = $client->purchaseService($parameter);
414414

415-
static::assertCount(1, $actual->getServices());
416-
static::assertSame('VERKAUFT', $actual->getServices()[0]->serviceStatus);
415+
static::assertCount(1, $actual->services);
416+
static::assertSame('VERKAUFT', $actual->services[0]->serviceStatus);
417417

418-
$service = (array)$actual->getServices()[0];
418+
$service = (array)$actual->services[0];
419419

420420
static::assertSame(
421421
[
@@ -456,10 +456,10 @@ public function testCreateReceipt()
456456

457457
$actual = $client->createReceipt($parameter);
458458

459-
static::assertCount(1, $actual->getServices());
460-
static::assertSame('PRODUKTION_BEREIT', $actual->getServices()[0]->serviceStatus);
459+
static::assertCount(1, $actual->services);
460+
static::assertSame('PRODUKTION_BEREIT', $actual->services[0]->serviceStatus);
461461

462-
$service = (array)$actual->getServices()[0];
462+
$service = (array)$actual->services[0];
463463

464464
static::assertSame(
465465
[
@@ -546,12 +546,12 @@ public function testSearchServicesByTkId()
546546

547547
$actual = $client->searchServices($parameter);
548548

549-
$this->assertCount(19, $actual->getServices());
550-
$this->assertEquals('949e2e6a-fdd1-4f07-8784-201e588ae834', $actual->getServices()[0]->tkId);
551-
$this->assertEquals('2019-09-01 00:00:00', $actual->getServices()[0]->validFrom->toDateTimeString());
552-
$this->assertEquals('2019-10-01 05:00:00', $actual->getServices()[0]->validTo->toDateTimeString());
553-
$this->assertEquals('51648', $actual->getServices()[0]->productNumber);
554-
$this->assertEquals(['100', '123'], $actual->getServices()[0]->getZones());
555-
$this->assertEquals([], $actual->getServices()[1]->getZones());
549+
$this->assertCount(19, $actual->services);
550+
$this->assertEquals('949e2e6a-fdd1-4f07-8784-201e588ae834', $actual->services[0]->tkId);
551+
$this->assertEquals('2019-09-01 00:00:00', $actual->services[0]->validFrom->toDateTimeString());
552+
$this->assertEquals('2019-10-01 05:00:00', $actual->services[0]->validTo->toDateTimeString());
553+
$this->assertEquals('51648', $actual->services[0]->productNumber);
554+
$this->assertEquals(['100', '123'], $actual->services[0]->zones);
555+
$this->assertEquals([], $actual->services[1]->zones);
556556
}
557557
}

0 commit comments

Comments
 (0)