Skip to content

Commit 89bb27d

Browse files
author
Prabhu Ram
committed
Merge remote-tracking branch 'origin/MC-37582' into 2.4-develop
2 parents 677aad1 + bcaa456 commit 89bb27d

File tree

2 files changed

+23
-12
lines changed

2 files changed

+23
-12
lines changed

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
use Magento\Catalog\Api\ProductRepositoryInterface;
1212
use Magento\Catalog\Model\CategoryRepository;
1313
use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
14+
use Magento\Framework\App\ResourceConnection;
1415
use Magento\Framework\EntityManager\MetadataPool;
1516
use Magento\Store\Model\Store;
1617
use Magento\Store\Model\StoreManagerInterface;
18+
use Magento\TestFramework\Helper\Bootstrap;
1719
use Magento\TestFramework\ObjectManager;
1820
use Magento\TestFramework\TestCase\GraphQlAbstract;
1921

@@ -564,10 +566,12 @@ public function testCategoryImage(?string $imagePrefix)
564566
->addAttributeToFilter('name', ['eq' => 'Parent Image Category'])
565567
->getFirstItem();
566568
$categoryId = $categoryModel->getId();
569+
/** @var ResourceConnection $resourceConnection */
570+
$resourceConnection = Bootstrap::getObjectManager()->create(ResourceConnection::class);
571+
$connection = $resourceConnection->getConnection();
567572

568573
if ($imagePrefix !== null) {
569574
// update image to account for different stored image formats
570-
$connection = $categoryCollection->getConnection();
571575
$productLinkField = $this->metadataPool
572576
->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
573577
->getLinkField();
@@ -577,20 +581,20 @@ public function testCategoryImage(?string $imagePrefix)
577581
$imageAttributeValue = $imagePrefix . basename($categoryModel->getImage());
578582

579583
if (!empty($imageAttributeValue)) {
580-
$query = sprintf(
584+
$sqlQuery = sprintf(
581585
'UPDATE %s SET `value` = "%s" ' .
582586
'WHERE `%s` = %d ' .
583587
'AND `store_id`= %d ' .
584588
'AND `attribute_id` = ' .
585589
'(SELECT `ea`.`attribute_id` FROM %s ea WHERE `ea`.`attribute_code` = "image" LIMIT 1)',
586-
$connection->getTableName('catalog_category_entity_varchar'),
590+
$resourceConnection->getTableName('catalog_category_entity_varchar'),
587591
$imageAttributeValue,
588592
$productLinkField,
589593
$categoryModel->getData($productLinkField),
590594
$defaultStoreId,
591-
$connection->getTableName('eav_attribute')
595+
$resourceConnection->getTableName('eav_attribute')
592596
);
593-
$connection->query($query);
597+
$connection->query($sqlQuery);
594598
}
595599
}
596600

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,20 @@
1212
use Magento\Catalog\Api\ProductRepositoryInterface;
1313
use Magento\Catalog\Model\CategoryRepository;
1414
use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
15+
use Magento\Framework\App\ResourceConnection;
1516
use Magento\Framework\DataObject;
1617
use Magento\Framework\EntityManager\MetadataPool;
1718
use Magento\Store\Model\Store;
1819
use Magento\Store\Model\StoreManagerInterface;
20+
use Magento\TestFramework\Helper\Bootstrap;
1921
use Magento\TestFramework\ObjectManager;
2022
use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
2123
use Magento\TestFramework\TestCase\GraphQlAbstract;
2224

2325
/**
2426
* Test loading of category tree
27+
*
28+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2529
*/
2630
class CategoryTest extends GraphQlAbstract
2731
{
@@ -47,7 +51,7 @@ class CategoryTest extends GraphQlAbstract
4751

4852
protected function setUp(): void
4953
{
50-
$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
54+
$this->objectManager = Bootstrap::getObjectManager();
5155
$this->categoryRepository = $this->objectManager->get(CategoryRepository::class);
5256
$this->store = $this->objectManager->get(Store::class);
5357
$this->metadataPool = $this->objectManager->get(MetadataPool::class);
@@ -587,9 +591,12 @@ public function testCategoryImage(?string $imagePrefix)
587591
->getFirstItem();
588592
$categoryId = $categoryModel->getId();
589593

594+
/** @var ResourceConnection $resourceConnection */
595+
$resourceConnection = Bootstrap::getObjectManager()->create(ResourceConnection::class);
596+
$connection = $resourceConnection->getConnection();
597+
590598
if ($imagePrefix !== null) {
591-
// update image to account for different stored image formats
592-
$connection = $categoryCollection->getConnection();
599+
// update image to account for different stored image format
593600
$productLinkField = $this->metadataPool
594601
->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
595602
->getLinkField();
@@ -599,20 +606,20 @@ public function testCategoryImage(?string $imagePrefix)
599606
$imageAttributeValue = $imagePrefix . basename($categoryModel->getImage());
600607

601608
if (!empty($imageAttributeValue)) {
602-
$query = sprintf(
609+
$sqlQuery = sprintf(
603610
'UPDATE %s SET `value` = "%s" ' .
604611
'WHERE `%s` = %d ' .
605612
'AND `store_id`= %d ' .
606613
'AND `attribute_id` = ' .
607614
'(SELECT `ea`.`attribute_id` FROM %s ea WHERE `ea`.`attribute_code` = "image" LIMIT 1)',
608-
$connection->getTableName('catalog_category_entity_varchar'),
615+
$resourceConnection->getTableName('catalog_category_entity_varchar'),
609616
$imageAttributeValue,
610617
$productLinkField,
611618
$categoryModel->getData($productLinkField),
612619
$defaultStoreId,
613-
$connection->getTableName('eav_attribute')
620+
$resourceConnection->getTableName('eav_attribute')
614621
);
615-
$connection->query($query);
622+
$connection->query($sqlQuery);
616623
}
617624
}
618625

0 commit comments

Comments
 (0)