#27500 Fix static checks

magento · Apr 12, 2020 · 35664d5 · 35664d5
1 parent 5eb9681
commit 35664d5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Export/AddressTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Export/AddressTest.php
@@ -28,6 +28,7 @@
 use Magento\ImportExport\Model\ResourceModel\CollectionByPagesIteratorFactory;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManager;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -204,7 +205,7 @@ protected function _getModelDependencies()
      */
     public function getWebsites($withDefault = false)
     {
-        $websites = [];
+        $websites = $this->_websites;
         if (!$withDefault) {
             unset($websites[0]);
         }
@@ -241,7 +242,7 @@ public function iterate(AbstractDb $collection, $pageSize, array $callbacks)
             $this->createMock(GroupFactory::class),
             $this->createMock(\Magento\Customer\Model\AttributeFactory::class),
         ];
-        /** @var $customer \Magento\Customer\Model\Customer|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $customer \Magento\Customer\Model\Customer|MockObject */
         $customer = $this->_objectManager->getObject(\Magento\Customer\Model\Customer::class, $arguments);
 
         foreach ($callbacks as $callback) {

diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Export/CustomerTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Export/CustomerTest.php
@@ -159,7 +159,7 @@ protected function _getModelDependencies()
      */
     public function getWebsites($withDefault = false)
     {
-        $websites = [];
+        $websites = $this->_websites;
         if (!$withDefault) {
             unset($websites[0]);
         }
@@ -182,7 +182,7 @@ public function getWebsites($withDefault = false)
      */
     public function getStores($withDefault = false)
     {
-        $stores = [];
+        $stores = $this->_websites;
         if (!$withDefault) {
             unset($stores[0]);
         }

diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/AddressTest.php
@@ -139,8 +139,7 @@ class AddressTest extends TestCase
     protected $_objectManagerMock;
 
     /**
-     * @var ProcessingErrorAggregatorInterface
-     * |\PHPUnit_Framework_MockObject_MockObject
+     * @var ProcessingErrorAggregatorInterface|MockObject
      */
     protected $errorAggregator;
 
@@ -279,7 +278,7 @@ protected function _createAttrCollectionMock()
      */
     protected function _createCustomerStorageMock()
     {
-        /** @var $customerStorage Storage|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $customerStorage Storage|MockObject */
         $customerStorage = $this->createMock(Storage::class);
         $customerStorage->expects($this->any())
             ->method('getCustomerId')

diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php
@@ -92,8 +92,7 @@ class CustomerCompositeTest extends TestCase
     protected $_scopeConfigMock;
 
     /**
-     * @var ProcessingErrorAggregatorInterface
-     * |\PHPUnit_Framework_MockObject_MockObject
+     * @var ProcessingErrorAggregatorInterface|MockObject
      */
     protected $errorAggregator;
 
@@ -103,14 +102,12 @@ class CustomerCompositeTest extends TestCase
     protected $error;
 
     /**
-     * @var ProcessingErrorFactory
-     * |\PHPUnit_Framework_MockObject_MockObject
+     * @var ProcessingErrorFactory|MockObject
      */
     protected $errorFactory;
 
     /**
-     * @var Processor
-     * |\PHPUnit\Framework\MockObject\MockObject
+     * @var Processor|MockObject
      */
     private $indexerProcessor;