Merge pull request #4 from jolicode/feature/update-google-spec-20260410

Author: Korbeil

AGENTS.md

@@ -30,6 +30,8 @@ castor spec:check:samsung   # Samsung model keyset
 castor spec:baseline:google # Refresh Google baseline
 castor spec:baseline:apple  # Refresh Apple keyset
 castor spec:baseline:samsung # Refresh Samsung keyset
+castor spec:diff:google     # Diff live discovery enums against PHP models
+castor spec:diff:google --properties # Include schema property comparison
 ```
 
 CI runs 4 jobs: cs-check, spec-check, phpstan, and tests (PHP 8.3/8.4/8.5 matrix).

castor.php

@@ -80,6 +80,16 @@ function spec_baseline_google(): void
     run([spec_tools_php(), __DIR__ . '/tools/spec/google-wallet-spec.php', 'baseline']);
 }
 
+#[AsTask('diff:google', namespace: 'spec', description: 'Diff live Google Wallet discovery enums/properties against PHP models')]
+function spec_diff_google(bool $properties = false): void
+{
+    $args = [spec_tools_php(), __DIR__ . '/tools/spec/google-wallet-diff.php'];
+    if ($properties) {
+        $args[] = '--properties';
+    }
+    run($args);
+}
+
 #[AsTask('check:samsung', namespace: 'spec', description: 'Compare Samsung Wallet phpstan keyset to tools/spec/samsung-wallet-keyset.json')]
 function spec_check_samsung(): void
 {

src/Pass/Android/Model/Flight/FlightClass.php

@@ -39,12 +39,13 @@
  * @phpstan-import-type AppLinkDataType from AppLinkData
  * @phpstan-import-type BoardingPolicy from BoardingPolicyEnum
  * @phpstan-import-type SeatClassPolicy from SeatClassPolicyEnum
+ * @phpstan-import-type FlightStatus from FlightStatusEnum
  * @phpstan-import-type MerchantLocationType from MerchantLocation
  * @phpstan-import-type ValueAddedModuleDataType from ValueAddedModuleData
  * @phpstan-import-type NotifyPreference from NotifyPreferenceEnum
  * @phpstan-import-type ReviewType from Review
  *
- * @phpstan-type FlightClassType array{id: string, issuerName: string, reviewStatus: ReviewStatus, origin: AirportInfoType, destination: AirportInfoType, flightHeader: FlightHeaderType, localScheduledDepartureDateTime?: string, localEstimatedOrActualDepartureDateTime?: string, localBoardingDateTime?: string, localScheduledArrivalDateTime?: string, localEstimatedOrActualArrivalDateTime?: string, localGateClosingDateTime?: string, boardingPolicy?: BoardingPolicy, seatClassPolicy?: SeatClassPolicy, localizedIssuerName?: LocalizedStringType, hexBackgroundColor?: string, countryCode?: string, heroImage?: ImageType, enableSmartTap?: bool, redemptionIssuers?: list<string>, multipleDevicesAndHoldersAllowedStatus?: MultipleDevicesAndHoldersAllowedStatus, callbackOptions?: CallbackOptionsType, securityAnimation?: SecurityAnimationType, viewUnlockRequirement?: ViewUnlockRequirement, messages?: list<GoogleMessageType>, imageModulesData?: list<ImageModuleDataType>, textModulesData?: list<TextModuleDataType>, linksModuleData?: LinksModuleDataType, appLinkData?: AppLinkDataType, languageOverride?: string, merchantLocations?: list<MerchantLocationType>, valueAddedModuleData?: list<ValueAddedModuleDataType>, notifyPreference?: NotifyPreference, review?: ReviewType}
+ * @phpstan-type FlightClassType array{id: string, issuerName: string, reviewStatus: ReviewStatus, origin: AirportInfoType, destination: AirportInfoType, flightHeader: FlightHeaderType, localScheduledDepartureDateTime?: string, localEstimatedOrActualDepartureDateTime?: string, localBoardingDateTime?: string, localScheduledArrivalDateTime?: string, localEstimatedOrActualArrivalDateTime?: string, localGateClosingDateTime?: string, flightStatus?: FlightStatus, boardingPolicy?: BoardingPolicy, seatClassPolicy?: SeatClassPolicy, localizedIssuerName?: LocalizedStringType, hexBackgroundColor?: string, countryCode?: string, heroImage?: ImageType, enableSmartTap?: bool, redemptionIssuers?: list<string>, multipleDevicesAndHoldersAllowedStatus?: MultipleDevicesAndHoldersAllowedStatus, callbackOptions?: CallbackOptionsType, securityAnimation?: SecurityAnimationType, viewUnlockRequirement?: ViewUnlockRequirement, messages?: list<GoogleMessageType>, imageModulesData?: list<ImageModuleDataType>, textModulesData?: list<TextModuleDataType>, linksModuleData?: LinksModuleDataType, appLinkData?: AppLinkDataType, languageOverride?: string, merchantLocations?: list<MerchantLocationType>, valueAddedModuleData?: list<ValueAddedModuleDataType>, notifyPreference?: NotifyPreference, review?: ReviewType}
  */
 class FlightClass
 {
@@ -69,6 +70,7 @@ public function __construct(
         public ?string $localScheduledArrivalDateTime = null,
         public ?string $localEstimatedOrActualArrivalDateTime = null,
         public ?string $localGateClosingDateTime = null,
+        public ?FlightStatusEnum $flightStatus = null,
         public ?BoardingPolicyEnum $boardingPolicy = null,
         public ?SeatClassPolicyEnum $seatClassPolicy = null,
         public ?LocalizedString $localizedIssuerName = null,

src/Pass/Android/Model/Flight/FlightStatusEnum.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Jolicode\WalletKit\Pass\Android\Model\Flight;
+
+/**
+ * @phpstan-type FlightStatus 'FLIGHT_STATUS_UNSPECIFIED'|'SCHEDULED'|'ACTIVE'|'LANDED'|'CANCELLED'|'REDIRECTED'|'DIVERTED'
+ */
+enum FlightStatusEnum: string
+{
+    case UNSPECIFIED = 'FLIGHT_STATUS_UNSPECIFIED';
+    case SCHEDULED = 'SCHEDULED';
+    case ACTIVE = 'ACTIVE';
+    case LANDED = 'LANDED';
+    case CANCELLED = 'CANCELLED';
+    case REDIRECTED = 'REDIRECTED';
+    case DIVERTED = 'DIVERTED';
+}

src/Pass/Android/Model/Shared/ReviewStatusEnum.php

@@ -5,11 +5,13 @@
 namespace Jolicode\WalletKit\Pass\Android\Model\Shared;
 
 /**
- * @phpstan-type ReviewStatus 'DRAFT'|'UNDER_REVIEW'|'APPROVED'
+ * @phpstan-type ReviewStatus 'REVIEW_STATUS_UNSPECIFIED'|'DRAFT'|'UNDER_REVIEW'|'APPROVED'|'REJECTED'
  */
 enum ReviewStatusEnum: string
 {
+    case UNSPECIFIED = 'REVIEW_STATUS_UNSPECIFIED';
     case DRAFT = 'DRAFT';
     case UNDER_REVIEW = 'UNDER_REVIEW';
     case APPROVED = 'APPROVED';
+    case REJECTED = 'REJECTED';
 }

src/Pass/Android/Normalizer/Flight/FlightClassNormalizer.php

@@ -57,6 +57,10 @@ public function normalize(mixed $object, ?string $format = null, array $context
             $data['localGateClosingDateTime'] = $object->localGateClosingDateTime;
         }
 
+        if (null !== $object->flightStatus) {
+            $data['flightStatus'] = $object->flightStatus->value;
+        }
+
         if (null !== $object->boardingPolicy) {
             $data['boardingPolicy'] = $object->boardingPolicy->value;
         }

tests/Pass/Android/Normalizer/FlightNormalizerTest.php

@@ -13,6 +13,7 @@
 use Jolicode\WalletKit\Pass\Android\Model\Flight\FlightClass;
 use Jolicode\WalletKit\Pass\Android\Model\Flight\FlightHeader;
 use Jolicode\WalletKit\Pass\Android\Model\Flight\FlightObject;
+use Jolicode\WalletKit\Pass\Android\Model\Flight\FlightStatusEnum;
 use Jolicode\WalletKit\Pass\Android\Model\Flight\FrequentFlyerInfo;
 use Jolicode\WalletKit\Pass\Android\Model\Flight\ReservationInfo;
 use Jolicode\WalletKit\Pass\Android\Model\Flight\SeatClassPolicyEnum;
@@ -189,6 +190,7 @@ public function testFlightPass(): void
             localScheduledDepartureDateTime: '2025-08-15T10:00',
             localScheduledArrivalDateTime: '2025-08-15T14:30',
             localBoardingDateTime: '2025-08-15T09:30',
+            flightStatus: FlightStatusEnum::SCHEDULED,
             boardingPolicy: BoardingPolicyEnum::ZONE_BASED,
             seatClassPolicy: SeatClassPolicyEnum::CABIN_BASED,
             hexBackgroundColor: Color::fromHex('#003366'),
@@ -235,6 +237,7 @@ classId: 'flight-class-1',
         self::assertSame('JFK', $classData['destination']['airportIataCode']);
         self::assertSame('AF', $classData['flightHeader']['carrier']['carrierIataCode']);
         self::assertSame('123', $classData['flightHeader']['flightNumber']);
+        self::assertSame('SCHEDULED', $classData['flightStatus']);
         self::assertSame('ZONE_BASED', $classData['boardingPolicy']);
 
         self::assertSame('flight-object-1', $objectData['id']);

tools/spec/google-wallet-baseline.json

@@ -1,5 +1,5 @@
 {
-    "revision": "20260409",
+    "revision": "20260410",
     "version": "v1",
-    "updatedAt": "2026-04-09T20:19:32+00:00"
+    "updatedAt": "2026-04-10T22:43:31+00:00"
 }