Skip to content

Commit 566ca89

Browse files
committed
Fixes incorrect classes being referenced in Magento modules.
1 parent 29cd372 commit 566ca89

File tree

10 files changed

+15
-13
lines changed

10 files changed

+15
-13
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ private function getCollectionProcessor()
813813
{
814814
if (!$this->collectionProcessor) {
815815
$this->collectionProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(
816-
// phpstan:ignore "Class Magento\Catalog\Model\Api\SearchCriteria\ProductCollectionProcessor not found."
816+
// @phpstan-ignore-next-line - this is a virtual type defined in di.xml
817817
\Magento\Catalog\Model\Api\SearchCriteria\ProductCollectionProcessor::class
818818
);
819819
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
use Magento\Catalog\Api\Data\ProductInterface;
1414
use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
15-
use Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement;
1615
use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock;
1716
use Magento\Framework\App\ResourceConnection;
1817
use Magento\CatalogInventory\Model\ResourceModel\Indexer\StockFactory;
@@ -125,7 +124,7 @@ public function __construct(
125124
$this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
126125
$this->batchProvider = $batchProvider ?: ObjectManager::getInstance()->get(BatchProviderInterface::class);
127126
$this->batchSizeManagement = $batchSizeManagement ?: ObjectManager::getInstance()->get(
128-
BatchSizeManagement::class
127+
BatchSizeManagementInterface::class
129128
);
130129
$this->batchRowsCount = $batchRowsCount;
131130
$this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public function __construct(
129129
$this->priceCurrency = $priceCurrency;
130130
$this->entityManager = $entityManager ?? ObjectManager::getInstance()->get(EntityManager::class);
131131
$this->_associatedEntitiesMap = $associatedEntityMap ?? ObjectManager::getInstance()
132-
// phpstan:ignore this is a virtual class
132+
// @phpstan-ignore-next-line - this is a virtual type defined in di.xml
133133
->get(\Magento\CatalogRule\Model\ResourceModel\Rule\AssociatedEntityMap::class)
134134
->getData();
135135
parent::__construct($context, $connectionName);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ private function getAssociatedEntitiesMap()
164164
{
165165
if (!$this->_associatedEntitiesMap) {
166166
$this->_associatedEntitiesMap = \Magento\Framework\App\ObjectManager::getInstance()
167-
// phpstan:ignore
167+
// @phpstan-ignore-next-line - this is a virtual type defined in di.xml
168168
->get(\Magento\CatalogRule\Model\ResourceModel\Rule\AssociatedEntityMap::class)
169169
->getData();
170170
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,8 @@ public function deleteById($pageId)
289289
private function getCollectionProcessor()
290290
{
291291
if (!$this->collectionProcessor) {
292-
// phpstan:ignore "Class Magento\Cms\Model\Api\SearchCriteria\PageCollectionProcessor not found."
293-
$this->collectionProcessor = ObjectManager::getInstance()
294-
->get(PageCollectionProcessor::class);
292+
// @phpstan-ignore-next-line - this is a virtual type defined in di.xml
293+
$this->collectionProcessor = ObjectManager::getInstance()->get(PageCollectionProcessor::class);
295294
}
296295
return $this->collectionProcessor;
297296
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,13 @@ public function execute(EventObserver $observer)
5757
SmartButton::class => PaypalConfig::METHOD_WPS_EXPRESS,
5858
\Magento\Paypal\Block\Express\Shortcut::class => PaypalConfig::METHOD_WPP_EXPRESS,
5959
\Magento\Paypal\Block\Bml\Shortcut::class => PaypalConfig::METHOD_WPP_EXPRESS,
60+
// @phpstan-ignore-next-line - this is a virtual type defined in di.xml
6061
\Magento\Paypal\Block\WpsExpress\Shortcut::class => PaypalConfig::METHOD_WPS_EXPRESS,
62+
// @phpstan-ignore-next-line - this is a virtual type defined in di.xml
6163
\Magento\Paypal\Block\WpsBml\Shortcut::class => PaypalConfig::METHOD_WPS_EXPRESS,
64+
// @phpstan-ignore-next-line - this is a virtual type defined in di.xml
6265
\Magento\Paypal\Block\PayflowExpress\Shortcut::class => PaypalConfig::METHOD_WPP_PE_EXPRESS,
66+
// @phpstan-ignore-next-line - this is a virtual type defined in di.xml
6367
\Magento\Paypal\Block\Payflow\Bml\Shortcut::class => PaypalConfig::METHOD_WPP_PE_EXPRESS
6468
];
6569
foreach ($blocks as $blockInstanceName => $paymentMethodCode) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function execute()
7373
$fileContent = ['type' => 'string', 'value' => $pdf->render(), 'rm' => true];
7474

7575
return $this->_fileFactory->create(
76-
\creditmemo::class . $date . '.pdf',
76+
'creditmemo' . $date . '.pdf',
7777
$fileContent,
7878
DirectoryList::VAR_DIR,
7979
'application/pdf'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class ReorderTest extends TestCase
3131
protected $scopeConfigMock;
3232

3333
/**
34-
* @var MockObject|\Magento\Sales\Model\Store
34+
* @var MockObject|\Magento\Store\Model\Store
3535
*/
3636
protected $storeParam;
3737

@@ -78,7 +78,7 @@ protected function setUp(): void
7878
$this->repositoryMock
7979
);
8080

81-
$this->storeParam = $this->getMockBuilder(\Magento\Sales\Model\Store::class)
81+
$this->storeParam = $this->getMockBuilder(\Magento\Store\Model\Store::class)
8282
->disableOriginalConstructor()
8383
->getMock();
8484

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function __construct(
8484
$this->string = $string;
8585
$this->_resourceCoupon = $resourceCoupon;
8686
$associatedEntitiesMapInstance = $associatedEntityMapInstance ?: ObjectManager::getInstance()->get(
87-
// phpstan:ignore "Class Magento\SalesRule\Model\ResourceModel\Rule\AssociatedEntityMap not found."
87+
// @phpstan-ignore-next-line - this is a virtual type defined in di.xml
8888
\Magento\SalesRule\Model\ResourceModel\Rule\AssociatedEntityMap::class
8989
);
9090
$this->_associatedEntitiesMap = $associatedEntitiesMapInstance->getData();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ private function getAssociatedEntitiesMap()
463463
{
464464
if (!$this->_associatedEntitiesMap) {
465465
$this->_associatedEntitiesMap = \Magento\Framework\App\ObjectManager::getInstance()
466-
// phpstan:ignore "Class Magento\SalesRule\Model\ResourceModel\Rule\AssociatedEntityMap not found."
466+
// @phpstan-ignore-next-line - this is a virtual type defined in di.xml
467467
->get(\Magento\SalesRule\Model\ResourceModel\Rule\AssociatedEntityMap::class)
468468
->getData();
469469
}

0 commit comments

Comments
 (0)