Merge pull request #82 from magento-dragons/PR-P1

[DRAGONS] BugFix (P1)
magento · Jun 9, 2016 · 26630f7 · 26630f7
2 parents 66883d5 + 19181c3
commit 26630f7
Show file tree

Hide file tree

Showing 30 changed files with 159 additions and 372 deletions.
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -15,7 +15,9 @@
 
 use Magento\Backend\Block\Widget\Form\Generic;
 use Magento\Config\Model\Config\Source\Yesno;
+use Magento\Eav\Block\Adminhtml\Attribute\PropertyLocker;
 use Magento\Eav\Helper\Data;
+use Magento\Framework\App\ObjectManager;
 
 class Advanced extends Generic
 {
@@ -36,6 +38,11 @@ class Advanced extends Generic
      */
     protected $disableScopeChangeList;
 
+    /**
+     * @var PropertyLocker
+     */
+    private $propertyLocker;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -241,6 +248,7 @@ protected function _prepareForm()
             $form->getElement('is_global')->setDisabled(1);
         }
         $this->setForm($form);
+        $this->getPropertyLocker()->lock($form);
         return $this;
     }
 
@@ -264,4 +272,17 @@ private function getAttributeObject()
     {
         return $this->_coreRegistry->registry('entity_attribute');
     }
+
+    /**
+     * Get property locker
+     *
+     * @return PropertyLocker
+     */
+    private function getPropertyLocker()
+    {
+        if (null === $this->propertyLocker) {
+            $this->propertyLocker = ObjectManager::getInstance()->get(PropertyLocker::class);
+        }
+        return $this->propertyLocker;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Status.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Status.php
@@ -95,13 +95,14 @@ public function addValueSortToCollection($collection, $dir = 'asc')
         $attributeCode = $this->getAttribute()->getAttributeCode();
         $attributeId = $this->getAttribute()->getId();
         $attributeTable = $this->getAttribute()->getBackend()->getTable();
+        $linkField = $this->getAttribute()->getEntity()->getLinkField();
 
         if ($this->getAttribute()->isScopeGlobal()) {
             $tableName = $attributeCode . '_t';
 
             $collection->getSelect()->joinLeft(
                 [$tableName => $attributeTable],
-                "e.entity_id={$tableName}.entity_id" .
+                "e.{$linkField}={$tableName}.{$linkField}" .
                 " AND {$tableName}.attribute_id='{$attributeId}'" .
                 " AND {$tableName}.store_id='0'",
                 []
@@ -114,13 +115,13 @@ public function addValueSortToCollection($collection, $dir = 'asc')
 
             $collection->getSelect()->joinLeft(
                 [$valueTable1 => $attributeTable],
-                "e.entity_id={$valueTable1}.entity_id" .
+                "e.{$linkField}={$valueTable1}.{$linkField}" .
                 " AND {$valueTable1}.attribute_id='{$attributeId}'" .
                 " AND {$valueTable1}.store_id='0'",
                 []
             )->joinLeft(
                 [$valueTable2 => $attributeTable],
-                "e.entity_id={$valueTable2}.entity_id" .
+                "e.{$linkField}={$valueTable2}.{$linkField}" .
                 " AND {$valueTable2}.attribute_id='{$attributeId}'" .
                 " AND {$valueTable2}.store_id='{$collection->getStoreId()}'",
                 []

diff --git a/app/code/Magento/Catalog/Model/Product/Visibility.php b/app/code/Magento/Catalog/Model/Product/Visibility.php
@@ -211,12 +211,13 @@ public function addValueSortToCollection($collection, $dir = 'asc')
         $attributeCode = $this->getAttribute()->getAttributeCode();
         $attributeId = $this->getAttribute()->getId();
         $attributeTable = $this->getAttribute()->getBackend()->getTable();
+        $linkField = $this->getAttribute()->getEntity()->getLinkField();
 
         if ($this->getAttribute()->isScopeGlobal()) {
             $tableName = $attributeCode . '_t';
             $collection->getSelect()->joinLeft(
                 [$tableName => $attributeTable],
-                "e.entity_id={$tableName}.entity_id" .
+                "e.{$linkField}={$tableName}.{$linkField}" .
                 " AND {$tableName}.attribute_id='{$attributeId}'" .
                 " AND {$tableName}.store_id='0'",
                 []
@@ -227,13 +228,13 @@ public function addValueSortToCollection($collection, $dir = 'asc')
             $valueTable2 = $attributeCode . '_t2';
             $collection->getSelect()->joinLeft(
                 [$valueTable1 => $attributeTable],
-                "e.entity_id={$valueTable1}.entity_id" .
+                "e.{$linkField}={$valueTable1}.{$linkField}" .
                 " AND {$valueTable1}.attribute_id='{$attributeId}'" .
                 " AND {$valueTable1}.store_id='0'",
                 []
             )->joinLeft(
                 [$valueTable2 => $attributeTable],
-                "e.entity_id={$valueTable2}.entity_id" .
+                "e.{$linkField}={$valueTable2}.{$linkField}" .
                 " AND {$valueTable2}.attribute_id='{$attributeId}'" .
                 " AND {$valueTable2}.store_id='{$collection->getStoreId()}'",
                 []

diff --git a/app/code/Magento/Catalog/Setup/CategorySetup.php b/app/code/Magento/Catalog/Setup/CategorySetup.php
@@ -738,6 +738,9 @@ public function getDefaultEntities()
                         'sort_order' => 9,
                         'visible' => true,
                         'group' => 'General',
+                        'is_used_in_grid' => false,
+                        'is_visible_in_grid' => false,
+                        'is_filterable_in_grid' => false,
                     ],
                     'options_container' => [
                         'type' => 'varchar',

diff --git a/...ode/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/Tab/AdvancedTest.php b/...ode/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/Tab/AdvancedTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Test\Unit\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
+use Magento\Eav\Block\Adminhtml\Attribute\PropertyLocker;
+
 class AdvancedTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -42,6 +44,11 @@ class AdvancedTest extends \PHPUnit_Framework_TestCase
      */
     protected $filesystem;
 
+    /**
+     * @var PropertyLocker|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $propertyLocker;
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -51,6 +58,7 @@ protected function setUp()
         $this->localeDate = $this->getMock('Magento\Framework\Stdlib\DateTime\TimezoneInterface');
         $this->eavData = $this->getMock('Magento\Eav\Helper\Data', [], [], '', false);
         $this->filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
+        $this->propertyLocker = $this->getMock(PropertyLocker::class, [], [], '', false);
 
         $this->block = $objectManager->getObject(
             'Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Advanced',
@@ -60,7 +68,8 @@ protected function setUp()
                 'localeDate' => $this->localeDate,
                 'yesNo' => $this->yesNo,
                 'eavData' => $this->eavData,
-                'filesystem' => $this->filesystem
+                'filesystem' => $this->filesystem,
+                'propertyLocker' => $this->propertyLocker,
             ]
         );
     }
@@ -93,6 +102,7 @@ public function testToHtml()
         $this->yesNo->expects($this->any())->method('toOptionArray')->willReturn(['yes', 'no']);
         $this->filesystem->expects($this->any())->method('getDirectoryRead')->willReturn($directoryReadInterface);
         $directoryReadInterface->expects($this->any())->method('getRelativePath')->willReturn('relative_path');
+        $this->propertyLocker->expects($this->once())->method('lock')->with($form);
 
         $this->block->setData(['action' => 'save']);
         $this->block->toHtml();

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Source/StatusTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Source/StatusTest.php
@@ -8,6 +8,7 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Product\Attribute\Source;
 
+use Magento\Eav\Model\Entity\AbstractEntity;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class StatusTest extends \PHPUnit_Framework_TestCase
@@ -27,6 +28,11 @@ class StatusTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend|\PHPUnit_Framework_MockObject_MockObject */
     protected $backendAttributeModel;
 
+    /**
+     * @var AbstractEntity|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $entity;
+
     protected function setUp()
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
@@ -53,6 +59,7 @@ protected function setUp()
                 'getBackend',
                 'getId',
                 'isScopeGlobal',
+                'getEntity',
             ],
             [],
             '',
@@ -78,6 +85,11 @@ protected function setUp()
             ->will($this->returnSelf());
         $this->backendAttributeModel->expects($this->any())->method('getTable')
             ->will($this->returnValue('table_name'));
+
+        $this->entity = $this->getMockBuilder(AbstractEntity::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getLinkField'])
+            ->getMockForAbstractClass();
     }
 
     public function testAddValueSortToCollectionGlobal()
@@ -87,6 +99,9 @@ public function testAddValueSortToCollectionGlobal()
         $this->collection->expects($this->once())->method('order')->with('attribute_code_t.value asc')
             ->will($this->returnSelf());
 
+        $this->attributeModel->expects($this->once())->method('getEntity')->willReturn($this->entity);
+        $this->entity->expects($this->once())->method('getLinkField')->willReturn('entity_id');
+
         $this->status->setAttribute($this->attributeModel);
         $this->status->addValueSortToCollection($this->collection);
     }
@@ -105,6 +120,9 @@ public function testAddValueSortToCollectionNotGlobal()
         $this->collection->expects($this->any())->method('getCheckSql')
             ->will($this->returnValue('check_sql'));
 
+        $this->attributeModel->expects($this->any())->method('getEntity')->willReturn($this->entity);
+        $this->entity->expects($this->once())->method('getLinkField')->willReturn('entity_id');
+
         $this->status->setAttribute($this->attributeModel);
         $this->status->addValueSortToCollection($this->collection);
     }

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/AddWebsitesFieldToCollection.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/AddWebsitesFieldToCollection.php
@@ -18,6 +18,7 @@ class AddWebsitesFieldToCollection implements AddFieldToCollectionInterface
      */
     public function addField(Collection $collection, $field, $alias = null)
     {
-         $collection->addWebsiteNamesToResult();
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
+        $collection->addWebsiteNamesToResult();
     }
 }
diff --git a/app/code/Magento/Catalog/etc/catalog_attributes.xml b/app/code/Magento/Catalog/etc/catalog_attributes.xml
@@ -45,7 +45,6 @@
         <attribute name="default_sort_by" />
         <attribute name="filter_price_range" />
         <attribute name="image" />
-        <attribute name="category_ids" />
         <attribute name="media_gallery_content" />
         <attribute name="tier_price" />
         <attribute name="gift_message_available" />

diff --git a/app/code/Magento/Catalog/etc/eav_attributes.xml b/app/code/Magento/Catalog/etc/eav_attributes.xml
@@ -32,6 +32,9 @@
         <attribute code="category_ids">
             <field code="is_searchable" locked="true" />
             <field code="used_for_sort_by" locked="true" />
+            <field code="is_used_in_grid" locked="true" />
+            <field code="is_visible_in_grid" locked="true" />
+            <field code="is_filterable_in_grid" locked="true" />
         </attribute>
         <attribute code="media_gallery">
             <field code="is_searchable" locked="true" />

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Boolean.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Boolean.php
@@ -155,13 +155,14 @@ public function addValueSortToCollection($collection, $dir = \Magento\Framework\
         $attributeCode = $this->getAttribute()->getAttributeCode();
         $attributeId = $this->getAttribute()->getId();
         $attributeTable = $this->getAttribute()->getBackend()->getTable();
+        $linkField = $this->getAttribute()->getEntity()->getLinkField();
 
         if ($this->getAttribute()->isScopeGlobal()) {
             $tableName = $attributeCode . '_t';
             $collection->getSelect()
                 ->joinLeft(
                     [$tableName => $attributeTable],
-                    "e.entity_id={$tableName}.entity_id"
+                    "e.{$linkField}={$tableName}.{$linkField}"
                     . " AND {$tableName}.attribute_id='{$attributeId}'"
                     . " AND {$tableName}.store_id='0'",
                     []
@@ -173,14 +174,14 @@ public function addValueSortToCollection($collection, $dir = \Magento\Framework\
             $collection->getSelect()
                 ->joinLeft(
                     [$valueTable1 => $attributeTable],
-                    "e.entity_id={$valueTable1}.entity_id"
+                    "e.{$linkField}={$valueTable1}.{$linkField}"
                     . " AND {$valueTable1}.attribute_id='{$attributeId}'"
                     . " AND {$valueTable1}.store_id='0'",
                     []
                 )
                 ->joinLeft(
                     [$valueTable2 => $attributeTable],
-                    "e.entity_id={$valueTable2}.entity_id"
+                    "e.{$linkField}={$valueTable2}.{$linkField}"
                     . " AND {$valueTable2}.attribute_id='{$attributeId}'"
                     . " AND {$valueTable2}.store_id='{$collection->getStoreId()}'",
                     []

diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
@@ -8,6 +8,7 @@
 
 namespace Magento\Eav\Test\Unit\Model\Entity\Attribute\Source;
 
+use Magento\Eav\Model\Entity\AbstractEntity;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class BooleanTest extends \PHPUnit_Framework_TestCase
@@ -67,6 +68,13 @@ public function testAddValueSortToCollection(
         $attributeMock = $this->getAttributeMock();
         $attributeMock->expects($this->any())->method('isScopeGlobal')->will($this->returnValue($isScopeGlobal));
 
+        $entity = $this->getMockBuilder(AbstractEntity::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getLinkField'])
+            ->getMockForAbstractClass();
+        $entity->expects($this->once())->method('getLinkField')->willReturn('entity_id');
+        $attributeMock->expects($this->once())->method('getEntity')->willReturn($entity);
+
         $selectMock = $this->getMock('\Magento\Framework\DB\Select', [], [], '', false);
 
         $collectionMock = $this->getCollectionMock();
@@ -173,7 +181,7 @@ protected function getCollectionMock()
      */
     protected function getAttributeMock()
     {
-        $attributeMockMethods = ['getAttributeCode', 'getId', 'getBackend', 'isScopeGlobal', '__wakeup'];
+        $attributeMockMethods = ['getAttributeCode', 'getId', 'getBackend', 'isScopeGlobal', '__wakeup' , 'getEntity'];
         $attributeMock = $this->getMock(
             '\Magento\Eav\Model\Entity\Attribute\AbstractAttribute', $attributeMockMethods, [], '', false
         );

diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -542,7 +542,10 @@ define([
          */
         _OnChange: function ($this, $widget) {
             var $parent = $this.parents('.' + $widget.options.classes.attributeClass),
-                $input = $parent.find('.' + $widget.options.classes.attributeInput);
+                attributeId = $parent.attr('attribute-id'),
+                $input = $widget.productForm.find(
+                    '.' + $widget.options.classes.attributeInput + '[name="super_attribute[' + attributeId + ']"]'
+                );
 
             if ($this.val() > 0) {
                 $parent.attr('option-selected', $this.val());

diff --git a/...ests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php b/...ests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php
@@ -67,18 +67,12 @@ public function testPricesSegmentation($categoryId, array $entityIds, array $int
             ['entityMetadata' => $entityMetadata]
         );
 
-        /** @var \Magento\Framework\Search\Document[] $documents */
+        /** @var \Magento\Framework\Api\Search\Document[] $documents */
         $documents = [];
         foreach ($entityIds as $entityId) {
             $rawDocument = [
-                [
-                    'name' => $idKey,
-                    'value' => $entityId,
-                ],
-                [
-                    'name' => 'score',
-                    'value' => 1,
-                ],
+                $idKey => $entityId,
+                'score' => 1,
             ];
             $documents[] = $documentFactory->create($rawDocument);
         }

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php
@@ -110,7 +110,7 @@ private function assertProductIds($queryResponse, $expectedIds)
     {
         $actualIds = [];
         foreach ($queryResponse as $document) {
-            /** @var \Magento\Framework\Search\Document $document */
+            /** @var \Magento\Framework\Api\Search\Document $document */
             $actualIds[] = $document->getId();
         }
         sort($actualIds);

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -4223,4 +4223,6 @@
     ['Magento\Braintree\Test\Unit\Observer\ProcessBraintreePaymentTest'],
     ['Magento\Catalog\Model\Webapi\Product\Option\Type\File\Validator'],
     ['Magento\Catalog\Test\Unit\Webapi\Product\Option\Type\File\ValidatorTest'],
+    ['Magento\Framework\Search\Document', 'Magento\Framework\Api\Search\Document'],
+    ['Magento\Framework\Search\DocumentField'],
 ];