Merge pull request magento#1113 from magento-engcom/develop-prs

[EngCom] Public Pull Requests

Author: vrann

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

@@ -2022,18 +2022,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'attribute_id',
                 \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
             )
-            ->addForeignKey(
-                $installer->getFkName(
-                    'catalog_product_entity_media_gallery',
-                    'entity_id',
-                    'catalog_product_entity',
-                    'entity_id'
-                ),
-                'entity_id',
-                $installer->getTable('catalog_product_entity'),
-                'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-            )
             ->setComment(
                 'Catalog Product Media Gallery Attribute Backend Table'
             );

app/code/Magento/Eav/Setup/EavSetup.php

@@ -1002,35 +1002,36 @@ private function _updateAttributeAdditionalData($entityTypeId, $id, $field, $val
             return $this;
         }
         $additionalTableExists = $this->setup->getConnection()->isTableExists($this->setup->getTable($additionalTable));
-        if ($additionalTable && $additionalTableExists) {
-            $attributeFields = $this->setup->getConnection()->describeTable($this->setup->getTable($additionalTable));
-            if (is_array($field)) {
-                $bind = [];
-                foreach ($field as $k => $v) {
-                    if (isset($attributeFields[$k])) {
-                        $bind[$k] = $this->setup->getConnection()->prepareColumnValue($attributeFields[$k], $v);
-                    }
-                }
-                if (!$bind) {
-                    return $this;
-                }
-                $field = $bind;
-            } else {
-                if (!isset($attributeFields[$field])) {
-                    return $this;
+        if (!$additionalTableExists) {
+            return $this;
+        }
+        $attributeFields = $this->setup->getConnection()->describeTable($this->setup->getTable($additionalTable));
+        if (is_array($field)) {
+            $bind = [];
+            foreach ($field as $k => $v) {
+                if (isset($attributeFields[$k])) {
+                    $bind[$k] = $this->setup->getConnection()->prepareColumnValue($attributeFields[$k], $v);
                 }
             }
-            $this->setup->updateTableRow(
-                $this->setup->getTable($additionalTable),
-                'attribute_id',
-                $this->getAttributeId($entityTypeId, $id),
-                $field,
-                $value
-            );
-
-            $attribute = $this->getAttribute($entityTypeId, $id);
-            $this->updateCachedRow($field, $value, $attribute);
+            if (!$bind) {
+                return $this;
+            }
+            $field = $bind;
+        } else {
+            if (!isset($attributeFields[$field])) {
+                return $this;
+            }
         }
+        $this->setup->updateTableRow(
+            $this->setup->getTable($additionalTable),
+            'attribute_id',
+            $this->getAttributeId($entityTypeId, $id),
+            $field,
+            $value
+        );
+
+        $attribute = $this->getAttribute($entityTypeId, $id);
+        $this->updateCachedRow($field, $value, $attribute);
 
         return $this;
     }

app/code/Magento/Sales/Model/ResourceModel/Order/Status.php

@@ -17,7 +17,7 @@
  *
  * @author      Magento Core Team <[email protected]>
  */
-class Status extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\AbstractDb
+class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
      * Status labels table

setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php

@@ -111,7 +111,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     . PHP_EOL . 'In "default" and "developer" modes static contents are being deployed '
                     . 'automatically on demand.'
                     . PHP_EOL . 'If you still want to deploy in these modes, use -f option: '
-                    . "'bin/magento setup:deploy:static-content -f'"
+                    . "'bin/magento setup:static-content:deploy -f'"
                 )
             );
         }