MAGETWO-43920: [GitHub]Magento requires reinstalling after PR #697

added upgrade scripts
magento · Oct 12, 2015 · 50aad75 · 50aad75
1 parent f03464b
commit 50aad75
Show file tree

Hide file tree

Showing 7 changed files with 184 additions and 4 deletions.
diff --git a/app/code/Magento/Catalog/Setup/UpgradeData.php b/app/code/Magento/Catalog/Setup/UpgradeData.php
@@ -85,6 +85,47 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
             $categorySetupManager = $this->categorySetupFactory->create();
             $categorySetupManager->removeAttribute(\Magento\Catalog\Model\Product::ENTITY, 'group_price');
         }
+
+        if (version_compare($context->getVersion(), '2.0.2') < 0) {
+            /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
+            $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
+            $categorySetup->updateEntityType(
+                \Magento\Catalog\Model\Category::ENTITY,
+                'entity_model',
+                'Magento\Catalog\Model\ResourceModel\Category'
+            );
+            $categorySetup->updateEntityType(
+                \Magento\Catalog\Model\Category::ENTITY,
+                'attribute_model',
+                'Magento\Catalog\Model\ResourceModel\Eav\Attribute'
+            );
+            $categorySetup->updateEntityType(
+                \Magento\Catalog\Model\Category::ENTITY,
+                'entity_attribute_collection',
+                'Magento\Catalog\Model\ResourceModel\Category\Attribute\Collection'
+            );
+            $categorySetup->updateAttribute(
+                \Magento\Catalog\Model\Category::ENTITY,
+                'custom_design_from',
+                'attribute_model',
+                'Magento\Catalog\Model\ResourceModel\Eav\Attribute'
+            );
+            $categorySetup->updateEntityType(
+                \Magento\Catalog\Model\Product::ENTITY,
+                'entity_model',
+                'Magento\Catalog\Model\ResourceModel\Product'
+            );
+            $categorySetup->updateEntityType(
+                \Magento\Catalog\Model\Product::ENTITY,
+                'attribute_model',
+                'Magento\Catalog\Model\ResourceModel\Eav\Attribute'
+            );
+            $categorySetup->updateEntityType(
+                \Magento\Catalog\Model\Product::ENTITY,
+                'entity_attribute_collection',
+                'Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection'
+            );
+        }
         $setup->endSetup();
     }
 }
diff --git a/app/code/Magento/Catalog/etc/module.xml b/app/code/Magento/Catalog/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_Catalog" setup_version="2.0.1">
+    <module name="Magento_Catalog" setup_version="2.0.2">
         <sequence>
             <module name="Magento_Eav"/>
             <module name="Magento_Cms"/>

diff --git a/app/code/Magento/Customer/Setup/UpgradeData.php b/app/code/Magento/Customer/Setup/UpgradeData.php
@@ -240,6 +240,51 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
             ];
             $this->upgradeAttributes($entityAttributes, $customerSetup);
         }
+        if (version_compare($context->getVersion(), '2.0.6', '<')) {
+            $customerSetup->updateEntityType(
+                \Magento\Customer\Model\Customer::ENTITY,
+                'entity_model',
+                'Magento\Customer\Model\ResourceModel\Customer'
+            );
+            $customerSetup->updateEntityType(
+                \Magento\Customer\Model\Customer::ENTITY,
+                'increment_model',
+                'Magento\Eav\Model\Entity\Increment\NumericValue'
+            );
+            $customerSetup->updateEntityType(
+                \Magento\Customer\Model\Customer::ENTITY,
+                'entity_attribute_collection',
+                'Magento\Customer\Model\ResourceModel\Attribute\Collection'
+            );
+            $customerSetup->updateEntityType(
+                'customer_address',
+                'entity_model',
+                'Magento\Customer\Model\ResourceModel\Address'
+            );
+            $customerSetup->updateEntityType(
+                'customer_address',
+                'entity_attribute_collection',
+                'Magento\Customer\Model\ResourceModel\Address\Attribute\Collection'
+            );
+            $customerSetup->updateAttribute(
+                'customer_address',
+                'country_id',
+                'source',
+                'Magento\Customer\Model\ResourceModel\Address\Attribute\Source\Country'
+            );
+            $customerSetup->updateAttribute(
+                'customer_address',
+                'region',
+                'backend',
+                'Magento\Customer\Model\ResourceModel\Address\Attribute\Backend\Region'
+            );
+            $customerSetup->updateAttribute(
+                'customer_address',
+                'region_id',
+                'source',
+                'Magento\Customer\Model\ResourceModel\Address\Attribute\Source\Region'
+            );
+        }
 
         $indexer = $this->indexerRegistry->get(Customer::CUSTOMER_GRID_INDEXER_ID);
         $indexer->reindexAll();

diff --git a/app/code/Magento/Customer/etc/module.xml b/app/code/Magento/Customer/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_Customer" setup_version="2.0.5">
+    <module name="Magento_Customer" setup_version="2.0.6">
         <sequence>
             <module name="Magento_Eav"/>
             <module name="Magento_Directory"/>

diff --git a/app/code/Magento/Sales/Setup/UpgradeData.php b/app/code/Magento/Sales/Setup/UpgradeData.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Setup;
+
+use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * Sales setup factory
+     *
+     * @var SalesSetupFactory
+     */
+    protected $salesSetupFactory;
+
+    /**
+     * @var \Magento\Eav\Model\Config
+     */
+    protected $eavConfig;
+
+    /**
+     * @param SalesSetupFactory $salesSetupFactory
+     * @param \Magento\Eav\Model\Config $eavConfig
+     */
+    public function __construct(
+        SalesSetupFactory $salesSetupFactory,
+        \Magento\Eav\Model\Config $eavConfig
+    ) {
+        $this->salesSetupFactory = $salesSetupFactory;
+        $this->eavConfig = $eavConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $setup->startSetup();
+
+        /** @var SalesSetup $salesSetup */
+        $salesSetup = $this->salesSetupFactory->create(['setup' => $setup]);
+
+        if (version_compare($context->getVersion(), '2.0.1', '<')) {
+            $salesSetup->updateEntityType(
+                \Magento\Sales\Model\Order::ENTITY,
+                'entity_model',
+                'Magento\Sales\Model\ResourceModel\Order'
+            );
+            $salesSetup->updateEntityType(
+                \Magento\Sales\Model\Order::ENTITY,
+                'increment_model',
+                'Magento\Eav\Model\Entity\Increment\NumericValue'
+            );
+            $salesSetup->updateEntityType(
+                'invoice',
+                'entity_model',
+                'Magento\Sales\Model\ResourceModel\Order'
+            );
+            $salesSetup->updateEntityType(
+                'invoice',
+                'increment_model',
+                'Magento\Eav\Model\Entity\Increment\NumericValue'
+            );
+            $salesSetup->updateEntityType(
+                'creditmemo',
+                'entity_model',
+                'Magento\Sales\Model\ResourceModel\Order\Creditmemo'
+            );
+            $salesSetup->updateEntityType(
+                'creditmemo',
+                'increment_model',
+                'Magento\Eav\Model\Entity\Increment\NumericValue'
+            );
+            $salesSetup->updateEntityType(
+                'shipment',
+                'entity_model',
+                'Magento\Sales\Model\ResourceModel\Order\Shipment'
+            );
+            $salesSetup->updateEntityType(
+                'shipment',
+                'increment_model',
+                'Magento\Eav\Model\Entity\Increment\NumericValue'
+            );
+        }
+        $this->eavConfig->clear();
+        $setup->endSetup();
+    }
+}
diff --git a/app/code/Magento/Sales/etc/module.xml b/app/code/Magento/Sales/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_Sales" setup_version="2.0.0">
+    <module name="Magento_Sales" setup_version="2.0.1">
         <sequence>
             <module name="Magento_Rule"/>
             <module name="Magento_Catalog"/>

diff --git a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
@@ -12,7 +12,6 @@ class ReservedWordsSniff implements PHP_CodeSniffer_Sniff
 {
     /**
      * source: http://php.net/manual/en/reserved.other-reserved-words.php
-     * disabled(commented) items are not restricted int PHP 7 beta 3, just declared as prohibited
      *
      * @var array PHP 7 reserved words for name spaces
      */