2.3 compatibility

PMET-public · Aug 10, 2018 · 18853de · 18853de
1 parent 5ff3531
commit 18853de
Show file tree

Hide file tree

Showing 9 changed files with 122 additions and 108 deletions.
diff --git a/Model/Attribute.php → Setup/Attribute.php b/Model/Attribute.php → Setup/Attribute.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\CatalogSampleDataVenia\Model;
+namespace Magento\CatalogSampleDataVenia\Setup;
 
 use Magento\Framework\Setup\SampleData\Context as SampleDataContext;
 use Magento\Store\Model\StoreManagerInterface;

diff --git a/Model/Category.php → Setup/Category.php b/Model/Category.php → Setup/Category.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\CatalogSampleDataVenia\Model;
+namespace Magento\CatalogSampleDataVenia\Setup;
 
 use Magento\Framework\Setup\SampleData\Context as SampleDataContext;
 

diff --git a/Setup/InstallData.php b/Setup/InstallData.php
diff --git a/Setup/Installer.php b/Setup/Installer.php
diff --git a/Setup/Patch/Data/InstallSimpleProducts.php b/Setup/Patch/Data/InstallSimpleProducts.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogSampleDataVenia\Setup\Patch\Data;
+
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\CatalogSampleDataVenia\Setup\Category;
+use Magento\CatalogSampleDataVenia\Setup\Attribute;
+use Magento\CatalogSampleDataVenia\Setup\Product;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+* Patch is mechanism, that allows to do atomic upgrade data changes
+*/
+class InstallSimpleProducts implements
+    DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * Setup class for category
+     *
+     * @var \Magento\CatalogSampleDataVenia\Setup\Category
+     */
+    protected $categorySetup;
+
+    /**
+     * Setup class for product attributes
+     *
+     * @var \Magento\CatalogSampleDataVenia\Setup\Attribute
+     */
+    protected $attributeSetup;
+
+    /**
+     * Setup class for products
+     *
+     * @var \Magento\CatalogSampleDataVenia\Setup\Product
+     */
+    protected $productSetup;
+
+
+    /**
+     * @var ModuleDataSetupInterface $moduleDataSetup
+     */
+    private $moduleDataSetup;
+
+    /**
+     * InstallSimpleProducts constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param Category $categorySetup
+     * @param Attribute $attributeSetup
+     * @param Product $productSetup
+     */
+    public function __construct(ModuleDataSetupInterface $moduleDataSetup, Category $categorySetup,
+                                Attribute $attributeSetup, Product $productSetup)
+    {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetup = $categorySetup;
+        $this->attributeSetup = $attributeSetup;
+        $this->productSetup = $productSetup;
+    }
+
+    /**
+     * Do Upgrade
+     *
+     * @return void
+     */
+    public function apply()
+    {
+        $this->attributeSetup->install(['Magento_CatalogSampleDataVenia::fixtures/attributes.csv']);
+        $this->categorySetup->install(['Magento_CatalogSampleDataVenia::fixtures/categories.csv']);
+        $this->productSetup->install(
+            [
+                'Magento_CatalogSampleDataVenia::fixtures/SimpleProduct/products_accessories.csv'
+            ],
+            [
+                'Magento_CatalogSampleDataVenia::fixtures/SimpleProduct/images_accessories.csv'
+            ]
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+
+        ];
+    }
+    public static function getVersion(){
+        return '0.0.0';
+    }
+}
diff --git a/Model/Product.php → Setup/Product.php b/Model/Product.php → Setup/Product.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\CatalogSampleDataVenia\Model;
+namespace Magento\CatalogSampleDataVenia\Setup;
 
 use Magento\Framework\Setup\SampleData\Context as SampleDataContext;
 
@@ -64,6 +64,9 @@ class Product
      */
     protected $eavConfig;
 
+    /** @var \Magento\Framework\App\State */
+    protected $appState;
+
     /**
      * Product constructor.
      * @param SampleDataContext $sampleDataContext
@@ -73,6 +76,7 @@ class Product
      * @param Product\Gallery $gallery
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Config $eavConfig
+     * @param \Magento\Framework\App\State $appState
      */
     public function __construct(
         SampleDataContext $sampleDataContext,
@@ -81,7 +85,8 @@ public function __construct(
         Product\Converter $converter,
         Product\Gallery $gallery,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Eav\Model\Config $eavConfig
+        \Magento\Eav\Model\Config $eavConfig,
+        \Magento\Framework\App\State $appState
     ) {
         $this->fixtureManager = $sampleDataContext->getFixtureManager();
         $this->productFactory = $productFactory;
@@ -91,6 +96,7 @@ public function __construct(
         $this->gallery = $gallery;
         $this->storeManager = $storeManager;
         $this->eavConfig = $eavConfig;
+        $this->appState = $appState;
     }
 
     /**
@@ -138,8 +144,11 @@ public function install(array $productFixtures, array $galleryFixtures)
                 }
 
                 $this->prepareProduct($product, $data);
-
-                $product->save();
+                $this->appState->emulateAreaCode(
+                    'adminhtml',
+                    [$product, 'save']
+                );
+                //$product->save();
                 $this->installGallery($product);
             }
         }

diff --git a/Model/Product/Converter.php → Setup/Product/Converter.php b/Model/Product/Converter.php → Setup/Product/Converter.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\CatalogSampleDataVenia\Model\Product;
+namespace Magento\CatalogSampleDataVenia\Setup\Product;
 
 class Converter
 {

diff --git a/Model/Product/Gallery.php → Setup/Product/Gallery.php b/Model/Product/Gallery.php → Setup/Product/Gallery.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\CatalogSampleDataVenia\Model\Product;
+namespace Magento\CatalogSampleDataVenia\Setup\Product;
 
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Gallery as GalleryResource;

diff --git a/etc/module.xml b/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CatalogSampleDataVenia" setup_version="0.0.1">
+    <module name="Magento_CatalogSampleDataVenia">
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Eav"/>