Skip to content

Commit 5478082

Browse files
committed
ACP2E-2300: fix static errors
1 parent 39d66a0 commit 5478082

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Category.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ public function __construct(
7171
$this->_categoryResource = $categoryResource;
7272
parent::__construct($context, $connectionName);
7373
$this->metadataPool = $metadataPool;
74-
$this->categorySelectBuilder = $selectWrapper ?? ObjectManager::getInstance()->get(CategorySelectBuilder::class);
74+
$this->categorySelectBuilder = $selectWrapper ??
75+
ObjectManager::getInstance()->get(CategorySelectBuilder::class);
7576
}
7677

7778
/**

app/code/Magento/Sitemap/Model/ResourceModel/Catalog/CategorySelectBuilder.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@
2323

2424
class CategorySelectBuilder
2525
{
26+
/**
27+
* @param ResourceConnection $resource
28+
*/
2629
public function __construct(
2730
private readonly ResourceConnection $resource
2831
) {
29-
3032
}
3133

3234
/**

app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
2121
{
22-
const NOT_SELECTED_IMAGE = 'no_selection';
22+
public const NOT_SELECTED_IMAGE = 'no_selection';
2323

2424
/**
2525
* Collection Zend Db select
@@ -42,8 +42,6 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
4242
protected $mediaGalleryReadHandler;
4343

4444
/**
45-
* Sitemap data
46-
*
4745
* @var \Magento\Sitemap\Helper\Data
4846
*/
4947
protected $_sitemapData = null;
@@ -77,6 +75,7 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
7775
/**
7876
* @var \Magento\Catalog\Model\Product\Media\Config
7977
* @deprecated 100.2.0 unused
78+
* @see getProductImageUrl
8079
*/
8180
protected $_mediaConfig;
8281

@@ -137,7 +136,8 @@ public function __construct(
137136
$this->_mediaConfig = $mediaConfig;
138137
$this->_sitemapData = $sitemapData;
139138
$this->imageUrlBuilder = $urlBuilder ?? ObjectManager::getInstance()->get(UrlBuilder::class);
140-
$this->productSelectBuilder = $productSelectBuilder ?? ObjectManager::getInstance()->get(ProductSelectBuilder::class);
139+
$this->productSelectBuilder = $productSelectBuilder ??
140+
ObjectManager::getInstance()->get(ProductSelectBuilder::class);
141141

142142
parent::__construct($context, $connectionName);
143143
}

app/code/Magento/Sitemap/Model/ResourceModel/Catalog/ProductSelectBuilder.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@
2424

2525
class ProductSelectBuilder
2626
{
27+
/**
28+
* @param ResourceConnection $resource
29+
*/
2730
public function __construct(
2831
private readonly ResourceConnection $resource
2932
) {
30-
3133
}
3234

3335
/**

0 commit comments

Comments
 (0)