Use static method for legacy value mapping

chiiya · Oct 10, 2024 · dfc3cd1 · dfc3cd1
1 parent 20da88c
commit dfc3cd1
Show file tree

Hide file tree

Showing 29 changed files with 34 additions and 39 deletions.
diff --git a/src/Common/Casters/LegacyValueCaster.php b/src/Common/Casters/LegacyValueCaster.php
@@ -6,11 +6,12 @@
 use Chiiya\Passes\Common\LegacyValueEnumerator;
 use LogicException;
 
-class LegacyValueCaster implements CastsProperty
+readonly class LegacyValueCaster implements CastsProperty
 {
     public function __construct(
-        private readonly array $types,
-        private readonly string $enum,
+        private array $types,
+        /** @var class-string<LegacyValueEnumerator> */
+        private string $enum,
     ) {}
 
     public function unserialize(mixed $value): ?string
@@ -23,10 +24,7 @@ public function unserialize(mixed $value): ?string
             return null;
         }
 
-        /** @var LegacyValueEnumerator $enum */
-        $enum = new $this->enum;
-
-        return $enum->mapLegacyValues($value);
+        return $this->enum::mapLegacyValues($value);
     }
 
     public function serialize(mixed $value): ?string
@@ -39,9 +37,6 @@ public function serialize(mixed $value): ?string
             return null;
         }
 
-        /** @var LegacyValueEnumerator $enum */
-        $enum = new $this->enum;
-
-        return $enum->mapLegacyValues($value);
+        return $this->enum::mapLegacyValues($value);
     }
 }
diff --git a/src/Common/LegacyValueEnumerator.php b/src/Common/LegacyValueEnumerator.php
@@ -4,5 +4,5 @@
 
 interface LegacyValueEnumerator
 {
-    public function mapLegacyValues(string $value): string;
+    public static function mapLegacyValues(string $value): string;
 }
diff --git a/src/Google/Enumerators/BarcodeRenderEncoding.php b/src/Google/Enumerators/BarcodeRenderEncoding.php
@@ -17,7 +17,7 @@ public static function values(): array
         return [self::RENDER_ENCODING_UNSPECIFIED, self::UTF_8];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'UTF_8' => self::UTF_8,

diff --git a/src/Google/Enumerators/BarcodeType.php b/src/Google/Enumerators/BarcodeType.php
@@ -64,7 +64,7 @@ public static function values(): array
         ];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'aztec' => self::AZTEC,

diff --git a/src/Google/Enumerators/DateFormat.php b/src/Google/Enumerators/DateFormat.php
@@ -36,7 +36,7 @@ public static function values(): array
         ];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'dateTime' => self::DATE_TIME,

diff --git a/src/Google/Enumerators/DoorsOpenLabel.php b/src/Google/Enumerators/DoorsOpenLabel.php
@@ -20,7 +20,7 @@ public static function values(): array
         return [self::DOORS_OPEN_LABEL_UNSPECIFIED, self::DOORS_OPEN, self::GATES_OPEN];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'doorsOpen' => self::DOORS_OPEN,

diff --git a/src/Google/Enumerators/EventTicket/ConfirmationCodeLabel.php b/src/Google/Enumerators/EventTicket/ConfirmationCodeLabel.php
@@ -32,7 +32,7 @@ public static function values(): array
         ];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'confirmationCode' => self::CONFIRMATION_CODE,

diff --git a/src/Google/Enumerators/EventTicket/GateLabel.php b/src/Google/Enumerators/EventTicket/GateLabel.php
@@ -23,7 +23,7 @@ public static function values(): array
         return [self::GATE_LABEL_UNSPECIFIED, self::GATE, self::DOOR, self::ENTRANCE];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'gate' => self::GATE,

diff --git a/src/Google/Enumerators/EventTicket/RowLabel.php b/src/Google/Enumerators/EventTicket/RowLabel.php
@@ -17,7 +17,7 @@ public static function values(): array
         return [self::ROW_LABEL_UNSPECIFIED, self::ROW];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'row' => self::ROW,

diff --git a/src/Google/Enumerators/EventTicket/SeatLabel.php b/src/Google/Enumerators/EventTicket/SeatLabel.php
@@ -17,7 +17,7 @@ public static function values(): array
         return [self::SEAT_LABEL_UNSPECIFIED, self::SEAT];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'seat' => self::SEAT,

diff --git a/src/Google/Enumerators/EventTicket/SectionLabel.php b/src/Google/Enumerators/EventTicket/SectionLabel.php
@@ -20,7 +20,7 @@ public static function values(): array
         return [self::SECTION_LABEL_UNSPECIFIED, self::SECTION, self::THEATER];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'section' => self::SECTION,

diff --git a/src/Google/Enumerators/Flight/BoardingDoor.php b/src/Google/Enumerators/Flight/BoardingDoor.php
@@ -20,7 +20,7 @@ public static function values(): array
         return [self::BOARDING_DOOR_UNSPECIFIED, self::FRONT, self::BACK];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'front' => self::FRONT,

diff --git a/src/Google/Enumerators/Flight/BoardingPolicy.php b/src/Google/Enumerators/Flight/BoardingPolicy.php
@@ -28,7 +28,7 @@ public static function values(): array
         ];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'zoneBased' => self::ZONE_BASED,

diff --git a/src/Google/Enumerators/Flight/FlightStatus.php b/src/Google/Enumerators/Flight/FlightStatus.php
@@ -40,7 +40,7 @@ public static function values(): array
         ];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'scheduled' => self::SCHEDULED,

diff --git a/src/Google/Enumerators/Flight/SeatClassPolicy.php b/src/Google/Enumerators/Flight/SeatClassPolicy.php
@@ -32,7 +32,7 @@ public static function values(): array
         ];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'cabinBased' => self::CABIN_BASED,

diff --git a/src/Google/Enumerators/Loyalty/VisibilityState.php b/src/Google/Enumerators/Loyalty/VisibilityState.php
@@ -23,7 +23,7 @@ public static function values(): array
         return [self::STATE_UNSPECIFIED, self::TRUSTED_TESTERS, self::LIVE, self::DISABLED];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'trustedTesters' => self::TRUSTED_TESTERS,

diff --git a/src/Google/Enumerators/MessageType.php b/src/Google/Enumerators/MessageType.php
@@ -20,7 +20,7 @@ public static function values(): array
         return [self::MESSAGE_TYPE_UNSPECIFIED, self::TEXT, self::EXPIRATION_NOTIFICATION];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'text' => self::TEXT,

diff --git a/src/Google/Enumerators/MultipleDevicesAndHoldersAllowedStatus.php b/src/Google/Enumerators/MultipleDevicesAndHoldersAllowedStatus.php
@@ -28,7 +28,7 @@ public static function values(): array
         ];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'multipleHolders' => self::MULTIPLE_HOLDERS,

diff --git a/src/Google/Enumerators/Offer/RedemptionChannel.php b/src/Google/Enumerators/Offer/RedemptionChannel.php
@@ -32,7 +32,7 @@ public static function values(): array
         ];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'instore' => self::INSTORE,

diff --git a/src/Google/Enumerators/PredefinedItem.php b/src/Google/Enumerators/PredefinedItem.php
@@ -24,7 +24,7 @@ public static function values(): array
         ];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'frequentFlyerProgramNameAndNumber' => self::FREQUENT_FLYER_PROGRAM_NAME_AND_NUMBER,

diff --git a/src/Google/Enumerators/ReviewStatus.php b/src/Google/Enumerators/ReviewStatus.php
@@ -26,7 +26,7 @@ public static function values(): array
         return [self::REVIEW_STATUS_UNSPECIFIED, self::UNDER_REVIEW, self::APPROVED, self::REJECTED, self::DRAFT];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'underReview' => self::UNDER_REVIEW,

diff --git a/src/Google/Enumerators/State.php b/src/Google/Enumerators/State.php
@@ -26,7 +26,7 @@ public static function values(): array
         return [self::STATE_UNSPECIFIED, self::ACTIVE, self::COMPLETED, self::EXPIRED, self::INACTIVE];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'active' => self::ACTIVE,

diff --git a/src/Google/Enumerators/Transit/ConcessionCategory.php b/src/Google/Enumerators/Transit/ConcessionCategory.php
@@ -23,7 +23,7 @@ public static function values(): array
         return [self::CONCESSION_CATEGORY_UNSPECIFIED, self::ADULT, self::CHILD, self::SENIOR];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'adult' => self::ADULT,

diff --git a/src/Google/Enumerators/Transit/FareClass.php b/src/Google/Enumerators/Transit/FareClass.php
@@ -23,7 +23,7 @@ public static function values(): array
         return [self::FARE_CLASS_UNSPECIFIED, self::ECONOMY, self::FIRST, self::BUSINESS];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'economy' => self::ECONOMY,

diff --git a/src/Google/Enumerators/Transit/PassengerType.php b/src/Google/Enumerators/Transit/PassengerType.php
@@ -20,7 +20,7 @@ public static function values(): array
         return [self::PASSENGER_TYPE_UNSPECIFIED, self::SINGLE_PASSENGER, self::MULTIPLE_PASSENGERS];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'singlePassenger' => self::SINGLE_PASSENGER,

diff --git a/src/Google/Enumerators/Transit/TicketStatus.php b/src/Google/Enumerators/Transit/TicketStatus.php
@@ -23,7 +23,7 @@ public static function values(): array
         return [self::TICKET_STATUS_UNSPECIFIED, self::USED, self::REFUNDED, self::EXCHANGED];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'used' => self::USED,

diff --git a/src/Google/Enumerators/Transit/TransitType.php b/src/Google/Enumerators/Transit/TransitType.php
@@ -29,7 +29,7 @@ public static function values(): array
         return [self::TRANSIT_TYPE_UNSPECIFIED, self::BUS, self::RAIL, self::TRAM, self::FERRY, self::OTHER];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'bus' => self::BUS,

diff --git a/src/Google/Enumerators/Transit/TripType.php b/src/Google/Enumerators/Transit/TripType.php
@@ -20,7 +20,7 @@ public static function values(): array
         return [self::TRIP_TYPE_UNSPECIFIED, self::ROUND_TRIP, self::ONE_WAY];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'roundTrip' => self::ROUND_TRIP,

diff --git a/src/Google/Enumerators/TransitOption.php b/src/Google/Enumerators/TransitOption.php
@@ -28,7 +28,7 @@ public static function values(): array
         ];
     }
 
-    public function mapLegacyValues(string $value): string
+    public static function mapLegacyValues(string $value): string
     {
         return match ($value) {
             'originAndDestinationNames' => self::ORIGIN_AND_DESTINATION_NAMES,