Merge pull request #8640 from magento-l3/Tier4-PR-Delivery-11-18-23

Tier4 PR Delivery 11.18.23

Author: dhorytskyi

app/code/Magento/Catalog/Helper/Product/View.php

@@ -130,14 +130,7 @@ private function preparePageMetadata(ResultPage $resultPage, $product)
             $pageConfig->setKeywords($product->getName());
         }
 
-        $description = $product->getMetaDescription();
-        if ($description) {
-            $pageConfig->setDescription($description);
-        } else {
-            $productDescription = is_string($product->getDescription()) ?
-                $this->string->substr(strip_tags($product->getDescription()), 0, 255) : '';
-            $pageConfig->setDescription($productDescription);
-        }
+        $pageConfig->setDescription($product->getMetaDescription());
 
         if ($this->_catalogProduct->canUseCanonicalTag()) {
             $pageConfig->addRemotePageAsset(

app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/Validation.php

@@ -49,15 +49,19 @@ public function afterValidate(Rule $rule, $validateResult, DataObject $product)
     {
         if (!$validateResult && ($configurableProducts = $this->configurable->getParentIdsByChild($product->getId()))) {
             foreach ($configurableProducts as $configurableProductId) {
-                $configurableProduct = $this->productRepository->getById(
-                    $configurableProductId,
-                    false,
-                    $product->getStoreId()
-                );
-                $validateResult = $rule->getConditions()->validate($configurableProduct);
-                // If any of configurable product is valid for current rule, then their sub-product must be valid too
-                if ($validateResult) {
-                    break;
+                try {
+                    $configurableProduct = $this->productRepository->getById(
+                        $configurableProductId,
+                        false,
+                        $product->getStoreId()
+                    );
+                    $validateResult = $rule->getConditions()->validate($configurableProduct);
+                    //If any of configurable product is valid for current rule, then their sub-product must be valid too
+                    if ($validateResult) {
+                        break;
+                    }
+                } catch (\Exception $e) {
+                    continue;
                 }
             }
         }

app/code/Magento/CatalogRuleConfigurable/Test/Unit/Plugin/CatalogRule/Model/Rule/ValidationTest.php

@@ -66,6 +66,32 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * @return void
+     */
+    public function testAfterValidateConfigurableProductException(): void
+    {
+        $validationResult = false;
+        $parentsIds = [2];
+        $productId = 1;
+
+        $this->productMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($productId);
+        $this->configurableMock->expects($this->once())
+            ->method('getParentIdsByChild')
+            ->with($productId)
+            ->willReturn($parentsIds);
+        $this->productRepositoryMock->expects($this->once())
+            ->method('getById')
+            ->willThrowException(new \Exception('Faulty configurable product'));
+
+        $this->assertSame(
+            $validationResult,
+            $this->validation->afterValidate($this->ruleMock, $validationResult, $this->productMock)
+        );
+    }
+
     /**
      * @param $parentsIds
      * @param $validationResult

app/code/Magento/Customer/Controller/Account/EditPost.php

@@ -16,6 +16,7 @@
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Customer\Model\Customer\Mapper;
 use Magento\Customer\Model\EmailNotificationInterface;
+use Magento\Customer\Model\Metadata\Form\File;
 use Magento\Framework\App\CsrfAwareActionInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Request\InvalidRequestException;
@@ -136,6 +137,7 @@ class EditPost extends AbstractAccount implements CsrfAwareActionInterface, Http
      * @param SessionCleanerInterface|null $sessionCleaner
      * @param AccountConfirmation|null $accountConfirmation
      * @param Url|null $customerUrl
+     * @param Mapper|null $customerMapper
      */
     public function __construct(
         Context $context,
@@ -149,7 +151,8 @@ public function __construct(
         ?Filesystem $filesystem = null,
         ?SessionCleanerInterface $sessionCleaner = null,
         ?AccountConfirmation $accountConfirmation = null,
-        ?Url $customerUrl = null
+        ?Url $customerUrl = null,
+        ?Mapper $customerMapper = null
     ) {
         parent::__construct($context);
         $this->session = $customerSession;
@@ -164,6 +167,7 @@ public function __construct(
         $this->accountConfirmation = $accountConfirmation ?: ObjectManager::getInstance()
             ->get(AccountConfirmation::class);
         $this->customerUrl = $customerUrl ?: ObjectManager::getInstance()->get(Url::class);
+        $this->customerMapper = $customerMapper ?: ObjectManager::getInstance()->get(Mapper::class);
     }
 
     /**
@@ -233,9 +237,15 @@ public function execute()
             $customer = $this->getCustomerDataObject($this->session->getCustomerId());
             $customerCandidate = $this->populateNewCustomerDataObject($this->_request, $customer);
 
-            $attributeToDelete = $this->_request->getParam('delete_attribute_value');
-            if ($attributeToDelete !== null) {
-                $this->deleteCustomerFileAttribute($customerCandidate, $attributeToDelete);
+            $attributeToDelete = (string)$this->_request->getParam('delete_attribute_value');
+            if ($attributeToDelete !== "") {
+                $attributesToDelete = $this->prepareAttributesToDelete($attributeToDelete);
+                foreach ($attributesToDelete as $attribute) {
+                    $uploadedValue = $this->_request->getParam($attribute . File::UPLOADED_FILE_SUFFIX);
+                    if ((string)$uploadedValue === "") {
+                        $this->deleteCustomerFileAttribute($customerCandidate, $attribute);
+                    }
+                }
             }
 
             try {
@@ -300,6 +310,26 @@ public function execute()
         return $resultRedirect;
     }
 
+    /**
+     * Convert comma-separated list of attributes to delete into array
+     *
+     * @param string $attribute
+     * @return array
+     */
+    private function prepareAttributesToDelete(string $attribute) : array
+    {
+        $result = [];
+        if ($attribute !== "") {
+            if (str_contains($attribute, ',')) {
+                $result = explode(',', $attribute);
+            } else {
+                $result[] = $attribute;
+            }
+            $result = array_unique($result);
+        }
+        return $result;
+    }
+
     /**
      * Adds a complex success message if email confirmation is required
      *
@@ -468,11 +498,7 @@ private function deleteCustomerFileAttribute(
         string $attributeToDelete
     ) : void {
         if ($attributeToDelete !== '') {
-            if (strpos($attributeToDelete, ',') !== false) {
-                $attributes = explode(',', $attributeToDelete);
-            } else {
-                $attributes[] = $attributeToDelete;
-            }
+            $attributes = $this->prepareAttributesToDelete($attributeToDelete);
             foreach ($attributes as $attr) {
                 $attributeValue = $customerCandidateDataObject->getCustomAttribute($attr);
                 if ($attributeValue!== null) {