class usage declaration with use block

Jan Polak · Jan Polak · commit 6e9cf9626dec · 2017-10-17T16:18:11.000+02:00
diff --git a/app/code/Magento/InstantPurchase/Controller/Button/PlaceOrder.php b/app/code/Magento/InstantPurchase/Controller/Button/PlaceOrder.php
@@ -6,6 +6,8 @@
 namespace Magento\InstantPurchase\Controller\Button;
 
 use Exception;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\Controller\Result\Json as JsonResult;
@@ -15,25 +17,29 @@
 use Magento\InstantPurchase\Model\CustomerDataGetter;
 use Magento\InstantPurchase\Model\CustomerDataGetterFactory;
 use Magento\InstantPurchase\Model\PlaceOrder as PlaceOrderModel;
+use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
+/**
+ * Class PlaceOrder
+ * @api
+ */
 class PlaceOrder extends \Magento\Framework\App\Action\Action
 {
-
     /**
      * @var StoreManagerInterface
      */
     private $storeManager;
     /**
-     * @var \Magento\Catalog\Api\ProductRepositoryInterface
+     * @var ProductRepositoryInterface
      */
     private $productRepository;
     /**
      * @var PlaceOrderModel
      */
     private $placeOrder;
     /**
-     * @var \Magento\Sales\Api\OrderRepositoryInterface
+     * @var OrderRepositoryInterface
      */
     private $orderRepository;
     /**
@@ -53,19 +59,19 @@ class PlaceOrder extends \Magento\Framework\App\Action\Action
      * PlaceOrder constructor.
      * @param Context $context
      * @param StoreManagerInterface $storeManager
-     * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+     * @param ProductRepositoryInterface $productRepository
      * @param PlaceOrderModel $placeOrder
-     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @param OrderRepositoryInterface $orderRepository
      * @param Session $customerSession
      * @param CustomerDataGetterFactory $customerData
      * @param Validator $formKeyValidator
      */
     public function __construct(
         Context $context,
         StoreManagerInterface $storeManager,
-        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
+        ProductRepositoryInterface $productRepository,
         PlaceOrderModel $placeOrder,
-        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        OrderRepositoryInterface $orderRepository,
         Session $customerSession,
         CustomerDataGetterFactory $customerData,
         Validator $formKeyValidator
@@ -105,7 +111,7 @@ public function execute()
     }
 
     /**
-     * @return \Magento\Catalog\Api\Data\ProductInterface
+     * @return ProductInterface
      * @throws NoSuchEntityException
      */
     private function initProduct()
diff --git a/app/code/Magento/InstantPurchase/Model/CheapestShippingRateChooserRule.php b/app/code/Magento/InstantPurchase/Model/CheapestShippingRateChooserRule.php
@@ -5,9 +5,6 @@
  */
 namespace Magento\InstantPurchase\Model;
 
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Quote\Model\Quote;
-
 class CheapestShippingRateChooserRule implements ShippingRateChooserRuleInterface
 {
     /**
diff --git a/app/code/Magento/InstantPurchase/Model/CustomerAddressesFormatter.php b/app/code/Magento/InstantPurchase/Model/CustomerAddressesFormatter.php
@@ -10,7 +10,6 @@
 
 /**
  * Class CustomerAddresses
- * @package Magento\InstantPurchase\Model
  */
 class CustomerAddressesFormatter
 {
diff --git a/app/code/Magento/InstantPurchase/Model/CustomerCardsFormatter.php b/app/code/Magento/InstantPurchase/Model/CustomerCardsFormatter.php
@@ -6,7 +6,12 @@
 namespace Magento\InstantPurchase\Model;
 
 use Magento\Customer\Model\Customer;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
 
+/**
+ * Class CustomerCardsFormatter
+ * @api
+ */
 class CustomerCardsFormatter
 {
     public static $baseCardTypes = [
@@ -53,10 +58,10 @@ public function getFormattedCards(Customer $customer): array
     }
 
     /**
-     * @param \Magento\Vault\Api\Data\PaymentTokenInterface $cc
+     * @param PaymentTokenInterface $cc
      * @return string
      */
-    private function formatCc(\Magento\Vault\Api\Data\PaymentTokenInterface $cc): string
+    private function formatCc(PaymentTokenInterface $cc): string
     {
         $details = json_decode($cc->getTokenDetails(), true);
         return sprintf(
diff --git a/app/code/Magento/InstantPurchase/Model/CustomerCreditCardManager.php b/app/code/Magento/InstantPurchase/Model/CustomerCreditCardManager.php
@@ -8,21 +8,29 @@
 use Exception;
 use Magento\Braintree\Gateway\Command\GetPaymentNonceCommand;
 use Magento\Braintree\Model\Ui\ConfigProvider as BrainTreeConfigProvider;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Intl\DateTimeFactory;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Api\PaymentTokenRepositoryInterface;
 
+/**
+ * Class CustomerCreditCardManager
+ * @api
+ */
 class CustomerCreditCardManager
 {
     /**
-     * @var \Magento\Vault\Api\PaymentTokenRepositoryInterface
+     * @var PaymentTokenRepositoryInterface
      */
     private $repository;
     /**
-     * @var \Magento\Framework\Api\FilterBuilder
+     * @var FilterBuilder
      */
     private $filterBuilder;
     /**
-     * @var \Magento\Framework\Api\SearchCriteriaBuilder
+     * @var SearchCriteriaBuilder
      */
     private $searchCriteriaBuilder;
     /**
@@ -36,16 +44,16 @@ class CustomerCreditCardManager
 
     /**
      * CustomerCreditCardManager constructor.
-     * @param \Magento\Vault\Api\PaymentTokenRepositoryInterface $repository
-     * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
-     * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param PaymentTokenRepositoryInterface $repository
+     * @param FilterBuilder $filterBuilder
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param DateTimeFactory $dateTimeFactory
      * @param GetPaymentNonceCommand $getNonce
      */
     public function __construct(
-        \Magento\Vault\Api\PaymentTokenRepositoryInterface $repository,
-        \Magento\Framework\Api\FilterBuilder $filterBuilder,
-        \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
+        PaymentTokenRepositoryInterface $repository,
+        FilterBuilder $filterBuilder,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
         DateTimeFactory $dateTimeFactory,
         GetPaymentNonceCommand $getNonce
     ) {
@@ -78,16 +86,16 @@ public function getCustomerCreditCard(string $customerId, string $cardId)
      */
     public function getVisibleAvailableTokens(string $customerId): array
     {
-        $customerFilter = $this->getFilter(\Magento\Vault\Api\Data\PaymentTokenInterface::CUSTOMER_ID, $customerId);
-        $visibleFilter = $this->getFilter(\Magento\Vault\Api\Data\PaymentTokenInterface::IS_VISIBLE, 1);
-        $isActiveFilter = $this->getFilter(\Magento\Vault\Api\Data\PaymentTokenInterface::IS_ACTIVE, 1);
+        $customerFilter = $this->getFilter(PaymentTokenInterface::CUSTOMER_ID, $customerId);
+        $visibleFilter = $this->getFilter(PaymentTokenInterface::IS_VISIBLE, 1);
+        $isActiveFilter = $this->getFilter(PaymentTokenInterface::IS_ACTIVE, 1);
         $isBrainTreeFilter = $this->getFilter(
-            \Magento\Vault\Api\Data\PaymentTokenInterface::PAYMENT_METHOD_CODE,
+            PaymentTokenInterface::PAYMENT_METHOD_CODE,
             BrainTreeConfigProvider::CODE
         );
 
         $expiresAtFilter = [
-            $this->filterBuilder->setField(\Magento\Vault\Api\Data\PaymentTokenInterface::EXPIRES_AT)
+            $this->filterBuilder->setField(PaymentTokenInterface::EXPIRES_AT)
                 ->setConditionType('gt')
                 ->setValue(
                     $this->dateTimeFactory->create(
diff --git a/app/code/Magento/InstantPurchase/Model/CustomerDataGetter.php b/app/code/Magento/InstantPurchase/Model/CustomerDataGetter.php
@@ -5,9 +5,15 @@
  */
 namespace Magento\InstantPurchase\Model;
 
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\Customer;
 use Magento\Framework\Exception\LocalizedException;
 
+/**
+ * Class CustomerDataGetter
+ * @api
+ */
 class CustomerDataGetter
 {
     /**
@@ -26,34 +32,34 @@ public function __construct(
     }
 
     /**
-     * @return \Magento\Customer\Api\Data\AddressInterface
+     * @return AddressInterface
      */
-    public function getDefaultBillingAddressDataModel(): \Magento\Customer\Api\Data\AddressInterface
+    public function getDefaultBillingAddressDataModel(): AddressInterface
     {
         return $this->getCustomer()->getDefaultBillingAddress()->getDataModel();
     }
 
     /**
-     * @return \Magento\Customer\Api\Data\AddressInterface
+     * @return AddressInterface
      */
-    public function getDefaultShippingAddressDataModel(): \Magento\Customer\Api\Data\AddressInterface
+    public function getDefaultShippingAddressDataModel(): AddressInterface
     {
         return $this->getCustomer()->getDefaultShippingAddress()->getDataModel();
     }
 
     /**
      * @param $addressId
-     * @return \Magento\Customer\Api\Data\AddressInterface
+     * @return AddressInterface
      */
     public function getShippingAddressDataModel($addressId)
     {
         return $this->getCustomer()->getAddressById($addressId)->getDataModel();
     }
 
     /**
-     * @return \Magento\Customer\Api\Data\CustomerInterface
+     * @return CustomerInterface
      */
-    public function getCustomerDataModel(): \Magento\Customer\Api\Data\CustomerInterface
+    public function getCustomerDataModel(): CustomerInterface
     {
         return $this->getCustomer()->getDataModel();
     }
diff --git a/app/code/Magento/InstantPurchase/Model/CustomerDataGetterFactory.php b/app/code/Magento/InstantPurchase/Model/CustomerDataGetterFactory.php
@@ -1,5 +1,8 @@
 <?php
-
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 namespace Magento\InstantPurchase\Model;
 
 use Magento\Customer\Model\Customer;
diff --git a/app/code/Magento/InstantPurchase/Model/PlaceOrder.php b/app/code/Magento/InstantPurchase/Model/PlaceOrder.php
@@ -11,6 +11,10 @@
 use Magento\Quote\Api\CartManagementInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
 
+/**
+ * Class PlaceOrder
+ * @api
+ */
 class PlaceOrder
 {
     /**
diff --git a/app/code/Magento/InstantPurchase/Test/Unit/Model/CheapestShippingRateChooserRuleTest.php b/app/code/Magento/InstantPurchase/Test/Unit/Model/CheapestShippingRateChooserRuleTest.php
@@ -6,10 +6,7 @@
 
 namespace Magento\InstantPurchase\Test\Unit\Model;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\InstantPurchase\Model\CheapestShippingRateChooserRule;
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\Quote\Address;
 use PHPUnit\Framework\TestCase;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
diff --git a/app/code/Magento/InstantPurchase/Test/Unit/Model/PaymentPreparerTest.php b/app/code/Magento/InstantPurchase/Test/Unit/Model/PaymentPreparerTest.php
@@ -7,7 +7,7 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\InstantPurchase\Model\CustomerCreditCardManager;
-use Magento\InstantPurchase\Model\QuotePreparer;
+use Magento\InstantPurchase\Model\PaymentPreparer;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Payment;
 use Magento\Quote\Model\QuoteFactory;
@@ -29,9 +29,9 @@ class PaymentPreparerTest extends TestCase
      */
     private $customerCreditCardManager;
     /**
-     * @var QuotePreparer
+     * @var PaymentPreparer
      */
-    private $prepareQuote;
+    private $paymentPreparer;
 
     public function setUp()
     {
@@ -46,8 +46,8 @@ public function setUp()
 
         $this->customerCreditCardManager = $this->createMock(CustomerCreditCardManager::class);
 
-        $this->prepareQuote = $objectManager->getObject(
-            QuotePreparer::class,
+        $this->paymentPreparer = $objectManager->getObject(
+            PaymentPreparer::class,
             [
                 'quoteFactory' => $this->quoteFactory,
                 'customerCreditCardManager' => $this->customerCreditCardManager
@@ -89,7 +89,7 @@ public function testPreparePayment()
             ->with($customerId, $publicHash)
             ->willReturn($paymentAdditionalInformation);
         $this->quote->expects($this->once())->method('collectTotals');
-        $this->prepareQuote->preparePayment($this->quote, $customerId, $ccId);
+        $this->paymentPreparer->prepare($this->quote, $customerId, $ccId);
 
         $this->assertArraySubset($paymentAdditionalInformation, $payment->getAdditionalInformation());
     }
diff --git a/app/code/Magento/InstantPurchase/Test/Unit/Model/RateCheckTest.php b/app/code/Magento/InstantPurchase/Test/Unit/Model/RateCheckTest.php
@@ -12,6 +12,7 @@
 use Magento\Quote\Model\Quote\Address\RateCollectorInterfaceFactory;
 use Magento\Quote\Model\Quote\Address\RateRequest;
 use Magento\Quote\Model\Quote\Address\RateRequestFactory;
+use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\TestCase;
@@ -54,7 +55,7 @@ public function setUp()
 
         $storeManager = $this->createMock(StoreManagerInterface::class);
         $this->store = $this->createMock(Store::class);
-        $this->website = $this->createMock(\Magento\Store\Api\Data\WebsiteInterface::class);
+        $this->website = $this->createMock(WebsiteInterface::class);
 
         $storeManager->method('getStore')->willReturn($this->store);
         $storeManager->method('getWebsite')->willReturn($this->website);

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,6 @@`
`5`	`5`	`*/`
`6`	`6`	`namespace Magento\InstantPurchase\Model;`
`7`	`7`
`8`		`-use Magento\Framework\Exception\LocalizedException;`
`9`		`-use Magento\Quote\Model\Quote;`
`10`		`-`
`11`	`8`	`class CheapestShippingRateChooserRule implements ShippingRateChooserRuleInterface`
`12`	`9`	`{`
`13`	`10`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`
`11`	`11`	`/**`
`12`	`12`	`* Class CustomerAddresses`
`13`		`- * @package Magento\InstantPurchase\Model`
`14`	`13`	`*/`
`15`	`14`	`class CustomerAddressesFormatter`
`16`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,15 @@`
`5`	`5`	`*/`
`6`	`6`	`namespace Magento\InstantPurchase\Model;`
`7`	`7`
	`8`	`+use Magento\Customer\Api\Data\AddressInterface;`
	`9`	`+use Magento\Customer\Api\Data\CustomerInterface;`
`8`	`10`	`use Magento\Customer\Model\Customer;`
`9`	`11`	`use Magento\Framework\Exception\LocalizedException;`
`10`	`12`
	`13`	`+/**`
	`14`	`+ * Class CustomerDataGetter`
	`15`	`+ * @api`
	`16`	`+ */`
`11`	`17`	`class CustomerDataGetter`
`12`	`18`	`{`
`13`	`19`	`/**`
`@@ -26,34 +32,34 @@ public function __construct(`
`26`	`32`	`}`
`27`	`33`
`28`	`34`	`/**`
`29`		`- * @return \Magento\Customer\Api\Data\AddressInterface`
	`35`	`+ * @return AddressInterface`
`30`	`36`	`*/`
`31`		`- public function getDefaultBillingAddressDataModel(): \Magento\Customer\Api\Data\AddressInterface`
	`37`	`+ public function getDefaultBillingAddressDataModel(): AddressInterface`
`32`	`38`	`{`
`33`	`39`	`return $this->getCustomer()->getDefaultBillingAddress()->getDataModel();`
`34`	`40`	`}`
`35`	`41`
`36`	`42`	`/**`
`37`		`- * @return \Magento\Customer\Api\Data\AddressInterface`
	`43`	`+ * @return AddressInterface`
`38`	`44`	`*/`
`39`		`- public function getDefaultShippingAddressDataModel(): \Magento\Customer\Api\Data\AddressInterface`
	`45`	`+ public function getDefaultShippingAddressDataModel(): AddressInterface`
`40`	`46`	`{`
`41`	`47`	`return $this->getCustomer()->getDefaultShippingAddress()->getDataModel();`
`42`	`48`	`}`
`43`	`49`
`44`	`50`	`/**`
`45`	`51`	`* @param $addressId`
`46`		`- * @return \Magento\Customer\Api\Data\AddressInterface`
	`52`	`+ * @return AddressInterface`
`47`	`53`	`*/`
`48`	`54`	`public function getShippingAddressDataModel($addressId)`
`49`	`55`	`{`
`50`	`56`	`return $this->getCustomer()->getAddressById($addressId)->getDataModel();`
`51`	`57`	`}`
`52`	`58`
`53`	`59`	`/**`
`54`		`- * @return \Magento\Customer\Api\Data\CustomerInterface`
	`60`	`+ * @return CustomerInterface`
`55`	`61`	`*/`
`56`		`- public function getCustomerDataModel(): \Magento\Customer\Api\Data\CustomerInterface`
	`62`	`+ public function getCustomerDataModel(): CustomerInterface`
`57`	`63`	`{`
`58`	`64`	`return $this->getCustomer()->getDataModel();`
`59`	`65`	`}`