Merge remote-tracking branch 'origin/develop' into PR

Author: Oleksandr Dubovyk

.htaccess

@@ -243,10 +243,6 @@
         order allow,deny
         deny from all
     </Files>
-    <Files CONTRIBUTOR_LICENSE_AGREEMENT.html>
-        order allow,deny
-        deny from all
-    </Files>
     <Files COPYING.txt>
         order allow,deny
         deny from all

.htaccess.sample

@@ -209,10 +209,6 @@
         order allow,deny
         deny from all
     </Files>
-    <Files CONTRIBUTOR_LICENSE_AGREEMENT.html>
-        order allow,deny
-        deny from all
-    </Files>
     <Files COPYING.txt>
         order allow,deny
         deny from all

CONTRIBUTING.md

@@ -10,7 +10,7 @@ The Magento 2 development team will review all issues and contributions submitte
 
 ## Contribution requirements
 
-1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v1.0/coding-standards/bk-coding-standards.html).
+1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v2.0/coding-standards/bk-coding-standards.html).
 2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request to be merged quickly and without additional clarification requests.
 3. Commits must be accompanied by meaningful commit messages.
 4. PRs which include bug fixing, must be accompanied with step-by-step description of how to reproduce the bug.
@@ -25,7 +25,7 @@ The Magento 2 development team will review all issues and contributions submitte
 If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
 
 1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
-2. Review the [Contributor License Agreement](https://github.com/magento/magento2/blob/master/CONTRIBUTOR_LICENSE_AGREEMENT.html) if this is your first time contributing.
+2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
 3. Create and test your work.
-4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html#pull_request).
+4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request).
 5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.

CONTRIBUTOR_LICENSE_AGREEMENT.html

@@ -30,7 +30,7 @@ public function render(\Magento\Framework\DataObject $row)
             $truncateLength = $this->getColumn()->getTruncate();
         }
         $text = $this->filterManager->truncate(parent::_getValue($row), ['length' => $truncateLength]);
-        if ($this->getColumn()->getEscape()) {
+        if (!$this->getColumn()->hasEscape() || $this->getColumn()->getEscape()) {
             $text = $this->escapeHtml($text);
         }
         if ($this->getColumn()->getNl2br()) {

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Longtext.php

@@ -10,6 +10,7 @@
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
+use Magento\Catalog\Api\Data\CategoryInterface;
 
 class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInterface
 {
@@ -33,6 +34,11 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
      */
     protected $categoryResource;
 
+    /**
+     * @var \Magento\Framework\Model\Entity\MetadataPool
+     */
+    protected $metadataPool;
+
     /**
      * List of fields that can used config values in case when value does not defined directly
      *
@@ -44,15 +50,18 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
      * @param \Magento\Catalog\Model\ResourceModel\Category $categoryResource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Model\Entity\MetadataPool $metadataPool
      */
     public function __construct(
         \Magento\Catalog\Model\CategoryFactory $categoryFactory,
         \Magento\Catalog\Model\ResourceModel\Category $categoryResource,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Model\Entity\MetadataPool $metadataPool
     ) {
         $this->categoryFactory = $categoryFactory;
         $this->categoryResource = $categoryResource;
         $this->storeManager = $storeManager;
+        $this->metadataPool = $metadataPool;
     }
 
     /**
@@ -61,10 +70,21 @@ public function __construct(
     public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
     {
         $existingData = $category->toFlatArray();
+
         /** 'available_sort_by' should be set separately because fields of array type are destroyed by toFlatArray() */
         $existingData['available_sort_by'] = $category->getAvailableSortBy();
+
         if ($category->getId()) {
+            $metadata = $this->metadataPool->getMetadata(
+                CategoryInterface::class
+            );
+
             $existingCategory = $this->get($category->getId());
+
+            $existingData[$metadata->getLinkField()] = $existingCategory->getData(
+                $metadata->getLinkField()
+            );
+
             if (isset($existingData['image']) && is_array($existingData['image'])) {
                 $existingData['image_additional_data'] = $existingData['image'];
                 unset($existingData['image']);

app/code/Magento/Catalog/Model/CategoryRepository.php

@@ -11,6 +11,7 @@
 
 /**
  * Class FlatTableBuilder
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FlatTableBuilder
 {
@@ -279,7 +280,7 @@ protected function _fillTemporaryFlatTable(array $tables, $storeId, $valueFieldS
             if (!empty($columnValueNames)) {
                 $select->joinLeft(
                     $temporaryValueTableName,
-                    "e.${linkField} = " . $temporaryValueTableName . ".${linkField}",
+                    "e.${linkField} = " . $temporaryValueTableName . ".entity_id",
                     $columnValueNames
                 );
                 $allColumns = array_merge($allColumns, $columnValueNames);

app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php

@@ -378,11 +378,11 @@ protected function _reindexRows($changedIds = [])
         if (!empty($notCompositeIds)) {
             $select = $this->_connection->select()->from(
                 ['l' => $this->_defaultIndexerResource->getTable('catalog_product_relation')],
-                'parent_id'
+                ''
             )->join(
                 ['e' => $this->_defaultIndexerResource->getTable('catalog_product_entity')],
-                'e.entity_id = l.parent_id',
-                ['type_id']
+                'e.' . $this->getProductIdFieldName() . ' = l.parent_id',
+                ['e.entity_id as parent_id', 'type_id']
             )->where(
                 'l.child_id IN(?)',
                 $notCompositeIds
@@ -422,11 +422,15 @@ protected function _reindexRows($changedIds = [])
      */
     protected function _copyRelationIndexData($parentIds, $excludeIds = null)
     {
+        $linkField = $this->getProductIdFieldName();
         $select = $this->_connection->select()->from(
             $this->_defaultIndexerResource->getTable('catalog_product_relation'),
             ['child_id']
+        )->join(
+            ['e' => $this->_defaultIndexerResource->getTable('catalog_product_entity')],
+            'e.' . $linkField . ' = parent_id'
         )->where(
-            'parent_id IN(?)',
+            'e.entity_id IN(?)',
             $parentIds
         );
         if (!empty($excludeIds)) {

app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php

@@ -113,27 +113,20 @@ protected function _clearUselessAttributeValues(\Magento\Framework\Model\Abstrac
     /**
      * Delete entity
      *
-     * @param \Magento\Framework\Model\AbstractModel $object
+     * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $object
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function deleteEntity(\Magento\Framework\Model\AbstractModel $object)
+    public function deleteEntity(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $object)
     {
         if (!$object->getEntityAttributeId()) {
             return $this;
         }
 
-        $select = $this->getConnection()->select()->from(
-            $this->getTable('eav_entity_attribute')
-        )->where(
-            'entity_attribute_id = ?',
-            (int)$object->getEntityAttributeId()
-        );
-        $result = $this->getConnection()->fetchRow($select);
-
+        $result = $this->getEntityAttribute($object->getEntityAttributeId());
         if ($result) {
             $attribute = $this->_eavConfig->getAttribute(
-                \Magento\Catalog\Model\Product::ENTITY,
+                $object->getEntityTypeId(),
                 $result['attribute_id']
             );