Skip to content

Commit 87ececa

Browse files
author
Serhiy Shkolyarenko
committed
MAGETWO-41527: PHP 7 namespace strict compatibility
fixed references to resource models
1 parent c9102ea commit 87ececa

File tree

18 files changed

+101
-101
lines changed

18 files changed

+101
-101
lines changed

‎app/code/Magento/SampleData/Module/Catalog/Setup/Attribute.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
class Attribute implements SetupInterface
1919
{
2020
/**
21-
* @var \Magento\Catalog\Model\Resource\Eav\AttributeFactory
21+
* @var \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory
2222
*/
2323
protected $attributeFactory;
2424

@@ -28,7 +28,7 @@ class Attribute implements SetupInterface
2828
protected $attributeSetFactory;
2929

3030
/**
31-
* @var \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory
31+
* @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory
3232
*/
3333
protected $attrOptionCollectionFactory;
3434

@@ -73,9 +73,9 @@ class Attribute implements SetupInterface
7373
protected $storeManager;
7474

7575
/**
76-
* @param \Magento\Catalog\Model\Resource\Eav\AttributeFactory $attributeFactory
76+
* @param \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory $attributeFactory
7777
* @param \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory
78-
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
78+
* @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
7979
* @param \Magento\Catalog\Helper\Product $productHelper
8080
* @param \Magento\Eav\Model\Config $eavConfig
8181
* @param \Magento\Framework\Module\ModuleListInterface $moduleList
@@ -86,9 +86,9 @@ class Attribute implements SetupInterface
8686
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
8787
*/
8888
public function __construct(
89-
\Magento\Catalog\Model\Resource\Eav\AttributeFactory $attributeFactory,
89+
\Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory $attributeFactory,
9090
\Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory,
91-
\Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
91+
\Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
9292
\Magento\Catalog\Helper\Product $productHelper,
9393
\Magento\Eav\Model\Config $eavConfig,
9494
\Magento\Framework\Module\ModuleListInterface $moduleList,
@@ -127,7 +127,7 @@ public function run()
127127
foreach ($csvReader as $data) {
128128
$data['attribute_set'] = explode("\n", $data['attribute_set']);
129129

130-
/** @var \Magento\Catalog\Model\Resource\Eav\Attribute $attribute */
130+
/** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
131131
$attribute = $this->eavConfig->getAttribute('catalog_product', $data['attribute_code']);
132132
if (!$attribute) {
133133
$attribute = $this->attributeFactory->create();
@@ -182,15 +182,15 @@ public function run()
182182
}
183183

184184
/**
185-
* @param \Magento\Catalog\Model\Resource\Eav\Attribute $attribute
185+
* @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
186186
* @param array $data
187187
* @return array
188188
*/
189189
protected function getOption($attribute, $data)
190190
{
191191
$result = [];
192192
$data['option'] = explode("\n", $data['option']);
193-
/** @var \Magento\Eav\Model\Resource\Entity\Attribute\Option\Collection $options */
193+
/** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection $options */
194194
$options = $this->attrOptionCollectionFactory->create()
195195
->setAttributeFilter($attribute->getId())
196196
->setPositionOrder('asc', true)

‎app/code/Magento/SampleData/Module/Catalog/Setup/Category.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Category implements SetupInterface
2525
protected $storeManager;
2626

2727
/**
28-
* @var \Magento\Catalog\Model\Resource\Category\TreeFactory
28+
* @var \Magento\Catalog\Model\ResourceModel\Category\TreeFactory
2929
*/
3030
protected $resourceCategoryTreeFactory;
3131

@@ -66,7 +66,7 @@ class Category implements SetupInterface
6666

6767
/**
6868
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
69-
* @param \Magento\Catalog\Model\Resource\Category\TreeFactory $resourceCategoryTreeFactory
69+
* @param \Magento\Catalog\Model\ResourceModel\Category\TreeFactory $resourceCategoryTreeFactory
7070
* @param \Magento\Framework\Module\ModuleListInterface $moduleList
7171
* @param \Magento\SampleData\Helper\StoreManager $storeManager
7272
* @param FixtureHelper $fixtureHelper
@@ -76,7 +76,7 @@ class Category implements SetupInterface
7676
*/
7777
public function __construct(
7878
\Magento\Catalog\Model\CategoryFactory $categoryFactory,
79-
\Magento\Catalog\Model\Resource\Category\TreeFactory $resourceCategoryTreeFactory,
79+
\Magento\Catalog\Model\ResourceModel\Category\TreeFactory $resourceCategoryTreeFactory,
8080
\Magento\Framework\Module\ModuleListInterface $moduleList,
8181
\Magento\SampleData\Helper\StoreManager $storeManager,
8282
FixtureHelper $fixtureHelper,

‎app/code/Magento/SampleData/Module/Catalog/Setup/Product.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public function run()
127127
$fileName = $this->fixtureHelper->getPath($file);
128128
$csvReader = $this->csvReaderFactory->create(['fileName' => $fileName, 'mode' => 'r']);
129129
foreach ($csvReader as $row) {
130-
/** @var \Magento\Catalog\Model\Resource\Product $productResource */
130+
/** @var \Magento\Catalog\Model\ResourceModel\Product $productResource */
131131
$productResource = $product->getResource();
132132
if ($productResource->getIdBySku($row['sku'])) {
133133
continue;

‎app/code/Magento/SampleData/Module/Catalog/Setup/Product/Converter.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ class Converter
1818
protected $eavConfig;
1919

2020
/**
21-
* @var \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory
21+
* @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
2222
*/
2323
protected $attributeCollectionFactory;
2424

2525
/**
26-
* @var \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory
26+
* @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory
2727
*/
2828
protected $attrOptionCollectionFactory;
2929

@@ -43,7 +43,7 @@ class Converter
4343
protected $attributeSetId;
4444

4545
/**
46-
* @var \Magento\Catalog\Model\Resource\Product\Collection
46+
* @var \Magento\Catalog\Model\ResourceModel\Product\Collection
4747
*/
4848
protected $productCollection;
4949

@@ -55,16 +55,16 @@ class Converter
5555
/**
5656
* @param \Magento\Catalog\Api\CategoryManagementInterface $categoryReadService
5757
* @param \Magento\Eav\Model\Config $eavConfig
58-
* @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
59-
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
60-
* @param \Magento\Catalog\Model\Resource\Product\Collection $productCollection
58+
* @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory
59+
* @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
60+
* @param \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection
6161
*/
6262
public function __construct(
6363
\Magento\Catalog\Api\CategoryManagementInterface $categoryReadService,
6464
\Magento\Eav\Model\Config $eavConfig,
65-
\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
66-
\Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
67-
\Magento\Catalog\Model\Resource\Product\Collection $productCollection
65+
\Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory,
66+
\Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
67+
\Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection
6868
) {
6969
$this->categoryReadService = $categoryReadService;
7070
$this->eavConfig = $eavConfig;
@@ -187,7 +187,7 @@ protected function getCategoryIds($categories)
187187
* Get attribute options by attribute code
188188
*
189189
* @param string $attributeCode
190-
* @return \Magento\Eav\Model\Resource\Entity\Attribute\Option\Collection|null
190+
* @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection|null
191191
*/
192192
public function getAttributeOptions($attributeCode)
193193
{
@@ -206,7 +206,7 @@ public function getAttributeOptions($attributeCode)
206206
*/
207207
protected function loadAttributeOptions()
208208
{
209-
/** @var \Magento\Catalog\Model\Resource\Product\Attribute\Collection $collection */
209+
/** @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection $collection */
210210
$collection = $this->attributeCollectionFactory->create();
211211
$collection->addFieldToSelect(['attribute_code', 'attribute_id']);
212212
$collection->setAttributeSetFilter($this->getAttributeSetId());

‎app/code/Magento/SampleData/Module/Catalog/Setup/Product/Gallery.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\SampleData\Module\Catalog\Setup\Product;
77

88
use Magento\Catalog\Model\ProductFactory;
9-
use Magento\Catalog\Model\Resource\Product\Attribute\Backend\Media as GalleryAttribute;
9+
use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Media as GalleryAttribute;
1010
use Magento\SampleData\Helper\Csv\ReaderFactory as CsvReaderFactory;
1111
use Magento\SampleData\Helper\Fixture as FixtureHelper;
1212
use Magento\SampleData\Model\Logger;

‎app/code/Magento/SampleData/Module/CatalogRule/Setup/Rule.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\SampleData\Module\CatalogRule\Setup;
77

88
use Magento\CatalogRule\Model\RuleFactory as RuleFactory;
9-
use Magento\CatalogRule\Model\Resource\Rule\CollectionFactory as RuleCollectionFactory;
9+
use Magento\CatalogRule\Model\ResourceModel\Rule\CollectionFactory as RuleCollectionFactory;
1010
use Magento\SampleData\Helper\Csv\ReaderFactory as CsvReaderFactory;
1111
use Magento\SampleData\Helper\Fixture as FixtureHelper;
1212
use Magento\SampleData\Model\Logger;
@@ -43,7 +43,7 @@ class Rule implements SetupInterface
4343
protected $jobFactory;
4444

4545
/**
46-
* @var \Magento\Catalog\Model\Resource\Category\CollectionFactory
46+
* @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
4747
*/
4848
protected $categoryCollectionFactory;
4949

@@ -68,7 +68,7 @@ class Rule implements SetupInterface
6868
* @param RuleFactory $ruleFactory
6969
* @param RuleCollectionFactory $ruleCollectionFactory
7070
* @param \Magento\CatalogRule\Model\Rule\JobFactory $jobFactory
71-
* @param \Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory
71+
* @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory
7272
* @param \Magento\Customer\Model\GroupFactory $groupFactory
7373
* @param \Magento\Store\Model\WebsiteFactory $websiteFactory
7474
* @param Logger $logger
@@ -79,7 +79,7 @@ public function __construct(
7979
RuleFactory $ruleFactory,
8080
RuleCollectionFactory $ruleCollectionFactory,
8181
\Magento\CatalogRule\Model\Rule\JobFactory $jobFactory,
82-
\Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory,
82+
\Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
8383
\Magento\Customer\Model\GroupFactory $groupFactory,
8484
\Magento\Store\Model\WebsiteFactory $websiteFactory,
8585
Logger $logger
@@ -105,7 +105,7 @@ public function run()
105105
$fileName = $this->fixtureHelper->getPath($file);
106106
$csvReader = $this->csvReaderFactory->create(['fileName' => $fileName, 'mode' => 'r']);
107107
foreach ($csvReader as $row) {
108-
/** @var \Magento\CatalogRule\Model\Resource\Rule\Collection $ruleCollection */
108+
/** @var \Magento\CatalogRule\Model\ResourceModel\Rule\Collection $ruleCollection */
109109
$ruleCollection = $this->ruleCollectionFactory->create();
110110
$ruleCollection->addFilter('name', $row['name']);
111111
if ($ruleCollection->count() > 0) {

‎app/code/Magento/SampleData/Module/Cms/Setup/Block/Converter.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class Converter
1212
{
1313
/**
14-
* @var \Magento\Catalog\Model\Resource\Category\CollectionFactory
14+
* @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
1515
*/
1616
protected $categoryFactory;
1717

@@ -21,12 +21,12 @@ class Converter
2121
protected $productConverter;
2222

2323
/**
24-
* @var \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory
24+
* @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
2525
*/
2626
protected $attributeCollectionFactory;
2727

2828
/**
29-
* @var \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory
29+
* @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory
3030
*/
3131
protected $attrOptionCollectionFactory;
3232

@@ -41,25 +41,25 @@ class Converter
4141
protected $attributeCodeOptionValueIdsPair;
4242

4343
/**
44-
* @var \Magento\Catalog\Model\Resource\Product\CollectionFactory
44+
* @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
4545
*/
4646
protected $productCollectionFactory;
4747

4848
/**
49-
* @param \Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryFactory
49+
* @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryFactory
5050
* @param \Magento\Eav\Model\Config $eavConfig
5151
* @param \Magento\SampleData\Module\Catalog\Setup\Product\Converter $productConverter
52-
* @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
53-
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
54-
* @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory
52+
* @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory
53+
* @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
54+
* @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
5555
*/
5656
public function __construct(
57-
\Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryFactory,
57+
\Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryFactory,
5858
\Magento\Eav\Model\Config $eavConfig,
5959
\Magento\SampleData\Module\Catalog\Setup\Product\Converter $productConverter,
60-
\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
61-
\Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
62-
\Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory
60+
\Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory,
61+
\Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
62+
\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
6363
) {
6464
$this->categoryFactory = $categoryFactory;
6565
$this->eavConfig = $eavConfig;
@@ -194,7 +194,7 @@ protected function getUrlFilter($urlAttributes)
194194
* Get attribute options by attribute code
195195
*
196196
* @param string $attributeCode
197-
* @return \Magento\Eav\Model\Resource\Entity\Attribute\Option\Collection|null
197+
* @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection|null
198198
*/
199199
protected function getAttributeOptions($attributeCode)
200200
{
@@ -214,7 +214,7 @@ protected function getAttributeOptions($attributeCode)
214214
*/
215215
protected function loadAttributeOptions($attributeCode)
216216
{
217-
/** @var \Magento\Catalog\Model\Resource\Product\Attribute\Collection $collection */
217+
/** @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection $collection */
218218
$collection = $this->attributeCollectionFactory->create();
219219
$collection->addFieldToSelect(['attribute_code', 'attribute_id']);
220220
$collection->addFieldToFilter('attribute_code', $attributeCode);

‎app/code/Magento/SampleData/Module/ConfigurableProduct/Setup/Product/Converter.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ class Converter extends \Magento\SampleData\Module\Catalog\Setup\Product\Convert
1515
/**
1616
* @param \Magento\Catalog\Api\CategoryManagementInterface $categoryReadService
1717
* @param \Magento\Eav\Model\Config $eavConfig
18-
* @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
19-
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
20-
* @param \Magento\Catalog\Model\Resource\Product\Collection $productCollection
18+
* @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory
19+
* @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
20+
* @param \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection
2121
* @param \Magento\ConfigurableProduct\Model\Product\Type\VariationMatrix $variationMatrix
2222
*/
2323
public function __construct(
2424
\Magento\Catalog\Api\CategoryManagementInterface $categoryReadService,
2525
\Magento\Eav\Model\Config $eavConfig,
26-
\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
27-
\Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
28-
\Magento\Catalog\Model\Resource\Product\Collection $productCollection,
26+
\Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory,
27+
\Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
28+
\Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection,
2929
\Magento\ConfigurableProduct\Model\Product\Type\VariationMatrix $variationMatrix
3030
) {
3131
$this->variationMatrix = $variationMatrix;

0 commit comments

Comments
 (0)