Merge branch '2.4-develop' into 28200_custom_attribute

Author: Shikha Mishra

app/code/Magento/Backend/Block/Widget/Grid/Column.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Block\Widget\Grid;
 
 use Magento\Backend\Block\Widget;
@@ -46,7 +47,7 @@ class Column extends Widget
     protected $_cssClass = null;
 
     /**
-     * Renderer types
+     * The renderer types
      *
      * @var array
      */
@@ -74,7 +75,7 @@ class Column extends Widget
     ];
 
     /**
-     * Filter types
+     * The filter types
      *
      * @var array
      */
@@ -103,6 +104,8 @@ class Column extends Widget
     protected $_isGrouped = false;
 
     /**
+     * Set property is grouped.
+     *
      * @return void
      */
     public function _construct()
@@ -169,7 +172,8 @@ public function getHtmlProperty()
     }
 
     /**
-     * Get Header html
+     * This method get Header html.
+     *
      * @return string
      */
     public function getHeaderHtml()
@@ -222,7 +226,8 @@ public function setSortable($value)
     }
 
     /**
-     * Get header css class name
+     * Get header css class name.
+     *
      * @return string
      */
     public function getHeaderCssClass()
@@ -234,6 +239,8 @@ public function getHeaderCssClass()
     }
 
     /**
+     * This method check if is sortable.
+     *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
@@ -256,6 +263,7 @@ public function addHeaderCssClass($className)
 
     /**
      * Get header class names
+     *
      * @return string
      */
     public function getHeaderHtmlProperty()
@@ -291,6 +299,7 @@ public function getRowField(\Magento\Framework\DataObject $row)
         $frameCallback = $this->getFrameCallback();
         if (is_array($frameCallback)) {
             $this->validateFrameCallback($frameCallback);
+            //phpcs:ignore Magento2.Functions.DiscouragedFunction
             $renderedValue = call_user_func($frameCallback, $renderedValue, $row, $this, false);
         }
 
@@ -334,6 +343,7 @@ public function getRowFieldExport(\Magento\Framework\DataObject $row)
         $frameCallback = $this->getFrameCallback();
         if (is_array($frameCallback)) {
             $this->validateFrameCallback($frameCallback);
+            //phpcs:ignore Magento2.Functions.DiscouragedFunction
             $renderedValue = call_user_func($frameCallback, $renderedValue, $row, $this, true);
         }
 
@@ -412,12 +422,8 @@ public function setRendererType($type, $className)
      */
     protected function _getRendererByType()
     {
-        $type = strtolower($this->getType());
-        $rendererClass = isset(
-            $this->_rendererTypes[$type]
-        ) ? $this->_rendererTypes[$type] : $this->_rendererTypes['default'];
-
-        return $rendererClass;
+        $type = strtolower((string) $this->getType());
+        return $this->_rendererTypes[$type] ?? $this->_rendererTypes['default'];
     }
 
     /**
@@ -469,10 +475,8 @@ public function setFilterType($type, $className)
      */
     protected function _getFilterByType()
     {
-        $type = $this->getFilterType() ? strtolower($this->getFilterType()) : strtolower($this->getType());
-        $filterClass = isset($this->_filterTypes[$type]) ? $this->_filterTypes[$type] : $this->_filterTypes['default'];
-
-        return $filterClass;
+        $type = $this->getFilterType() ? strtolower($this->getFilterType()) : strtolower((string) $this->getType());
+        return $this->_filterTypes[$type] ?? $this->_filterTypes['default'];
     }
 
     /**

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

@@ -233,7 +233,7 @@ protected function _convertDate($date)
             \IntlDateFormatter::NONE,
             $adminTimeZone
         );
-        $simpleRes = new \DateTime(null, $adminTimeZone);
+        $simpleRes = new \DateTime('now', $adminTimeZone);
         $simpleRes->setTimestamp($formatter->parse($date));
         $simpleRes->setTime(0, 0, 0);
         $simpleRes->setTimezone(new \DateTimeZone('UTC'));

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Concat.php

@@ -30,11 +30,12 @@ public function render(\Magento\Framework\DataObject $row)
                 && is_callable([$row, $method])
                 && substr_compare('get', $method, 1, 3) !== 0
             ) {
+                //phpcs:ignore Magento2.Functions.DiscouragedFunction
                 $data = call_user_func([$row, $method]);
             } else {
                 $data = $row->getData($method);
             }
-            if (strlen($data) > 0) {
+            if (strlen((string) $data) > 0) {
                 $dataArr[] = $data;
             }
         }

app/code/Magento/Bundle/Model/Option/Validator.php

@@ -26,7 +26,10 @@ public function __construct(NotEmptyFactory $notEmptyFactory)
     }
 
     /**
+     * This method check is valid value.
+     *
      * @param \Magento\Bundle\Model\Option $value
+     *
      * @return boolean
      * @throws Zend_Validate_Exception If validation of $value is impossible
      */
@@ -38,10 +41,12 @@ public function isValid($value)
     }
 
     /**
+     * This method  validate required fields.
+     *
      * @param \Magento\Bundle\Model\Option $value
+     *
      * @return void
-     * @throws Zend_Validate_Exception
-     * @throws \Exception
+     * @throws \Exception|Zend_Validate_Exception
      */
     protected function validateRequiredFields($value)
     {
@@ -51,7 +56,7 @@ protected function validateRequiredFields($value)
             'type' => $value->getType()
         ];
         foreach ($requiredFields as $requiredField => $requiredValue) {
-            if (!$this->notEmpty->isValid(trim($requiredValue))) {
+            if (!$this->notEmpty->isValid(trim((string) $requiredValue))) {
                 $messages[$requiredField] =
                     __('"%fieldName" is required. Enter and try again.', ['fieldName' => $requiredField]);
             }