Removed @Deprecation on Mage::getBlockSingleton() (#3835)

Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>

Author: kiatng

app/Mage.php

@@ -601,10 +601,10 @@ public static function getResourceSingleton($modelClass = '', array $arguments =
     }
 
     /**
-     * @deprecated, use self::helper()
+     * Retrieve block object
      *
      * @param string $type
-     * @return object
+     * @return Mage_Core_Block_Abstract|false
      */
     public static function getBlockSingleton($type)
     {

app/code/core/Mage/Adminhtml/Block/System/Config/Form.php

@@ -50,12 +50,12 @@ class Mage_Adminhtml_Block_System_Config_Form extends Mage_Adminhtml_Block_Widge
     protected $_configFields;
 
     /**
-     * @var Mage_Adminhtml_Block_System_Config_Form_Fieldset
+     * @var Mage_Adminhtml_Block_System_Config_Form_Fieldset|false
      */
     protected $_defaultFieldsetRenderer;
 
     /**
-     * @var Mage_Adminhtml_Block_System_Config_Form_Field
+     * @var Mage_Adminhtml_Block_System_Config_Form_Field|false
      */
     protected $_defaultFieldRenderer;
 
@@ -147,12 +147,10 @@ public function initForm()
      */
     protected function _initGroup($form, $group, $section, $parentElement = null)
     {
-        if ($group->frontend_model) {
-            $fieldsetRenderer = Mage::getBlockSingleton((string)$group->frontend_model);
-        } else {
-            $fieldsetRenderer = $this->_defaultFieldsetRenderer;
-        }
-
+        /** @var Mage_Adminhtml_Block_System_Config_Form_Fieldset $fieldsetRenderer */
+        $fieldsetRenderer = $group->frontend_model
+            ? Mage::getBlockSingleton((string)$group->frontend_model)
+            : $this->_defaultFieldsetRenderer;
         $fieldsetRenderer->setForm($this)
             ->setConfigData($this->_configData);
 
@@ -276,11 +274,10 @@ public function initFields($fieldset, $group, $section, $fieldPrefix = '', $labe
                 }
 
                 $data = $this->_configDataObject->getConfigDataValue($path, $inherit, $this->_configData);
-                if ($element->frontend_model) {
-                    $fieldRenderer = Mage::getBlockSingleton((string)$element->frontend_model);
-                } else {
-                    $fieldRenderer = $this->_defaultFieldRenderer;
-                }
+                /** @var Mage_Adminhtml_Block_System_Config_Form_Field $fieldRenderer */
+                $fieldRenderer = $element->frontend_model
+                    ? Mage::getBlockSingleton((string)$element->frontend_model)
+                    : $this->_defaultFieldRenderer;
 
                 $fieldRenderer->setForm($this);
                 $fieldRenderer->setConfigData($this->_configData);

app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.php

@@ -29,7 +29,9 @@ public function render(Varien_Data_Form_Element_Abstract $element)
     {
         $countryCode = Mage::helper('paypal')->getConfigurationCountryCode();
         if ($countryCode === 'DE') {
-            return Mage::getBlockSingleton('paypal/adminhtml_System_config_field_hidden')->render($element);
+            /** @var Mage_Paypal_Block_Adminhtml_System_Config_Field_Hidden $block */
+            $block = Mage::getBlockSingleton('paypal/adminhtml_System_config_field_hidden');
+            return $block->render($element);
         }
 
         return parent::render($element);