Merge branch 'MAGETWO-94077' into mpi-forwardport-0309

Author: Mariana

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -768,7 +768,7 @@ public function addWebsiteNamesToResult()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -819,6 +819,7 @@ protected function doAddWebsiteNamesToResult()
         foreach ($this as $product) {
             if (isset($productWebsites[$product->getId()])) {
                 $product->setData('websites', $productWebsites[$product->getId()]);
+                $product->setData('website_ids', $productWebsites[$product->getId()]);
             }
         }
         return $this;
@@ -1115,11 +1116,11 @@ public function getSelectCountSql()
     /**
      * Get SQL for get record count
      *
-     * @param null $select
+     * @param Select $select
      * @param bool $resetLeftJoins
-     * @return \Magento\Framework\DB\Select
+     * @return Select
      */
-    protected function _getSelectCountSql($select = null, $resetLeftJoins = true)
+    protected function _getSelectCountSql(?Select $select = null, $resetLeftJoins = true)
     {
         $this->_renderFilters();
         $countSelect = $select === null ? $this->_getClearSelect() : $this->_buildClearSelect($select);
@@ -1581,7 +1582,7 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     protected function getEntityPkName(\Magento\Eav\Model\Entity\AbstractEntity $entity)

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

@@ -290,7 +290,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyMeta(array $meta)
@@ -401,7 +401,7 @@ public function getContainerChildren(ProductAttributeInterface $attribute, $grou
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyData(array $data)
@@ -944,6 +944,9 @@ private function canDisplayUseDefault(ProductAttributeInterface $attribute)
         $attributeCode = $attribute->getAttributeCode();
         /** @var Product $product */
         $product = $this->locator->getProduct();
+        if ($product->isLockedAttribute($attributeCode)) {
+            return false;
+        }
 
         if (isset($this->canDisplayUseDefault[$attributeCode])) {
             return $this->canDisplayUseDefault[$attributeCode];

dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_two_websites_rollback.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Catalog\Api\Data\ProductInterface;
-
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
 /** @var \Magento\Framework\Registry $registry */
@@ -15,16 +13,18 @@
 $registry->register("isSecureArea", true);
 
 /** @var Magento\Store\Model\Website $website */
-$website = $objectManager->create(\Magento\Store\Model\Website::class);
-$website->load('second_website');
-$website->delete();
+$website = $objectManager->get(Magento\Store\Model\Website::class);
+$website->load('second_website', 'code');
+if ($website->getId()) {
+    $website->delete();
+}
 
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 
 try {
     $firstProduct = $productRepository->get('unique-simple-azaza');
-    $firstProduct->delete();
+    $productRepository->delete($firstProduct);
 } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
     //Product already removed
 }