Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .phpstan.dist.baselines/method.nonObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -1086,11 +1086,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Cannot call method setLegend() on Mage_Core_Block_Abstract|false.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Cannot call method toHtml() on Mage_Core_Block_Abstract|false.',
'count' => 1,
Expand Down
8 changes: 7 additions & 1 deletion app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,13 @@ protected function _prepareForm()
$form->setMethod('post');

if (!Mage::app()->isSingleStoreMode()) {
$form->addElement(Mage::getBlockSingleton('adminhtml/tax_rate_title_fieldset')->setLegend(Mage::helper('tax')->__('Tax Titles')));
/**
* @var Mage_Adminhtml_Block_Tax_Rate_Title $renderer
*/
$renderer = Mage::getBlockSingleton('adminhtml/tax_rate_title');
$form->addFieldset('tax_rate_title_fieldset', ['legend' => Mage::helper('tax')->__('Tax Titles')])
->addField('title', 'text', [])
->setRenderer($renderer);
Comment on lines +149 to +151
}

$rateData = $rateObject->getData();
Expand Down
7 changes: 6 additions & 1 deletion app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* @package Mage_Adminhtml
*/
class Mage_Adminhtml_Block_Tax_Rate_Title extends Mage_Core_Block_Template
class Mage_Adminhtml_Block_Tax_Rate_Title extends Mage_Core_Block_Template implements Varien_Data_Form_Element_Renderer_Interface
{
protected $_titles;

Expand Down Expand Up @@ -57,4 +57,9 @@ public function getStores()

return $stores;
}

public function render(Varien_Data_Form_Element_Abstract $element)
{
return $this->toHtml();
}
Comment on lines +61 to +64
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*
* @method string getLegend()
* @method $this setLegend(string $value)
* @deprecated
Comment on lines 15 to +17
*/
class Mage_Adminhtml_Block_Tax_Rate_Title_Fieldset extends Varien_Data_Form_Element_Fieldset
{
Expand Down
3 changes: 0 additions & 3 deletions tests/unit/Traits/PhpStormMetaData/BlocksTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,6 @@
use Mage_Adminhtml_Block_Tax_Rate_Grid_Renderer_Data;
use Mage_Adminhtml_Block_Tax_Rate_ImportExport;
use Mage_Adminhtml_Block_Tax_Rate_Title;
use Mage_Adminhtml_Block_Tax_Rate_Title_Fieldset;
use Mage_Adminhtml_Block_Tax_Rate_Toolbar_Add;
use Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save;
use Mage_Adminhtml_Block_Tax_Rule;
Expand Down Expand Up @@ -2000,7 +1999,6 @@ public static function getAllBlockClasses(): array
'adminhtml/tax_rate_grid_renderer_data' => Mage_Adminhtml_Block_Tax_Rate_Grid_Renderer_Data::class,
'adminhtml/tax_rate_importExport' => Mage_Adminhtml_Block_Tax_Rate_ImportExport::class,
'adminhtml/tax_rate_title' => Mage_Adminhtml_Block_Tax_Rate_Title::class,
'adminhtml/tax_rate_title_fieldset' => Mage_Adminhtml_Block_Tax_Rate_Title_Fieldset::class,
'adminhtml/tax_rate_toolbar_add' => Mage_Adminhtml_Block_Tax_Rate_Toolbar_Add::class,
'adminhtml/tax_rate_toolbar_save' => Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save::class,
'adminhtml/tax_rule' => Mage_Adminhtml_Block_Tax_Rule::class,
Expand Down Expand Up @@ -2676,7 +2674,6 @@ public static function getBlockClassesNotInstanceOfMageCoreBlockAbstract(): arra
Mage_Adminhtml_Block_System_Config_Form_Field_Export::class,
Mage_Adminhtml_Block_System_Config_Form_Field_File::class,
Mage_Adminhtml_Block_System_Config_Form_Field_Select_Allowspecific::class,
Mage_Adminhtml_Block_Tax_Rate_Title_Fieldset::class,
Mage_GiftMessage_Block_Adminhtml_Product_Helper_Form_Config::class,
Mage_Rule_Block_Actions::class,
Mage_Rule_Block_Conditions::class,
Expand Down
Loading