MAGETWO-41527: PHP 7 namespace strict compatibility

fixed references to framework resources

Author: Serhiy Shkolyarenko

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

@@ -54,7 +54,7 @@ class Converter
 
     /**
      * @param \Magento\Catalog\Model\Category\TreeFactory $categoryTreeFactory
-     * @param \Magento\Catalog\Model\Resource\Category\TreeFactory $categoryResourceTreeFactory
+     * @param \Magento\Catalog\Model\ResourceModel\Category\TreeFactory $categoryResourceTreeFactory
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory
@@ -63,7 +63,7 @@ class Converter
      */
     public function __construct(
         \Magento\Catalog\Model\Category\TreeFactory $categoryTreeFactory,
-        \Magento\Catalog\Model\Resource\Category\TreeFactory $categoryResourceTreeFactory,
+        \Magento\Catalog\Model\ResourceModel\Category\TreeFactory $categoryResourceTreeFactory,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
         \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory,

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

@@ -31,7 +31,7 @@ class Msrp
     protected $productIds;
 
     /**
-     * @var \Magento\Catalog\Model\Resource\Product\Collection
+     * @var \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     protected $productCollection;
 
@@ -42,12 +42,12 @@ class Msrp
 
     /**
      * @param SampleDataContext $sampleDataContext
-     * @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory
+     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
      * @param \Magento\Framework\App\Config\Storage\WriterInterface $configWriter
      */
     public function __construct(
         SampleDataContext $sampleDataContext,
-        \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory,
+        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
         \Magento\Framework\App\Config\Storage\WriterInterface $configWriter
     ) {
         $this->fixtureManager = $sampleDataContext->getFixtureManager();

app/code/Magento/OfflineShippingSampleData/Model/Tablerate.php

@@ -28,7 +28,7 @@ class Tablerate
     protected $csvReader;
 
     /**
-     * @var \Magento\OfflineShipping\Model\Resource\Carrier\Tablerate
+     * @var \Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate
      */
     protected $tablerate;
 

app/code/Magento/ReviewSampleData/Model/Review.php

@@ -31,7 +31,7 @@ class Review
     protected $reviewFactory;
 
     /**
-     * @var \Magento\Review\Model\Resource\Review\CollectionFactory
+     * @var \Magento\Review\Model\ResourceModel\Review\CollectionFactory
      */
     protected $reviewCollectionFactory;
 
@@ -139,7 +139,7 @@ public function install(array $fixtures)
                 if (empty($productId)) {
                     continue;
                 }
-                /** @var \Magento\Review\Model\Resource\Review\Collection $reviewCollection */
+                /** @var \Magento\Review\Model\ResourceModel\Review\Collection $reviewCollection */
                 $reviewCollection = $this->reviewCollectionFactory->create();
                 $reviewCollection->addFilter('entity_pk_value', $productId)
                     ->addFilter('entity_id', $this->getReviewEntityId())

app/code/Magento/SalesRuleSampleData/Model/Rule.php

@@ -7,7 +7,7 @@
 
 use Magento\Framework\Setup\SampleData\Context as SampleDataContext;
 use Magento\SalesRule\Model\RuleFactory as RuleFactory;
-use Magento\SalesRule\Model\Resource\Rule\CollectionFactory as RuleCollectionFactory;
+use Magento\SalesRule\Model\ResourceModel\Rule\CollectionFactory as RuleCollectionFactory;
 
 /**
  * Class Rule
@@ -90,7 +90,7 @@ public function install(array $fixtures)
                     $data[$header[$key]] = $value;
                 }
                 $row = $data;
-                /** @var \Magento\SalesRule\Model\Resource\Rule\Collection $ruleCollection */
+                /** @var \Magento\SalesRule\Model\ResourceModel\Rule\Collection $ruleCollection */
                 $ruleCollection = $this->ruleCollectionFactory->create();
                 $ruleCollection->addFilter('name', $row['name']);
                 if ($ruleCollection->count() > 0) {

app/code/Magento/SwatchesSampleData/Model/Swatches.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\SwatchesSampleData\Model;
 
-use Magento\Catalog\Model\Resource\Eav\Attribute as eavAttribute;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute as eavAttribute;
 
 /**
  * Class Swatches
@@ -36,7 +36,7 @@ class Swatches
     ];
 
     /**
-     * @var \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory
+     * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory
      */
     protected $attrOptionCollectionFactory;
 
@@ -46,11 +46,11 @@ class Swatches
     protected $eavConfig;
 
     /**
-     * @param \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
+     * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
      * @param \Magento\Eav\Model\Config $eavConfig
      */
     public function __construct(
-        \Magento\Eav\Model\Resource\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
+        \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
         \Magento\Eav\Model\Config $eavConfig
     ) {
         $this->attrOptionCollectionFactory = $attrOptionCollectionFactory;