Merge pull request #7979 from magento-cia/cia-2.4.6-develop-bugfixes-11102022

Cia 2.4.6 develop bugfixes 11102022

Author: mmansoor-magento

app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php

@@ -17,7 +17,7 @@ class Group extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
     /**
      * @inheritDoc
      */
-    public function render(DataObject $row): ?string
+    public function render(DataObject $row)
     {
         if (!$row->getData($this->getColumn()->getIndex())) {
             return null;

app/code/Magento/Store/Model/Group.php

@@ -176,12 +176,9 @@ protected function _construct()
     }
 
     /**
-     * Validation rules for store
-     *
-     * @return \Zend_Validate_Interface|null
-     * @throws \Zend_Validate_Exception
+     * @inheritdoc
      */
-    protected function _getValidationRulesBeforeSave(): ?\Zend_Validate_Interface
+    protected function _getValidationRulesBeforeSave()
     {
         return $this->modelValidator;
     }