Merge remote-tracking branch '38951/cleanup-some-non-existing-classes-from-magento-modules' into augcommpr

Author: Indrani Sonawane

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -813,7 +813,7 @@ private function getCollectionProcessor()
     {
         if (!$this->collectionProcessor) {
             $this->collectionProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                // phpstan:ignore "Class Magento\Catalog\Model\Api\SearchCriteria\ProductCollectionProcessor not found."
+                // @phpstan-ignore-next-line - this is a virtual type defined in di.xml
                 \Magento\Catalog\Model\Api\SearchCriteria\ProductCollectionProcessor::class
             );
         }

app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -11,25 +9,24 @@
 namespace Magento\CatalogInventory\Model\Indexer\Stock\Action;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product\Type as ProductType;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
-use Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement;
+use Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction;
+use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
 use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock;
-use Magento\Framework\App\ResourceConnection;
+use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\StockInterface;
 use Magento\CatalogInventory\Model\ResourceModel\Indexer\StockFactory;
-use Magento\Catalog\Model\Product\Type as ProductType;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Query\BatchIteratorInterface;
 use Magento\Framework\DB\Query\Generator as QueryGenerator;
-use Magento\Framework\Indexer\CacheContext;
-use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\Indexer\BatchSizeManagementInterface;
-use Magento\Framework\Indexer\BatchProviderInterface;
-use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction;
-use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\StockInterface;
-use Magento\Framework\App\DeploymentConfig;
-use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
+use Magento\Framework\Indexer\BatchProviderInterface;
+use Magento\Framework\Indexer\BatchSizeManagementInterface;
+use Magento\Framework\Indexer\CacheContext;
 
 /**
  * Class Full reindex action
@@ -41,7 +38,7 @@ class Full extends AbstractAction
     /**
      * Action type representation
      */
-    const ACTION_TYPE = 'full';
+    public const ACTION_TYPE = 'full';
 
     /**
      * @var MetadataPool
@@ -125,7 +122,7 @@ public function __construct(
         $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
         $this->batchProvider = $batchProvider ?: ObjectManager::getInstance()->get(BatchProviderInterface::class);
         $this->batchSizeManagement = $batchSizeManagement ?: ObjectManager::getInstance()->get(
-            BatchSizeManagement::class
+            BatchSizeManagementInterface::class
         );
         $this->batchRowsCount = $batchRowsCount;
         $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()
@@ -151,6 +148,7 @@ public function execute($ids = null): void
             $entityMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
 
             $columns = array_keys($this->_getConnection()->describeTable($this->_getIdxTable()));
+            $indexerTables = [];
 
             /** @var DefaultStock $indexer */
             foreach ($this->_getTypeIndexers() as $indexer) {
@@ -165,7 +163,7 @@ public function execute($ids = null): void
                     )
                 );
 
-                if (is_null($batchRowCount)) {
+                if ($batchRowCount === null) {
                     $batchRowCount = isset($this->batchRowsCount[$indexer->getTypeId()])
                         ? $this->batchRowsCount[$indexer->getTypeId()]
                         : $this->batchRowsCount['default'];
@@ -202,8 +200,12 @@ public function execute($ids = null): void
                         $connection->query($query);
                     }
                 }
+
+                $indexerTables[] = $indexer->getMainTable();
             }
-            $this->activeTableSwitcher->switchTable($indexer->getConnection(), [$indexer->getMainTable()]);
+
+            $indexerTables = array_unique($indexerTables);
+            $this->activeTableSwitcher->switchTable($this->_getConnection(), $indexerTables);
         } catch (\Exception $e) {
             throw new LocalizedException(__($e->getMessage()), $e);
         }

app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php

@@ -129,9 +129,10 @@ public function __construct(
         $this->priceCurrency = $priceCurrency;
         $this->entityManager = $entityManager ?? ObjectManager::getInstance()->get(EntityManager::class);
         $this->_associatedEntitiesMap = $associatedEntityMap ?? ObjectManager::getInstance()
-            // phpstan:ignore this is a virtual class
+            // @phpstan-ignore-next-line - this is a virtual type defined in di.xml
             ->get(\Magento\CatalogRule\Model\ResourceModel\Rule\AssociatedEntityMap::class)
             ->getData();
+
         parent::__construct($context, $connectionName);
     }
 
@@ -216,12 +217,8 @@ public function getRulesFromProduct($date, $websiteId, $customerGroupId, $produc
     }
 
     /**
-     * Load an object
+     * @inheritDoc
      *
-     * @param \Magento\Framework\Model\AbstractModel $object
-     * @param mixed $value
-     * @param string $field
-     * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function load(\Magento\Framework\Model\AbstractModel $object, $value, $field = null)

app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Collection.php

@@ -159,12 +159,13 @@ public function addCustomerGroupFilter($customerGroupId)
      *
      * @return array
      * @deprecated 100.1.0
+     * @see https://github.com/magento/magento2/commit/d063251cf0ce6717795fdb646a534cc0c2b22c05
      */
     private function getAssociatedEntitiesMap()
     {
         if (!$this->_associatedEntitiesMap) {
             $this->_associatedEntitiesMap = \Magento\Framework\App\ObjectManager::getInstance()
-                // phpstan:ignore
+                // @phpstan-ignore-next-line - this is a virtual type defined in di.xml
                 ->get(\Magento\CatalogRule\Model\ResourceModel\Rule\AssociatedEntityMap::class)
                 ->getData();
         }

app/code/Magento/Cms/Model/PageRepository.php

@@ -285,13 +285,13 @@ public function deleteById($pageId)
      *
      * @deprecated 102.0.0
      * @return CollectionProcessorInterface
+     * @see https://github.com/magento/magento2/commit/eacac63d35b97961e3304dc007cd6b78519a93d0
      */
     private function getCollectionProcessor()
     {
         if (!$this->collectionProcessor) {
-            // phpstan:ignore "Class Magento\Cms\Model\Api\SearchCriteria\PageCollectionProcessor not found."
-            $this->collectionProcessor = ObjectManager::getInstance()
-                ->get(PageCollectionProcessor::class);
+            // @phpstan-ignore-next-line - this is a virtual type defined in di.xml
+            $this->collectionProcessor = ObjectManager::getInstance()->get(PageCollectionProcessor::class);
         }
         return $this->collectionProcessor;
     }

app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php

@@ -57,9 +57,13 @@ public function execute(EventObserver $observer)
             SmartButton::class => PaypalConfig::METHOD_WPS_EXPRESS,
             \Magento\Paypal\Block\Express\Shortcut::class => PaypalConfig::METHOD_WPP_EXPRESS,
             \Magento\Paypal\Block\Bml\Shortcut::class => PaypalConfig::METHOD_WPP_EXPRESS,
+            // @phpstan-ignore-next-line - this is a virtual type defined in di.xml
             \Magento\Paypal\Block\WpsExpress\Shortcut::class => PaypalConfig::METHOD_WPS_EXPRESS,
+            // @phpstan-ignore-next-line - this is a virtual type defined in di.xml
             \Magento\Paypal\Block\WpsBml\Shortcut::class => PaypalConfig::METHOD_WPS_EXPRESS,
+            // @phpstan-ignore-next-line - this is a virtual type defined in di.xml
             \Magento\Paypal\Block\PayflowExpress\Shortcut::class => PaypalConfig::METHOD_WPP_PE_EXPRESS,
+            // @phpstan-ignore-next-line - this is a virtual type defined in di.xml
             \Magento\Paypal\Block\Payflow\Bml\Shortcut::class => PaypalConfig::METHOD_WPP_PE_EXPRESS
         ];
         foreach ($blocks as $blockInstanceName => $paymentMethodCode) {

app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php

@@ -5,18 +5,19 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo;
 
-use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
 
-class PrintAction extends \Magento\Backend\App\Action
+class PrintAction extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Sales::sales_creditmemo';
+    public const ADMIN_RESOURCE = 'Magento_Sales::sales_creditmemo';
 
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
@@ -52,6 +53,8 @@ public function __construct(
     }
 
     /**
+     * Execute action based on request and return result
+     *
      * @return ResponseInterface|\Magento\Backend\Model\View\Result\Forward
      * @throws \Exception
      */
@@ -73,7 +76,7 @@ public function execute()
                 $fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
 
                 return $this->_fileFactory->create(
-                    \creditmemo::class . $date . '.pdf',
+                    'creditmemo' . $date . '.pdf',
                     $fileContent,
                     DirectoryList::VAR_DIR,
                     'application/pdf'

app/code/Magento/Sales/Test/Unit/Helper/ReorderTest.php

@@ -31,7 +31,7 @@ class ReorderTest extends TestCase
     protected $scopeConfigMock;
 
     /**
-     * @var MockObject|\Magento\Sales\Model\Store
+     * @var MockObject|\Magento\Store\Model\Store
      */
     protected $storeParam;
 
@@ -78,7 +78,7 @@ protected function setUp(): void
             $this->repositoryMock
         );
 
-        $this->storeParam = $this->getMockBuilder(\Magento\Sales\Model\Store::class)
+        $this->storeParam = $this->getMockBuilder(\Magento\Store\Model\Store::class)
             ->disableOriginalConstructor()
             ->getMock();
 

app/code/Magento/SalesRule/Model/ResourceModel/Rule.php

@@ -84,7 +84,7 @@ public function __construct(
         $this->string = $string;
         $this->_resourceCoupon = $resourceCoupon;
         $associatedEntitiesMapInstance = $associatedEntityMapInstance ?: ObjectManager::getInstance()->get(
-            // phpstan:ignore "Class Magento\SalesRule\Model\ResourceModel\Rule\AssociatedEntityMap not found."
+            // @phpstan-ignore-next-line - this is a virtual type defined in di.xml
             \Magento\SalesRule\Model\ResourceModel\Rule\AssociatedEntityMap::class
         );
         $this->_associatedEntitiesMap = $associatedEntitiesMapInstance->getData();

app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php

@@ -463,7 +463,7 @@ private function getAssociatedEntitiesMap()
     {
         if (!$this->_associatedEntitiesMap) {
             $this->_associatedEntitiesMap = \Magento\Framework\App\ObjectManager::getInstance()
-                // phpstan:ignore "Class Magento\SalesRule\Model\ResourceModel\Rule\AssociatedEntityMap not found."
+                // @phpstan-ignore-next-line - this is a virtual type defined in di.xml
                 ->get(\Magento\SalesRule\Model\ResourceModel\Rule\AssociatedEntityMap::class)
                 ->getData();
         }