🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #19340: [Backport] Fix the issue: Content overlaps the close button #19263 (by @gelanivishal)
 - #19336: [Backport] small performance improvement on product listing (by @gelanivishal)
 - #19337: [Backport] 19082-Fatal-error-Uncaught-Error-Cannot-call-abstract-method-Magento-� (by @agorbulin)
 - #19338: [Backport] missing use statement in layout generator (by @gelanivishal)
 - #19068: Using Media Image custom attribute type could not display on frontend. #19054 (by @Nazar65)


Fixed GitHub Issues:
 - #19263: Broken backend popup view (reported by @dmytro-ch) has been fixed in #19340 by @gelanivishal in 2.2-develop branch
   Related commits:
     1. 27c265d
     2. 4b70893

 - #19082: Fatal error: Uncaught Error: Cannot call abstract method Magento\Framework\App\ActionInterface::execute() (reported by @kanhaiya5590) has been fixed in #19337 by @agorbulin in 2.2-develop branch
   Related commits:
     1. 20922a0

 - #19054: Using Media Image custom attribute type  could not display on frontend.  (reported by @nimitaemipro) has been fixed in #19068 by @Nazar65 in 2.2-develop branch
   Related commits:
     1. e3134ea

Author: VladimirZaets

app/code/Magento/Catalog/Controller/Product/Compare.php

@@ -139,4 +139,12 @@ public function setCustomerId($customerId)
         $this->_customerId = $customerId;
         return $this;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute()
+    {
+        return $this->_redirect('catalog/product_compare');
+    }
 }

app/code/Magento/Eav/Model/Entity/Attribute.php

@@ -287,6 +287,12 @@ public function beforeSave()
             }
         }
 
+        if ($this->getFrontendInput() == 'media_image') {
+            if (!$this->getFrontendModel()) {
+                $this->setFrontendModel(\Magento\Catalog\Model\Product\Attribute\Frontend\Image::class);
+            }
+        }
+
         if ($this->getBackendType() == 'gallery') {
             if (!$this->getBackendModel()) {
                 $this->setBackendModel(\Magento\Eav\Model\Entity\Attribute\Backend\DefaultBackend::class);

app/code/Magento/Review/Model/Review.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Review\Model;
 
+use Magento\Framework\DataObject;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Review\Model\ResourceModel\Review\Product\Collection as ProductCollection;
@@ -327,6 +328,9 @@ public function appendSummary($collection)
                     $item->setRatingSummary($summary);
                 }
             }
+            if (!$item->getRatingSummary()) {
+                $item->setRatingSummary(new DataObject());
+            }
         }
 
         return $this;

lib/internal/Magento/Framework/View/Layout/Generator/Block.php

@@ -6,6 +6,7 @@
 namespace Magento\Framework\View\Layout\Generator;
 
 use Magento\Framework\App\State;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\ObjectManager\Config\Reader\Dom;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Layout;
@@ -272,7 +273,7 @@ protected function getBlockInstance($block, array $arguments = [])
             }
         }
         if (!$block instanceof \Magento\Framework\View\Element\AbstractBlock) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 new \Magento\Framework\Phrase(
                     'Invalid block type: %1',
                     [is_object($block) ? get_class($block) : (string) $block]

lib/web/css/source/components/_modals.less

@@ -103,6 +103,10 @@
     &.confirm {
         .modal-inner-wrap {
             .lib-css(width, @modal-popup-confirm__width);
+
+            .modal-content {
+                padding-right: 7rem;
+            }
         }
     }