Skip to content

Commit 1880f58

Browse files
author
Shkolyarenko, Serhiy(sshkolyarenko)
committed
Merge pull request magento#50 from magento-folks/master
[Folks]PHP7 strict compatiblility
2 parents 9024424 + a7fce97 commit 1880f58

File tree

16 files changed

+101
-101
lines changed

16 files changed

+101
-101
lines changed

‎app/code/Magento/CatalogRuleSampleData/Model/Rule.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Rule
3030
protected $ruleFactory;
3131

3232
/**
33-
* @var \Magento\Catalog\Model\Resource\Category\CollectionFactory
33+
* @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
3434
*/
3535
protected $categoryCollectionFactory;
3636

@@ -53,15 +53,15 @@ class Rule
5353
* @param SampleDataContext $sampleDataContext
5454
* @param RuleFactory $ruleFactory
5555
* @param JobFactory $jobFactory
56-
* @param \Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory
56+
* @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory
5757
* @param \Magento\Customer\Model\GroupFactory $groupFactory
5858
* @param \Magento\Store\Model\WebsiteFactory $websiteFactory
5959
*/
6060
public function __construct(
6161
SampleDataContext $sampleDataContext,
6262
RuleFactory $ruleFactory,
6363
JobFactory $jobFactory,
64-
\Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory,
64+
\Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
6565
\Magento\Customer\Model\GroupFactory $groupFactory,
6666
\Magento\Store\Model\WebsiteFactory $websiteFactory
6767
) {

‎app/code/Magento/CatalogSampleData/Model/Attribute.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Attribute
2222
protected $fixtureManager;
2323

2424
/**
25-
* @var \Magento\Catalog\Model\Resource\Eav\AttributeFactory
25+
* @var \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory
2626
*/
2727
protected $attributeFactory;
2828

@@ -32,7 +32,7 @@ class Attribute
3232
protected $attributeSetFactory;
3333

3434
/**
35-
* @var \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory
35+
* @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory
3636
*/
3737
protected $attrOptionCollectionFactory;
3838

@@ -63,18 +63,18 @@ class Attribute
6363

6464
/**
6565
* @param SampleDataContext $sampleDataContext
66-
* @param \Magento\Catalog\Model\Resource\Eav\AttributeFactory $attributeFactory
66+
* @param \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory $attributeFactory
6767
* @param \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory
68-
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
68+
* @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
6969
* @param \Magento\Catalog\Helper\Product $productHelper
7070
* @param \Magento\Eav\Model\Config $eavConfig
7171
* @param StoreManagerInterface $storeManager
7272
*/
7373
public function __construct(
7474
SampleDataContext $sampleDataContext,
75-
\Magento\Catalog\Model\Resource\Eav\AttributeFactory $attributeFactory,
75+
\Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory $attributeFactory,
7676
\Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory,
77-
\Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
77+
\Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
7878
\Magento\Catalog\Helper\Product $productHelper,
7979
\Magento\Eav\Model\Config $eavConfig,
8080
\Magento\Store\Model\StoreManagerInterface $storeManager
@@ -112,7 +112,7 @@ public function install(array $fixtures)
112112
}
113113
$data['attribute_set'] = explode("\n", $data['attribute_set']);
114114

115-
/** @var \Magento\Catalog\Model\Resource\Eav\Attribute $attribute */
115+
/** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
116116
$attribute = $this->eavConfig->getAttribute('catalog_product', $data['attribute_code']);
117117
if (!$attribute) {
118118
$attribute = $this->attributeFactory->create();
@@ -165,15 +165,15 @@ public function install(array $fixtures)
165165
}
166166

167167
/**
168-
* @param \Magento\Catalog\Model\Resource\Eav\Attribute $attribute
168+
* @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
169169
* @param array $data
170170
* @return array
171171
*/
172172
protected function getOption($attribute, $data)
173173
{
174174
$result = [];
175175
$data['option'] = explode("\n", $data['option']);
176-
/** @var \Magento\Eav\Model\Resource\Entity\Attribute\Option\Collection $options */
176+
/** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection $options */
177177
$options = $this->attrOptionCollectionFactory->create()
178178
->setAttributeFilter($attribute->getId())
179179
->setPositionOrder('asc', true)

‎app/code/Magento/CatalogSampleData/Model/Category.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Category
2828
protected $storeManager;
2929

3030
/**
31-
* @var \Magento\Catalog\Model\Resource\Category\TreeFactory
31+
* @var \Magento\Catalog\Model\ResourceModel\Category\TreeFactory
3232
*/
3333
protected $resourceCategoryTreeFactory;
3434

@@ -50,13 +50,13 @@ class Category
5050
/**
5151
* @param SampleDataContext $sampleDataContext
5252
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
53-
* @param \Magento\Catalog\Model\Resource\Category\TreeFactory $resourceCategoryTreeFactory
53+
* @param \Magento\Catalog\Model\ResourceModel\Category\TreeFactory $resourceCategoryTreeFactory
5454
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
5555
*/
5656
public function __construct(
5757
SampleDataContext $sampleDataContext,
5858
\Magento\Catalog\Model\CategoryFactory $categoryFactory,
59-
\Magento\Catalog\Model\Resource\Category\TreeFactory $resourceCategoryTreeFactory,
59+
\Magento\Catalog\Model\ResourceModel\Category\TreeFactory $resourceCategoryTreeFactory,
6060
\Magento\Store\Model\StoreManagerInterface $storeManager
6161
) {
6262
$this->fixtureManager = $sampleDataContext->getFixtureManager();

‎app/code/Magento/CatalogSampleData/Model/Product/Converter.php

Lines changed: 15 additions & 15 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

@@ -54,21 +54,21 @@ class Converter
5454

5555
/**
5656
* @param \Magento\Catalog\Model\Category\TreeFactory $categoryTreeFactory
57-
* @param \Magento\Catalog\Model\Resource\Category\TreeFactory $categoryResourceTreeFactory
57+
* @param \Magento\Catalog\Model\ResourceModel\Category\TreeFactory $categoryResourceTreeFactory
5858
* @param \Magento\Eav\Model\Config $eavConfig
59-
* @param \Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory
60-
* @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
61-
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
62-
* @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory
59+
* @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory
60+
* @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory
61+
* @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
62+
* @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
6363
*/
6464
public function __construct(
6565
\Magento\Catalog\Model\Category\TreeFactory $categoryTreeFactory,
66-
\Magento\Catalog\Model\Resource\Category\TreeFactory $categoryResourceTreeFactory,
66+
\Magento\Catalog\Model\ResourceModel\Category\TreeFactory $categoryResourceTreeFactory,
6767
\Magento\Eav\Model\Config $eavConfig,
68-
\Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory,
69-
\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
70-
\Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
71-
\Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory
68+
\Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
69+
\Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory,
70+
\Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
71+
\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
7272
) {
7373
$this->categoryTree = $categoryTreeFactory->create(
7474
[
@@ -196,7 +196,7 @@ protected function getCategoryIds($categories)
196196
* Get attribute options by attribute code
197197
*
198198
* @param string $attributeCode
199-
* @return \Magento\Eav\Model\Resource\Entity\Attribute\Option\Collection|null
199+
* @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection|null
200200
*/
201201
public function getAttributeOptions($attributeCode)
202202
{
@@ -215,7 +215,7 @@ public function getAttributeOptions($attributeCode)
215215
*/
216216
protected function loadAttributeOptions()
217217
{
218-
/** @var \Magento\Catalog\Model\Resource\Product\Attribute\Collection $collection */
218+
/** @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection $collection */
219219
$collection = $this->attributeCollectionFactory->create();
220220
$collection->addFieldToSelect(['attribute_code', 'attribute_id']);
221221
$collection->setAttributeSetFilter($this->getAttributeSetId());

‎app/code/Magento/CatalogSampleData/Model/Product/Gallery.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\CatalogSampleData\Model\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\Framework\Setup\SampleData\Context as SampleDataContext;
1111

1212
/**

‎app/code/Magento/CmsSampleData/Model/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\CatalogSampleData\Model\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\CatalogSampleData\Model\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/ConfigurableSampleData/Model/Product/Converter.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ class Converter extends \Magento\CatalogSampleData\Model\Product\Converter
1717

1818
/**
1919
* @param \Magento\Catalog\Model\Category\TreeFactory $categoryTreeFactory
20-
* @param \Magento\Catalog\Model\Resource\Category\TreeFactory $categoryResourceTreeFactory
20+
* @param \Magento\Catalog\Model\ResourceModel\Category\TreeFactory $categoryResourceTreeFactory
2121
* @param \Magento\Eav\Model\Config $eavConfig
22-
* @param \Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory
23-
* @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
24-
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
25-
* @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory
22+
* @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory
23+
* @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory
24+
* @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
25+
* @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
2626
* @param \Magento\ConfigurableProduct\Model\Product\Type\VariationMatrix $variationMatrix
2727
*/
2828
public function __construct(
2929
\Magento\Catalog\Model\Category\TreeFactory $categoryTreeFactory,
30-
\Magento\Catalog\Model\Resource\Category\TreeFactory $categoryResourceTreeFactory,
30+
\Magento\Catalog\Model\ResourceModel\Category\TreeFactory $categoryResourceTreeFactory,
3131
\Magento\Eav\Model\Config $eavConfig,
32-
\Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory,
33-
\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
34-
\Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
35-
\Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory,
32+
\Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
33+
\Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory,
34+
\Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
35+
\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
3636
\Magento\ConfigurableProduct\Model\Product\Type\VariationMatrix $variationMatrix
3737
) {
3838
$this->variationMatrix = $variationMatrix;

‎app/code/Magento/MsrpSampleData/Model/Msrp.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Msrp
3131
protected $productIds;
3232

3333
/**
34-
* @var \Magento\Catalog\Model\Resource\Product\Collection
34+
* @var \Magento\Catalog\Model\ResourceModel\Product\Collection
3535
*/
3636
protected $productCollection;
3737

@@ -42,12 +42,12 @@ class Msrp
4242

4343
/**
4444
* @param SampleDataContext $sampleDataContext
45-
* @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory
45+
* @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
4646
* @param \Magento\Framework\App\Config\Storage\WriterInterface $configWriter
4747
*/
4848
public function __construct(
4949
SampleDataContext $sampleDataContext,
50-
\Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory,
50+
\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
5151
\Magento\Framework\App\Config\Storage\WriterInterface $configWriter
5252
) {
5353
$this->fixtureManager = $sampleDataContext->getFixtureManager();

0 commit comments

Comments
 (0)