MAGETWO-55462: Portdown MAGETWO-52448 down to M2.1.x branch

Author: isitnikov

app/code/Magento/Catalog/Setup/CategorySetup.php

@@ -24,16 +24,6 @@ class CategorySetup extends EavSetup
      */
     private $categoryFactory;
 
-    /**
-     * This should be set explicitly
-     */
-    const CATEGORY_ENTITY_TYPE_ID = 3;
-
-    /**
-     * This should be set explicitly
-     */
-    const CATALOG_PRODUCT_ENTITY_TYPE_ID = 4;
-
     /**
      * Init
      *
@@ -76,7 +66,7 @@ public function getDefaultEntities()
     {
         return [
             'catalog_category' => [
-                'entity_type_id' => self::CATEGORY_ENTITY_TYPE_ID,
+                'entity_type_id' => 3,
                 'entity_model' => 'Magento\Catalog\Model\ResourceModel\Category',
                 'attribute_model' => 'Magento\Catalog\Model\ResourceModel\Eav\Attribute',
                 'table' => 'catalog_category_entity',
@@ -345,7 +335,7 @@ public function getDefaultEntities()
                 ],
             ],
             'catalog_product' => [
-                'entity_type_id' => self::CATALOG_PRODUCT_ENTITY_TYPE_ID,
+                'entity_type_id' => 4,
                 'entity_model' => 'Magento\Catalog\Model\ResourceModel\Product',
                 'attribute_model' => 'Magento\Catalog\Model\ResourceModel\Eav\Attribute',
                 'table' => 'catalog_product_entity',

app/code/Magento/Sales/Setup/SalesSetup.php

@@ -18,26 +18,6 @@
  */
 class SalesSetup extends \Magento\Eav\Setup\EavSetup
 {
-    /**
-     * This should be set explicitly
-     */
-    const ORDER_ENTITY_TYPE_ID = 5;
-
-    /**
-     * This should be set explicitly
-     */
-    const INVOICE_PRODUCT_ENTITY_TYPE_ID = 6;
-
-    /**
-     * This should be set explicitly
-     */
-    const CREDITMEMO_PRODUCT_ENTITY_TYPE_ID = 7;
-
-    /**
-     * This should be set explicitly
-     */
-    const SHIPMENT_PRODUCT_ENTITY_TYPE_ID = 8;
-
     /**
      * @var ScopeConfigInterface
      */
@@ -234,31 +214,31 @@ public function getDefaultEntities()
     {
         $entities = [
             'order' => [
-                'entity_type_id' => self::ORDER_ENTITY_TYPE_ID,
+                'entity_type_id' => 5,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order',
                 'table' => 'sales_order',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',
                 'increment_per_store' => true,
                 'attributes' => [],
             ],
             'invoice' => [
-                'entity_type_id' => self::INVOICE_PRODUCT_ENTITY_TYPE_ID,
+                'entity_type_id' => 6,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order\Invoice',
                 'table' => 'sales_invoice',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',
                 'increment_per_store' => true,
                 'attributes' => [],
             ],
             'creditmemo' => [
-                'entity_type_id' => self::CREDITMEMO_PRODUCT_ENTITY_TYPE_ID,
+                'entity_type_id' => 7,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order\Creditmemo',
                 'table' => 'sales_creditmemo',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',
                 'increment_per_store' => true,
                 'attributes' => [],
             ],
             'shipment' => [
-                'entity_type_id' => self::SHIPMENT_PRODUCT_ENTITY_TYPE_ID,
+                'entity_type_id' => 8,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order\Shipment',
                 'table' => 'sales_shipment',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',