OM PR 4431

OpenMage/magento-lts#4431

Author: fballiano

.phpstan.neon

@@ -21,7 +21,6 @@ parameters:
         - app/code/core/Mage/Admin/Model/Acl/Assert/Time.php
         - app/code/core/Mage/Api/Model/Acl/Assert/Ip.php
         - app/code/core/Mage/Api/Model/Acl/Assert/Time.php
-        - app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php
         - lib/Varien/Directory/Collection.php
         - lib/Varien/Directory/Factory.php
         - lib/Varien/File/Object.php

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php

@@ -353,6 +353,8 @@ protected function _generateAction($node, $parent)
      * @param string                   $method
      * @param string[]                 $args
      * @throws Mage_Core_Exception
+     * @deprecated
+     * @see Mage_Core_Helper_Security::validateAgainstBlockMethodBlacklist()
      */
     protected function validateAgainstBlacklist(Mage_Core_Block_Abstract $block, $method, array $args)
     {
@@ -504,6 +506,7 @@ protected function _getBlockInstance($block, array $attributes = [])
             }
         }
         if (!$block instanceof Mage_Core_Block_Abstract) {
+            $block = is_object($block) ? get_class($block) : $block;
             Mage::throwException(Mage::helper('core')->__('Invalid block type: %s', $block));
         }
         return $block;
@@ -587,7 +590,7 @@ public function getMessagesBlock()
 
     /**
      * @param string $type
-     * @return Mage_Core_Block_Abstract
+     * @return Mage_Core_Block_Abstract|object
      */
     public function getBlockSingleton($type)
     {