Skip to content

[backport] fixes for instant purchase module from #15257 #15258

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
merged 1 commit into from
May 25, 2018
Merged

[backport] fixes for instant purchase module from #15257 #15258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@
class InstantPurchaseOption
{
/**
* @var PaymentTokenInterface
* @var PaymentTokenInterface|null
*/
private $paymentToken;

/**
* @var AddressIn
* @var Address|null
*/
private $shippingAddress;

/**
* @var Address
* @var Address|null
*/
private $billingAddress;

/**
* @var ShippingMethodInterface
* @var ShippingMethodInterface|null
*/
private $shippingMethod;

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/InstantPurchase/Model/InstantPurchaseOptionLoadingFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public function create(
/**
* Loads customer address model by identifier.
*
* @param $addressId
* @param int $addressId
* @return Address
*/
private function getAddress($addressId): Address
Expand Down
2 changes: 1 addition & 1 deletion .../Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserPool.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function get($type) : DeferredShippingMethodChooserInterface
{
if (!isset($this->choosers[$type])) {
throw new \InvalidArgumentException(sprintf(
'Deferred shipping method chooser is not registered.',
'Deferred shipping method %s is not registered.',
$type
));
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationsManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ private function findIntegrations(int $storeId): array
* </instant_purchase>
*
* @param VaultPaymentInterface $paymentMethod
* @param $storeId
* @param int|string|null|\Magento\Store\Model\Store $storeId
* @return bool
*/
private function isIntegrationAvailable(VaultPaymentInterface $paymentMethod, $storeId): bool
Expand Down