ENGCOM-1632: Fixes in InstantPurchase #15257

magento-engcom-team · magento-engcom-team · commit cb8464ec95b4 · 2018-05-21T09:06:18.000-05:00
- Merge Pull Request #15257 from mhauri/magento2:fix-instantpurchase - Merged commits: 1. 770d8ba 2. e03c9a3 3. 31a098b 4. 57e3180 5. 08508fa
diff --git a/app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php b/app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php
@@ -20,22 +20,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;
 
diff --git a/app/code/Magento/InstantPurchase/Model/InstantPurchaseOptionLoadingFactory.php b/app/code/Magento/InstantPurchase/Model/InstantPurchaseOptionLoadingFactory.php
@@ -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
diff --git a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserPool.php b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserPool.php
@@ -39,7 +39,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
             ));
         }
diff --git a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationsManager.php b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/IntegrationsManager.php
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function create(`
`100`	`100`	`/**`
`101`	`101`	`* Loads customer address model by identifier.`
`102`	`102`	`*`
`103`		`- * @param $addressId`
	`103`	`+ * @param int $addressId`
`104`	`104`	`* @return Address`
`105`	`105`	`*/`
`106`	`106`	`private function getAddress($addressId): Address`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function get($type) : DeferredShippingMethodChooserInterface`
`39`	`39`	`{`
`40`	`40`	`if (!isset($this->choosers[$type])) {`
`41`	`41`	`throw new \InvalidArgumentException(sprintf(`
`42`		`- 'Deferred shipping method chooser is not registered.',`
	`42`	`+ 'Deferred shipping method %s is not registered.',`
`43`	`43`	`$type`
`44`	`44`	`));`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ private function findIntegrations(int $storeId): array`
`146`	`146`	`* </instant_purchase>`
`147`	`147`	`*`
`148`	`148`	`* @param VaultPaymentInterface $paymentMethod`
`149`		`- * @param $storeId`
	`149`	`+ * @param int\|string\|null\|\Magento\Store\Model\Store $storeId`
`150`	`150`	`* @return bool`
`151`	`151`	`*/`
`152`	`152`	`private function isIntegrationAvailable(VaultPaymentInterface $paymentMethod, $storeId): bool`