ENGCOM-5757: #12371 allows to add handlers via di #24405

Author: VladimirZaets

app/code/Magento/Catalog/Helper/Output.php

@@ -9,9 +9,21 @@
 
 use Magento\Catalog\Model\Category as ModelCategory;
 use Magento\Catalog\Model\Product as ModelProduct;
+use Magento\Eav\Model\Config;
+use Magento\Framework\App\Helper\AbstractHelper;
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\Escaper;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filter\Template;
+use function is_object;
+use function method_exists;
+use function preg_match;
+use function strtolower;
 
-class Output extends \Magento\Framework\App\Helper\AbstractHelper
+/**
+ * Html output
+ */
+class Output extends AbstractHelper
 {
     /**
      * Array of existing handlers
@@ -37,12 +49,12 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * Eav config
      *
-     * @var \Magento\Eav\Model\Config
+     * @var Config
      */
     protected $_eavConfig;
 
     /**
-     * @var \Magento\Framework\Escaper
+     * @var Escaper
      */
     protected $_escaper;
 
@@ -53,27 +65,32 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * Output constructor.
-     * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Eav\Model\Config $eavConfig
+     * @param Context $context
+     * @param Config $eavConfig
      * @param Data $catalogData
-     * @param \Magento\Framework\Escaper $escaper
+     * @param Escaper $escaper
      * @param array $directivePatterns
+     * @param array $handlers
      */
     public function __construct(
-        \Magento\Framework\App\Helper\Context $context,
-        \Magento\Eav\Model\Config $eavConfig,
+        Context $context,
+        Config $eavConfig,
         Data $catalogData,
-        \Magento\Framework\Escaper $escaper,
-        $directivePatterns = []
+        Escaper $escaper,
+        $directivePatterns = [],
+        array $handlers = []
     ) {
         $this->_eavConfig = $eavConfig;
         $this->_catalogData = $catalogData;
         $this->_escaper = $escaper;
         $this->directivePatterns = $directivePatterns;
+        $this->_handlers = $handlers;
         parent::__construct($context);
     }
 
     /**
+     * Return template processor
+     *
      * @return Template
      */
     protected function _getTemplateProcessor()
@@ -115,8 +132,7 @@ public function addHandler($method, $handler)
      */
     public function getHandlers($method)
     {
-        $method = strtolower($method);
-        return $this->_handlers[$method] ?? [];
+        return $this->_handlers[strtolower($method)] ?? [];
     }
 
     /**
@@ -145,21 +161,21 @@ public function process($method, $result, $params)
      * @param string $attributeName
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function productAttribute($product, $attributeHtml, $attributeName)
     {
         $attribute = $this->_eavConfig->getAttribute(ModelProduct::ENTITY, $attributeName);
         if ($attribute &&
             $attribute->getId() &&
-            $attribute->getFrontendInput() != 'media_image' &&
+            $attribute->getFrontendInput() !== 'media_image' &&
             (!$attribute->getIsHtmlAllowedOnFront() &&
             !$attribute->getIsWysiwygEnabled())
         ) {
-            if ($attribute->getFrontendInput() != 'price') {
+            if ($attribute->getFrontendInput() !== 'price') {
                 $attributeHtml = $this->_escaper->escapeHtml($attributeHtml);
             }
-            if ($attribute->getFrontendInput() == 'textarea') {
+            if ($attribute->getFrontendInput() === 'textarea') {
                 $attributeHtml = nl2br($attributeHtml);
             }
         }
@@ -187,14 +203,14 @@ public function productAttribute($product, $attributeHtml, $attributeName)
      * @param string $attributeHtml
      * @param string $attributeName
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function categoryAttribute($category, $attributeHtml, $attributeName)
     {
         $attribute = $this->_eavConfig->getAttribute(ModelCategory::ENTITY, $attributeName);
 
         if ($attribute &&
-            $attribute->getFrontendInput() != 'image' &&
+            $attribute->getFrontendInput() !== 'image' &&
             (!$attribute->getIsHtmlAllowedOnFront() &&
             !$attribute->getIsWysiwygEnabled())
         ) {