Skip to content

Fix pulp-concert PHP 8.2 parsing regressions #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pjeweb merged 2 commits into from
Jun 20, 2026
Merged

Fix pulp-concert PHP 8.2 parsing regressions #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
078b6ec
Fix OCPI2 parking trend parsing
pjeweb Jun 20, 2026
30ace80
Fix traffic message SimpleXML coordinate parsing
pjeweb Jun 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/pulp-concert/src/pulpconcert/ParkingData/Model/SubTypeOccupancyParkingData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public function getAllPropertiesAsArray(): array
/**
* @return array
*/
public function jsonSerialize()
public function jsonSerialize(): mixed
{
return $this->getAllPropertiesAsArray();
}
Expand Down
39 changes: 23 additions & 16 deletions packages/pulp-concert/src/pulpconcert/ParkingData/ParseParkingDataHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,27 @@ protected static function convertPHWerteTrend(string $phWerteString): ?string
};
}

/**
* @param SubTypeOccupancyParkingData[] $subTypeOccupancyData
*/
private static function selectTrendSource(array $subTypeOccupancyData): ?SubTypeOccupancyParkingData
{
return array_reduce(
$subTypeOccupancyData,
static function (
?SubTypeOccupancyParkingData $carry,
SubTypeOccupancyParkingData $occupancyParkingData
): SubTypeOccupancyParkingData {
if (!$carry instanceof SubTypeOccupancyParkingData || $carry->getCapacity() < $occupancyParkingData->getOccupancy()) {
return $occupancyParkingData;
}

return $carry;
},
null
);
}

/**
* @param SimpleXMLElement $e
* @param ParkingData $parkingData
Expand Down Expand Up @@ -87,14 +108,7 @@ protected static function mapPHWerte(SimpleXMLElement $e, ParkingData $parkingDa
$parkingData->setCapacity($shortTermCapacity);
$parkingData->setDriveIn($shortTermDriveIn);
$parkingData->setDriveOut($shortTermDriveOut);
$parkingData->setTrend(array_reduce($subTypeOccupancyData, static function (SubTypeOccupancyParkingData $carry, SubTypeOccupancyParkingData $occupancyParkingData): SubTypeOccupancyParkingData {
/** @var SubTypeOccupancyParkingData|null $carry */
if (!$carry instanceof SubTypeOccupancyParkingData || $carry->getCapacity() < $occupancyParkingData->getOccupancy()) {
return $occupancyParkingData;
}

return $carry;
})->getTrend());
$parkingData->setTrend(self::selectTrendSource($subTypeOccupancyData)?->getTrend());
$parkingData->setSubTypeOccupancyData($subTypeOccupancyData);

return $parkingData;
Expand Down Expand Up @@ -149,14 +163,7 @@ protected static function mapOcpi2(SimpleXMLElement $e, ParkingData $parkingData
$parkingData->setCapacity($shortTermCapacity);
$parkingData->setDriveIn($shortTermDriveIn);
$parkingData->setDriveOut($shortTermDriveOut);
$parkingData->setTrend(array_reduce($subTypeOccupancyData, static function (SubTypeOccupancyParkingData $carry, SubTypeOccupancyParkingData $occupancyParkingData): SubTypeOccupancyParkingData {
/** @var SubTypeOccupancyParkingData|null $carry */
if (!$carry instanceof SubTypeOccupancyParkingData || $carry->getCapacity() < $occupancyParkingData->getOccupancy()) {
return $occupancyParkingData;
}

return $carry;
})->getTrend());
$parkingData->setTrend(self::selectTrendSource($subTypeOccupancyData)?->getTrend());
$parkingData->setSubTypeOccupancyData($subTypeOccupancyData);

return $parkingData;
Expand Down
8 changes: 4 additions & 4 deletions packages/pulp-concert/src/pulpconcert/TrafficData/Mapper/TrafficMessageMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,14 @@ protected static function mapGeometries(AbstractProjectionHandler $projectionHan
foreach ($coordinateDescription->co as $coordinatePair) {
$coordinate = [];

if (($val = reset($coordinatePair->x)) !== false) {
$coordinate['x'] = (string) $val;
if (count($coordinatePair->x) > 0) {
$coordinate['x'] = (string) $coordinatePair->x[0];
} else {
continue;
}

if (($val = reset($coordinatePair->y)) !== false) {
$coordinate['y'] = (string) $val;
if (count($coordinatePair->y) > 0) {
$coordinate['y'] = (string) $coordinatePair->y[0];
} else {
continue;
}
Expand Down
86 changes: 86 additions & 0 deletions packages/pulp-concert/test/ParkingDataTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?php

declare(strict_types=1);

namespace OpenMapsight\pulpconcert\dev\test;

use OpenMapsight\pulp\File;
use OpenMapsight\Pulp;
use OpenMapsight\PulpConcert;
use OpenMapsight\pulpconcert\ParkingData\Model\ParkingData;
use PHPUnit\Framework\TestCase;
use SimpleXMLElement;

class ParkingDataTest extends TestCase
{
protected function setUp(): void
{
date_default_timezone_set('Europe/Berlin');
}

public function testOcpi2ShortTermCurrentValuesAreParsed(): void
{
$file = new File('parking.xml');
$file->content = new SimpleXMLElement(<<<'XML'
<root>
<ds>
<identifier>
<ident>parking-source-id</ident>
<source>ocpi2</source>
</identifier>
<tstore>2024-01-10T10:15:00Z</tstore>
<objectState>active</objectState>
<data>
<Id>parking-1</Id>
<Timeline>
<Timestamp>2024-01-10T10:15:00Z</Timestamp>
</Timeline>
<OpeningState>open</OpeningState>
<State>ok</State>
<Value>
<Type>shortterm</Type>
<Occupancy>12</Occupancy>
<Capacity>40</Capacity>
<Trend>increasing</Trend>
<DriveIn>5</DriveIn>
<DriveOut>2</DriveOut>
<PredictionInterval>0</PredictionInterval>
</Value>
<Value>
<Type>shortterm</Type>
<Occupancy>18</Occupancy>
<Capacity>40</Capacity>
<Trend>decreasing</Trend>
<DriveIn>8</DriveIn>
<DriveOut>3</DriveOut>
<PredictionInterval>0</PredictionInterval>
</Value>
<Value>
<Type>shortterm</Type>
<Occupancy>30</Occupancy>
<Capacity>40</Capacity>
<Trend>constant</Trend>
<DriveIn>13</DriveIn>
<DriveOut>5</DriveOut>
<PredictionInterval>15</PredictionInterval>
</Value>
</data>
</ds>
</root>
XML);

$res = Pulp::start()
->pipe(Pulp::src($file))
->pipe(PulpConcert::parseParkingData())
->run();

$this->assertCount(1, $res);
$parkingData = $res[0]->content['parking-1'] ?? null;
$this->assertInstanceOf(ParkingData::class, $parkingData);
$this->assertSame(30, $parkingData->getOccupancy());
$this->assertSame(80, $parkingData->getCapacity());
$this->assertSame(13, $parkingData->getDriveIn());
$this->assertSame(5, $parkingData->getDriveOut());
$this->assertSame('increasing', $parkingData->getTrend());
}
}
137 changes: 137 additions & 0 deletions packages/pulp-concert/test/TrafficMessagesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<?php

declare(strict_types=1);

namespace OpenMapsight\pulpconcert\dev\test;

use OpenMapsight\pulp\File;
use OpenMapsight\Pulp;
use OpenMapsight\PulpConcert;
use PHPUnit\Framework\TestCase;
use SimpleXMLElement;

class TrafficMessagesTest extends TestCase
{
protected function setUp(): void
{
date_default_timezone_set('Europe/Berlin');
}

public function testTrafficMessagesGeoJsonDoesNotTriggerSimpleXmlResetDeprecation(): void
{
$file = new File('traffic-message.xml');
$file->content = new SimpleXMLElement(<<<'XML'
<dataList>
<ds>
<identifier>
<ident>traffic-message-source-id</ident>
<source>braunschweig</source>
</identifier>
<tstore>2024-01-10T10:15:00Z</tstore>
<objectState>active</objectState>
<data>
<admin>
<id>message-1</id>
<name>Roadworks A391</name>
<subtype>roadworks</subtype>
<severity>medium</severity>
<category>traffic</category>
</admin>
<description>Lane closure</description>
<validity kind="validity">
<from>2024-01-10T10:00:00Z</from>
<until>2024-01-10T12:00:00Z</until>
</validity>
<validity kind="daily_validity">
<from>2024-01-10T08:00:00Z</from>
<until>2024-01-10T18:00:00Z</until>
</validity>
<location>
<roaddescription>
<road>A391</road>
<road>B4</road>
</roaddescription>
<restriction>
<other>left lane closed</other>
</restriction>
<co_description>
<co>
<x>605000</x>
<y>5792000</y>
</co>
<co>
<x>605100</x>
<y>5792100</y>
</co>
</co_description>
</location>
</data>
</ds>
</dataList>
XML);

$deprecations = [];
set_error_handler(static function (int $severity, string $message) use (&$deprecations): bool {
if ($severity === E_DEPRECATED && str_contains($message, 'reset(): Calling reset() on an object is deprecated')) {
$deprecations[] = $message;
return true;
}

return false;
});

try {
$res = Pulp::start()
->pipe(Pulp::src($file))
->pipe(PulpConcert::parseTrafficMessages())
->pipe(PulpConcert::trafficMessagesToGeoJSON())
->run();
} finally {
restore_error_handler();
}

$this->assertSame([], $deprecations);
$this->assertCount(1, $res);
$this->assertEqualsWithDelta(
[
'type' => 'FeatureCollection',
'crs' => ['type' => 'EPSG', 'properties' => ['code' => '4326']],
'features' => [
[
'type' => 'Feature',
'id' => 'message-1',
'geometry' => [
'type' => 'GeometryCollection',
'geometries' => [
[
'type' => 'LineString',
'coordinates' => [
[10.538748949971936, 52.26834302487074],
[10.540245004079699, 52.26922265146747],
],
],
],
],
'properties' => [
'name' => 'Roadworks A391',
'description' => 'Lane closure',
'subType' => 'roadworks',
'category' => 'traffic',
'roadName' => 'A391, B4',
'restrictions' => 'left lane closed',
'id' => 'message-1',
],
'when' => [
'start' => '2024-01-10T11:00:00+0100',
'end' => '2024-01-10T13:00:00+0100',
'dailyStartTime' => '09:00:00+01:00',
'dailyEndTime' => '19:00:00+01:00',
],
],
],
],
$res[0]->content,
0.00001
);
}
}
Loading