From 2921287a7d5e7a84b6661ab32a53e422b4e49887 Mon Sep 17 00:00:00 2001 From: Vipin Suthar Date: Tue, 10 Dec 2024 10:46:41 +0000 Subject: [PATCH] * Update "Account Number" field type from `int` to `string`. --- src/FedexRest/Services/Pickup/CancelPickup.php | 10 +++++----- src/FedexRest/Services/Pickup/CreatePickup.php | 10 +++++----- src/FedexRest/Services/Rates/CreateRatesRequest.php | 6 +++--- src/FedexRest/Services/Ship/CancelShipment.php | 6 +++--- src/FedexRest/Services/Ship/CreateShipment.php | 6 +++--- src/FedexRest/Services/Ship/CreateTagRequest.php | 6 +++--- tests/FedexRest/Tests/Pickup/CancelPickupTest.php | 2 +- tests/FedexRest/Tests/Pickup/CreatePickupTest.php | 2 +- .../FedexRest/Tests/Rates/CreateRatesRequestTest.php | 6 +++--- tests/FedexRest/Tests/Ship/CancelShipmentTest.php | 6 +++--- tests/FedexRest/Tests/Ship/CreateShipmentTest.php | 12 ++++++------ tests/FedexRest/Tests/Ship/CreateTagRequestTest.php | 6 +++--- 12 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/FedexRest/Services/Pickup/CancelPickup.php b/src/FedexRest/Services/Pickup/CancelPickup.php index 484da6c..9715cdd 100644 --- a/src/FedexRest/Services/Pickup/CancelPickup.php +++ b/src/FedexRest/Services/Pickup/CancelPickup.php @@ -8,7 +8,7 @@ class CancelPickup extends AbstractRequest { - protected int $associatedAccountNumber; + protected ?string $associatedAccountNumber = null; protected string $pickupConfirmationCode; protected ?string $remarks = null; protected ?string $carrierCode = null; @@ -17,18 +17,18 @@ class CancelPickup extends AbstractRequest protected ?string $location = null; /** - * @return int + * @return ?string */ - public function getAssociatedAccountNumber(): int + public function getAssociatedAccountNumber(): ?string { return $this->associatedAccountNumber; } /** - * @param int $associatedAccountNumber + * @param string|null $associatedAccountNumber * @return CancelPickup */ - public function setAssociatedAccountNumber(int $associatedAccountNumber): CancelPickup + public function setAssociatedAccountNumber(?string $associatedAccountNumber): CancelPickup { $this->associatedAccountNumber = $associatedAccountNumber; return $this; diff --git a/src/FedexRest/Services/Pickup/CreatePickup.php b/src/FedexRest/Services/Pickup/CreatePickup.php index 263c08d..8c403be 100644 --- a/src/FedexRest/Services/Pickup/CreatePickup.php +++ b/src/FedexRest/Services/Pickup/CreatePickup.php @@ -11,7 +11,7 @@ class CreatePickup extends AbstractRequest { - protected int $associatedAccountNumber; + protected ?string $associatedAccountNumber = null; protected OriginDetail $originDetail; protected ?string $associatedAccountNumberType = null; protected ?Weight $totalWeight = null; @@ -28,18 +28,18 @@ class CreatePickup extends AbstractRequest protected ?PickupNotificationDetail $pickupNotificationDetail = null; /** - * @return int + * @return string|null */ - public function getAssociatedAccountNumber(): int + public function getAssociatedAccountNumber(): ?string { return $this->associatedAccountNumber; } /** - * @param int $associatedAccountNumber + * @param string|null $associatedAccountNumber * @return CreatePickup */ - public function setAssociatedAccountNumber(int $associatedAccountNumber): CreatePickup + public function setAssociatedAccountNumber(?string $associatedAccountNumber): CreatePickup { $this->associatedAccountNumber = $associatedAccountNumber; return $this; diff --git a/src/FedexRest/Services/Rates/CreateRatesRequest.php b/src/FedexRest/Services/Rates/CreateRatesRequest.php index 6ce3d7e..8f2c353 100644 --- a/src/FedexRest/Services/Rates/CreateRatesRequest.php +++ b/src/FedexRest/Services/Rates/CreateRatesRequest.php @@ -24,7 +24,7 @@ class CreateRatesRequest extends AbstractRequest protected array $rateRequestTypes; protected string $packagingType = ''; protected string $pickupType = ''; - protected int $accountNumber; + protected ?string $accountNumber = null; protected array $lineItems = []; protected ShipmentSpecialServices $shipmentSpecialServices; protected ShippingChargesPayment $shippingChargesPayment; @@ -155,10 +155,10 @@ public function getPickupType(): string } /** - * @param int $accountNumber + * @param string|null $accountNumber * @return $this */ - public function setAccountNumber(int $accountNumber): CreateRatesRequest + public function setAccountNumber(?string $accountNumber): CreateRatesRequest { $this->accountNumber = $accountNumber; return $this; diff --git a/src/FedexRest/Services/Ship/CancelShipment.php b/src/FedexRest/Services/Ship/CancelShipment.php index 4c2b6e1..5e5d973 100644 --- a/src/FedexRest/Services/Ship/CancelShipment.php +++ b/src/FedexRest/Services/Ship/CancelShipment.php @@ -10,7 +10,7 @@ class CancelShipment extends AbstractRequest { - protected int $accountNumber; + protected ?string $accountNumber = null; protected string $trackingNumber; public function setApiEndpoint(): string @@ -19,10 +19,10 @@ public function setApiEndpoint(): string } /** - * @param int $accountNumber + * @param string|null $accountNumber * @return $this */ - public function setAccountNumber(int $accountNumber): CancelShipment + public function setAccountNumber(?string $accountNumber): CancelShipment { $this->accountNumber = $accountNumber; return $this; diff --git a/src/FedexRest/Services/Ship/CreateShipment.php b/src/FedexRest/Services/Ship/CreateShipment.php index 2db19cc..26ffcf0 100644 --- a/src/FedexRest/Services/Ship/CreateShipment.php +++ b/src/FedexRest/Services/Ship/CreateShipment.php @@ -27,7 +27,7 @@ class CreateShipment extends AbstractRequest protected string $serviceType; protected string $packagingType = ''; protected string $pickupType = ''; - protected int $accountNumber; + protected ?string $accountNumber = null; protected array $rateRequestTypes; protected array $lineItems = []; protected string $labelResponseOptions = ''; @@ -158,10 +158,10 @@ public function getPickupType(): string } /** - * @param int $accountNumber + * @param string|null $accountNumber * @return $this */ - public function setAccountNumber(int $accountNumber): CreateShipment { + public function setAccountNumber(?string $accountNumber): CreateShipment { $this->accountNumber = $accountNumber; return $this; } diff --git a/src/FedexRest/Services/Ship/CreateTagRequest.php b/src/FedexRest/Services/Ship/CreateTagRequest.php index 14f4839..976c61a 100644 --- a/src/FedexRest/Services/Ship/CreateTagRequest.php +++ b/src/FedexRest/Services/Ship/CreateTagRequest.php @@ -15,7 +15,7 @@ class CreateTagRequest extends AbstractRequest { - protected int $account_number; + protected ?string $account_number = null; protected Person $shipper; protected array $recipients; protected ?Item $line_items; @@ -183,10 +183,10 @@ public function setRecipients(Person ...$recipients): CreateTagRequest } /** - * @param int $account_number + * @param string|null $account_number * @return $this */ - public function setAccountNumber(int $account_number): CreateTagRequest + public function setAccountNumber(?string $account_number): CreateTagRequest { $this->account_number = $account_number; return $this; diff --git a/tests/FedexRest/Tests/Pickup/CancelPickupTest.php b/tests/FedexRest/Tests/Pickup/CancelPickupTest.php index cd006e1..0b2f9a0 100644 --- a/tests/FedexRest/Tests/Pickup/CancelPickupTest.php +++ b/tests/FedexRest/Tests/Pickup/CancelPickupTest.php @@ -25,7 +25,7 @@ public function testRequest() { $request = (new CancelPickup()) ->setAccessToken((string) $this->auth->authorize()->access_token) - ->setAssociatedAccountNumber(740561073) + ->setAssociatedAccountNumber('740561073') ->setPickupConfirmationCode('1') ->setCarrierCode('FDXE') ->setScheduledDate('2020-07-03') diff --git a/tests/FedexRest/Tests/Pickup/CreatePickupTest.php b/tests/FedexRest/Tests/Pickup/CreatePickupTest.php index 574b8d9..32b099a 100644 --- a/tests/FedexRest/Tests/Pickup/CreatePickupTest.php +++ b/tests/FedexRest/Tests/Pickup/CreatePickupTest.php @@ -44,7 +44,7 @@ public function testRequest() { $pickup = (new CreatePickup()) ->setAccessToken((string)$this->auth->authorize()->access_token) - ->setAssociatedAccountNumber(740561073) + ->setAssociatedAccountNumber('740561073') ->setOriginDetail( (new OriginDetail())->setPickupLocation( (new PickupLocation())->setContact( diff --git a/tests/FedexRest/Tests/Rates/CreateRatesRequestTest.php b/tests/FedexRest/Tests/Rates/CreateRatesRequestTest.php index 296df79..0d0b4d0 100644 --- a/tests/FedexRest/Tests/Rates/CreateRatesRequestTest.php +++ b/tests/FedexRest/Tests/Rates/CreateRatesRequestTest.php @@ -55,7 +55,7 @@ public function testRequiredData() { $createRatesRequest = (new CreateRatesRequest()) ->setAccessToken((string)$this->auth->authorize()->access_token) - ->setAccountNumber(740561073) + ->setAccountNumber('740561073') ->setServiceType(ServiceType::_FEDEX_GROUND) ->setRecipient( (new Person) @@ -89,7 +89,7 @@ public function testPrepare(): void { $request = (new CreateRatesRequest) ->setAccessToken((string)$this->auth->authorize()->access_token) - ->setAccountNumber(740561073) + ->setAccountNumber('740561073') ->setServiceType(ServiceType::_FEDEX_GROUND) ->setPackagingType(PackagingType::_YOUR_PACKAGING) ->setPickupType(PickupType::_DROPOFF_AT_FEDEX_LOCATION) @@ -150,7 +150,7 @@ public function testRequest(): void { $request = (new CreateRatesRequest) ->setAccessToken((string)$this->auth->authorize()->access_token) - ->setAccountNumber(740561073) + ->setAccountNumber('740561073') ->setRateRequestTypes('ACCOUNT', 'LIST') ->setPickupType(PickupType::_DROPOFF_AT_FEDEX_LOCATION) ->setShipper( diff --git a/tests/FedexRest/Tests/Ship/CancelShipmentTest.php b/tests/FedexRest/Tests/Ship/CancelShipmentTest.php index 92db845..3d2651c 100644 --- a/tests/FedexRest/Tests/Ship/CancelShipmentTest.php +++ b/tests/FedexRest/Tests/Ship/CancelShipmentTest.php @@ -40,7 +40,7 @@ public function testHasTrackingNumber() try { $request = (new CancelShipment()) ->setAccessToken((string) $this->auth->authorize()->access_token) - ->setAccountNumber(740561073) + ->setAccountNumber('740561073') ->request(); } catch (MissingTrackingNumberException $e) { @@ -53,7 +53,7 @@ public function testPrepare() { $request = (new CancelShipment) ->setAccessToken((string) $this->auth->authorize()->access_token) - ->setAccountNumber($accountNumber = 740561073) + ->setAccountNumber($accountNumber = '740561073') ->setTrackingNumber($trackingNumber = 794953555571); $this->assertEquals($accountNumber, $request->prepare()['accountNumber']['value']); @@ -64,7 +64,7 @@ public function testRequest() { $cancelShipment = (new CancelShipment) ->setAccessToken((string) $this->auth->authorize()->access_token) - ->setAccountNumber(740561073) + ->setAccountNumber('740561073') ->setTrackingNumber(794953555571); $request = $cancelShipment->request(); diff --git a/tests/FedexRest/Tests/Ship/CreateShipmentTest.php b/tests/FedexRest/Tests/Ship/CreateShipmentTest.php index c7a2c6d..d7214c4 100644 --- a/tests/FedexRest/Tests/Ship/CreateShipmentTest.php +++ b/tests/FedexRest/Tests/Ship/CreateShipmentTest.php @@ -65,7 +65,7 @@ public function testLabelResponseOptions() try { $request = (new CreateShipment()) ->setAccessToken((string)$this->auth->authorize()->access_token) - ->setAccountNumber(740561073) + ->setAccountNumber('740561073') ->setServiceType(ServiceType::_FEDEX_GROUND) ->setPackagingType(PackagingType::_YOUR_PACKAGING) ->setPickupType(PickupType::_DROPOFF_AT_FEDEX_LOCATION) @@ -130,7 +130,7 @@ public function testShippingChargesPayment() try { $request = (new CreateShipment()) ->setAccessToken((string)$this->auth->authorize()->access_token) - ->setAccountNumber(740561073) + ->setAccountNumber('740561073') ->setServiceType(ServiceType::_FEDEX_GROUND) ->setPackagingType(PackagingType::_YOUR_PACKAGING) ->setPickupType(PickupType::_DROPOFF_AT_FEDEX_LOCATION) @@ -192,7 +192,7 @@ public function testLabel() try { $request = (new CreateShipment) ->setAccessToken((string)$this->auth->authorize()->access_token) - ->setAccountNumber(740561073) + ->setAccountNumber('740561073') ->setServiceType(ServiceType::_FEDEX_GROUND) ->setLabelResponseOptions(LabelResponseOptionsType::_URL_ONLY) ->setPackagingType(PackagingType::_YOUR_PACKAGING) @@ -241,7 +241,7 @@ public function testRequiredData() { $shipment = (new CreateShipment()) ->setAccessToken((string)$this->auth->authorize()->access_token) - ->setAccountNumber(740561073) + ->setAccountNumber('740561073') ->setServiceType(ServiceType::_FEDEX_GROUND) ->setLabelResponseOptions(LabelResponseOptionsType::_URL_ONLY) ->setShippingChargesPayment((new ShippingChargesPayment()) @@ -275,7 +275,7 @@ public function testPrepare() { $request = (new CreateShipment) ->setAccessToken((string)$this->auth->authorize()->access_token) - ->setAccountNumber(740561073) + ->setAccountNumber('740561073') ->setServiceType(ServiceType::_FEDEX_GROUND) ->setLabelResponseOptions(LabelResponseOptionsType::_URL_ONLY) ->setPackagingType(PackagingType::_YOUR_PACKAGING) @@ -362,7 +362,7 @@ public function testRequest() { $shipment = (new CreateShipment()) ->setAccessToken((string)$this->auth->authorize()->access_token) - ->setAccountNumber(740561073) + ->setAccountNumber('740561073') ->setServiceType(ServiceType::_FEDEX_GROUND) ->setLabelResponseOptions(LabelResponseOptionsType::_URL_ONLY) ->setPackagingType(PackagingType::_YOUR_PACKAGING) diff --git a/tests/FedexRest/Tests/Ship/CreateTagRequestTest.php b/tests/FedexRest/Tests/Ship/CreateTagRequestTest.php index dbc1dd6..2e8731b 100644 --- a/tests/FedexRest/Tests/Ship/CreateTagRequestTest.php +++ b/tests/FedexRest/Tests/Ship/CreateTagRequestTest.php @@ -53,7 +53,7 @@ public function testRequiredData() { $request = (new CreateTagRequest) ->setAccessToken((string)$this->auth->authorize()->access_token) - ->setAccountNumber(740561073) + ->setAccountNumber('740561073') ->setServiceType(ServiceType::_FEDEX_GROUND) ->setRecipients( (new Person)->setPersonName('Lorem') @@ -82,7 +82,7 @@ public function testPrepare() { $request = (new CreateTagRequest) ->setAccessToken((string)$this->auth->authorize()->access_token) - ->setAccountNumber(740561073) + ->setAccountNumber('740561073') ->setServiceType(ServiceType::_FEDEX_GROUND) ->setPackagingType(PackagingType::_YOUR_PACKAGING) ->setPickupType(PickupType::_DROPOFF_AT_FEDEX_LOCATION) @@ -142,7 +142,7 @@ public function testRequest() $request = (new CreateTagRequest()) ->asRaw() ->setAccessToken((string)$this->auth->authorize()->access_token) - ->setAccountNumber(740561073) + ->setAccountNumber('740561073') ->setServiceType(ServiceType::_FEDEX_GROUND) ->setPackagingType(PackagingType::_YOUR_PACKAGING) ->setPickupType(PickupType::_DROPOFF_AT_FEDEX_LOCATION)