EP/myep
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: XML scope for services too broad

Browse Source
This commit is contained in:
Björn Fromme
2026-03-16 20:25:56 +01:00
parent c510cbf590
commit 5619a6f22f
2 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BusProNet/XmlParser/TravelParser.php
+2 -1
View File
@@ -71,8 +71,9 @@ class TravelParser extends AbstractParser
$travel->type = $node->attr('reiseart'); $travel->type = $node->attr('reiseart');
$travel->priceFrom = $this->stringToFloat($this->getStringOrNullValue($node->filterXPath('//abpreis'))); $travel->priceFrom = $this->stringToFloat($this->getStringOrNullValue($node->filterXPath('//abpreis')));
$travel->selectionGroups = $this->getSelectionGroups($node->filterXPath('//selektiongruppe')); $travel->selectionGroups = $this->getSelectionGroups($node->filterXPath('//selektiongruppe'));
// Parse only termin-level additional services; exclude hotel-nested duplicates that can override flags.
$travel->additionalServices = $this $travel->additionalServices = $this
->getAdditionalServices($node->filterXPath('//lei_sonstiges/leistung')); ->getAdditionalServices($node->filterXPath('.//lei_sonstiges[not(ancestor::hotel)]/leistung'));
$travel->transportationServices = $this $travel->transportationServices = $this
->getTransportationServices($node->filterXPath('//lei_befoerderung/leistung')); ->getTransportationServices($node->filterXPath('//lei_befoerderung/leistung'));
$travel->rooms = $this->getRooms($hotelNode); $travel->rooms = $this->getRooms($hotelNode);
tests/BusProNet/XmlParser/TravelParserTest.php
+41
View File
@@ -184,6 +184,47 @@ class TravelParserTest extends TestCase
$this->assertTrue($additionalServices[183660]->autoBook); $this->assertTrue($additionalServices[183660]->autoBook);
} }
public function testParseAdditionalServicesUsesTerminLevelOnly(): void
{
$xmlContent = '<?xml version="1.0" encoding="utf-8"?>
<reisen>
<reise id="1" idbuspro="2187" code="SSTMR">
<termin id="1" idbuspro="11946" termin="01.01.2030" bis="06.01.2030" reiseart="F">
<text>Test Travel</text>
<abpreis>659,00</abpreis>
<lei_sonstiges>
<leistung id="1" idbuspro="183656" unterart="SPA" automatisch_buchen="True" pflicht="False">
<text>Skipass 6 Tage</text>
<preis>59,00</preis>
<status>Frei</status>
</leistung>
</lei_sonstiges>
<hotel id="1" idbuspro="157047">
<lei_sonstiges>
<leistung id="1" idbuspro="183656" unterart="SPA" automatisch_buchen="False" pflicht="False">
<text>Skipass 6 Tage Hotel</text>
<preis>59,00</preis>
<status>Frei</status>
</leistung>
</lei_sonstiges>
<zimmer>
<preis zimmercode="4erDW" idbuspro_zimmer="95" zimmertext="4er Zimmer" MinPax="4" MaxPax="4" naechte="5" preis="689,00" status="Frei" verfuegbar="8" />
</zimmer>
</hotel>
</termin>
</reise>
</reisen>';
$crawler = new Crawler($xmlContent);
$travelNode = $crawler->filterXPath('//reise/termin')->first();
$travel = $this->parser->parse($travelNode);
$additionalServices = $travel->additionalServices;
$this->assertArrayHasKey(183656, $additionalServices);
$this->assertTrue($additionalServices[183656]->autoBook);
$this->assertSame('Skipass 6 Tage', $additionalServices[183656]->label);
}
public function testParseServiceWithEmptyDescription(): void public function testParseServiceWithEmptyDescription(): void
{ {
$xmlContent = '<?xml version="1.0" encoding="utf-8"?> $xmlContent = '<?xml version="1.0" encoding="utf-8"?>