Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/FedexRest/Services/Pickup/CancelPickup.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/FedexRest/Services/Pickup/CreatePickup.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/FedexRest/Services/Rates/CreateRatesRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/FedexRest/Services/Ship/CancelShipment.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

class CancelShipment extends AbstractRequest
{
protected int $accountNumber;
protected ?string $accountNumber = null;
protected string $trackingNumber;

public function setApiEndpoint(): string
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/FedexRest/Services/Ship/CreateShipment.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Expand Down Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions src/FedexRest/Services/Ship/CreateTagRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/FedexRest/Tests/Pickup/CancelPickupTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion tests/FedexRest/Tests/Pickup/CreatePickupTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions tests/FedexRest/Tests/Rates/CreateRatesRequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions tests/FedexRest/Tests/Ship/CancelShipmentTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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']);
Expand All @@ -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();
Expand Down
12 changes: 6 additions & 6 deletions tests/FedexRest/Tests/Ship/CreateShipmentTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions tests/FedexRest/Tests/Ship/CreateTagRequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Loading