GUI to Edit EAV Attributes & Sets

.phpstan.baseline.neon

@@ -438,12 +438,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php
 
-		-
-			message: '#^Ternary operator condition is always true\.$#'
-			identifier: ternary.alwaysTrue
-			count: 1
-			path: app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php
-
 		-
 			message: '#^Method Mage_Adminhtml_Controller_Action\:\:_setForcedFormKeyActions\(\) invoked with 2 parameters, 1 required\.$#'
 			identifier: arguments.count
@@ -2467,34 +2461,22 @@ parameters:
 			path: app/code/core/Mage/Customer/Block/Account/Navigation.php
 
 		-
-			message: '#^Method Mage_Customer_Block_Address_Edit\:\:getCountryId\(\) should return int but returns string\.$#'
-			identifier: return.type
-			count: 1
-			path: app/code/core/Mage/Customer/Block/Address/Edit.php
-
-		-
-			message: '#^Return type \(int\) of method Mage_Customer_Block_Address_Edit\:\:getCountryId\(\) should be compatible with return type \(string\) of method Mage_Directory_Block_Data\:\:getCountryId\(\)$#'
-			identifier: method.childReturnType
-			count: 1
-			path: app/code/core/Mage/Customer/Block/Address/Edit.php
-
-		-
-			message: '#^Method Mage_Customer_Block_Form_Register\:\:getCountryId\(\) should return int but returns string\.$#'
+			message: '#^Method Mage_Customer_Block_Newsletter\:\:getAction\(\) should return Mage_Core_Controller_Varien_Action but returns string\.$#'
 			identifier: return.type
 			count: 1
-			path: app/code/core/Mage/Customer/Block/Form/Register.php
+			path: app/code/core/Mage/Customer/Block/Newsletter.php
 
 		-
-			message: '#^Return type \(int\) of method Mage_Customer_Block_Form_Register\:\:getCountryId\(\) should be compatible with return type \(string\) of method Mage_Directory_Block_Data\:\:getCountryId\(\)$#'
-			identifier: method.childReturnType
-			count: 1
-			path: app/code/core/Mage/Customer/Block/Form/Register.php
+			message: '#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\:\:getAllOptions\(\) invoked with 1 parameter, 0 required\.$#'
+			identifier: arguments.count
+			count: 2
+			path: app/code/core/Mage/Customer/Helper/Address.php
 
 		-
-			message: '#^Method Mage_Customer_Block_Newsletter\:\:getAction\(\) should return Mage_Core_Controller_Varien_Action but returns string\.$#'
-			identifier: return.type
-			count: 1
-			path: app/code/core/Mage/Customer/Block/Newsletter.php
+			message: '#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\:\:getAllOptions\(\) invoked with 1 parameter, 0 required\.$#'
+			identifier: arguments.count
+			count: 2
+			path: app/code/core/Mage/Customer/Helper/Data.php
 
 		-
 			message: '#^Property Mage_Customer_Helper_Data\:\:\$_customer \(Mage_Customer_Model_Customer\) in empty\(\) is not falsy\.$#'
@@ -4830,24 +4812,6 @@ parameters:
 			count: 19
 			path: app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml
 
-		-
-			message: '#^Variable \$this might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml
-
-		-
-			message: '#^Call to protected method _getHeader\(\) of class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main\.$#'
-			identifier: method.protected
-			count: 1
-			path: app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml
-
-		-
-			message: '#^Variable \$this might not be defined\.$#'
-			identifier: variable.undefined
-			count: 5
-			path: app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml
-
 		-
 			message: '#^Call to protected method _getHeader\(\) of class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Main\.$#'
 			identifier: method.protected
@@ -5004,6 +4968,18 @@ parameters:
 			count: 63
 			path: app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml
 
+		-
+			message: '#^Call to protected method _getHeader\(\) of class Mage_Eav_Block_Adminhtml_Attribute_Set_Add\.$#'
+			identifier: method.protected
+			count: 1
+			path: app/design/adminhtml/default/default/template/eav/attribute/set/add.phtml
+
+		-
+			message: '#^Call to protected method _getHeader\(\) of class Mage_Eav_Block_Adminhtml_Attribute_Set_Edit\.$#'
+			identifier: method.protected
+			count: 1
+			path: app/design/adminhtml/default/default/template/eav/attribute/set/edit.phtml
+
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined
@@ -6306,12 +6282,6 @@ parameters:
 			count: 10
 			path: app/design/frontend/base/default/template/checkout/multishipping/success.phtml
 
-		-
-			message: '#^Cannot call method isEnabled\(\) on Mage_Core_Block_Abstract\|false\.$#'
-			identifier: method.nonObject
-			count: 4
-			path: app/design/frontend/base/default/template/checkout/onepage/billing.phtml
-
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined
@@ -6576,42 +6546,6 @@ parameters:
 			count: 4
 			path: app/design/frontend/base/default/template/customer/balance.phtml
 
-		-
-			message: '#^Variable \$action might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: app/design/frontend/base/default/template/customer/form/address.phtml
-
-		-
-			message: '#^Variable \$address might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: app/design/frontend/base/default/template/customer/form/address.phtml
-
-		-
-			message: '#^Variable \$countries might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: app/design/frontend/base/default/template/customer/form/address.phtml
-
-		-
-			message: '#^Variable \$data might not be defined\.$#'
-			identifier: variable.undefined
-			count: 12
-			path: app/design/frontend/base/default/template/customer/form/address.phtml
-
-		-
-			message: '#^Variable \$primaryTypes might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: app/design/frontend/base/default/template/customer/form/address.phtml
-
-		-
-			message: '#^Variable \$this might not be defined\.$#'
-			identifier: variable.undefined
-			count: 50
-			path: app/design/frontend/base/default/template/customer/form/address.phtml
-
 		-
 			message: '#^Variable \$action might not be defined\.$#'
 			identifier: variable.undefined
@@ -6633,7 +6567,7 @@ parameters:
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined
-			count: 36
+			count: 23
 			path: app/design/frontend/base/default/template/customer/form/edit.phtml
 
 		-
@@ -6648,12 +6582,6 @@ parameters:
 			count: 16
 			path: app/design/frontend/base/default/template/customer/form/newsletter.phtml
 
-		-
-			message: '#^Cannot call method isEnabled\(\) on Mage_Core_Block_Abstract\|false\.$#'
-			identifier: method.nonObject
-			count: 3
-			path: app/design/frontend/base/default/template/customer/form/register.phtml
-
 		-
 			message: '#^PHPDoc tag @var contains unresolvable type\.$#'
 			identifier: varTag.unresolvableType
@@ -7572,42 +7500,6 @@ parameters:
 			count: 3
 			path: app/design/frontend/rwd/default/template/customer/account/navigation.phtml
 
-		-
-			message: '#^Variable \$action might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: app/design/frontend/rwd/default/template/customer/form/address.phtml
-
-		-
-			message: '#^Variable \$address might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: app/design/frontend/rwd/default/template/customer/form/address.phtml
-
-		-
-			message: '#^Variable \$countries might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: app/design/frontend/rwd/default/template/customer/form/address.phtml
-
-		-
-			message: '#^Variable \$data might not be defined\.$#'
-			identifier: variable.undefined
-			count: 12
-			path: app/design/frontend/rwd/default/template/customer/form/address.phtml
-
-		-
-			message: '#^Variable \$primaryTypes might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: app/design/frontend/rwd/default/template/customer/form/address.phtml
-
-		-
-			message: '#^Variable \$this might not be defined\.$#'
-			identifier: variable.undefined
-			count: 51
-			path: app/design/frontend/rwd/default/template/customer/form/address.phtml
-
 		-
 			message: '#^Variable \$action might not be defined\.$#'
 			identifier: variable.undefined
@@ -7626,12 +7518,6 @@ parameters:
 			count: 13
 			path: app/design/frontend/rwd/default/template/customer/form/confirmation.phtml
 
-		-
-			message: '#^Variable \$this might not be defined\.$#'
-			identifier: variable.undefined
-			count: 36
-			path: app/design/frontend/rwd/default/template/customer/form/edit.phtml
-
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php

@@ -6,6 +6,7 @@
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://magento.com)
  * @copyright  Copyright (c) 2022-2023 The OpenMage Contributors (https://openmage.org)
+ * @copyright  Copyright (c) 2024 Maho (https://mahocommerce.com)
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -15,13 +16,22 @@
  * @category   Mage
  * @package    Mage_Adminhtml
  */
-class Mage_Adminhtml_Block_Catalog_Product_Attribute extends Mage_Adminhtml_Block_Widget_Grid_Container
+class Mage_Adminhtml_Block_Catalog_Product_Attribute extends Mage_Eav_Block_Adminhtml_Attribute
 {
     public function __construct()
     {
+        $this->entityType = Mage::registry('entity_type');
+
+        $this->_blockGroup = 'adminhtml';
         $this->_controller = 'catalog_product_attribute';
-        $this->_headerText = Mage::helper('catalog')->__('Manage Attributes');
-        $this->_addButtonLabel = Mage::helper('catalog')->__('Add New Attribute');
-        parent::__construct();
+
+        $this->_headerText = $this->__(
+            'Manage %s Attributes',
+            Mage::helper('eav')->formatTypeCode($this->entityType->getEntityTypeCode())
+        );
+
+        $this->_addButtonLabel = Mage::helper('eav')->__('Add New Attribute');
+
+        Mage_Adminhtml_Block_Widget_Grid_Container::__construct();
     }
 }

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php

@@ -16,78 +16,42 @@
  * @category   Mage
  * @package    Mage_Adminhtml
  */
-class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
+class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit extends Mage_Eav_Block_Adminhtml_Attribute_Edit
 {
     public function __construct()
     {
+        $this->entityType = Mage::registry('entity_type');
+        $this->entityAttribute = Mage::registry('entity_attribute');
+
         $this->_objectId = 'attribute_id';
+        $this->_blockGroup = 'adminhtml';
         $this->_controller = 'catalog_product_attribute';
 
-        parent::__construct();
+        Mage_Adminhtml_Block_Widget_Form_Container::__construct();
 
         if ($this->getRequest()->getParam('popup')) {
             $this->_removeButton('back');
-            $this->_addButton(
-                'close',
-                [
-                    'label'     => Mage::helper('catalog')->__('Close Window'),
-                    'class'     => 'cancel',
-                    'onclick'   => 'window.close()',
-                    'level'     => -1
-                ]
-            );
+            $this->_addButton('close', [
+                'label'     => Mage::helper('catalog')->__('Close Window'),
+                'class'     => 'cancel',
+                'onclick'   => 'window.close()',
+                'level'     => -1
+            ]);
         } else {
-            $this->_addButton(
-                'save_and_edit_button',
-                [
-                    'label'     => Mage::helper('catalog')->__('Save and Continue Edit'),
-                    'onclick'   => 'saveAndContinueEdit()',
-                    'class'     => 'save'
-                ],
-                100
-            );
+            $this->_addButton('save_and_edit_button', [
+                'label'     => Mage::helper('catalog')->__('Save and Continue Edit'),
+                'onclick'   => 'saveAndContinueEdit()',
+                'class'     => 'save'
+            ], 100);
         }
 
         $this->_updateButton('save', 'label', Mage::helper('catalog')->__('Save Attribute'));
         $this->_updateButton('save', 'onclick', 'saveAttribute()');
 
-        if (!Mage::registry('entity_attribute')->getIsUserDefined()) {
-            $this->_removeButton('delete');
+        if ($this->entityAttribute->getIsUserDefined()) {
+            $this->_updateButton('delete', 'label', $this->__('Delete Attribute'));
         } else {
-            $this->_updateButton('delete', 'label', Mage::helper('catalog')->__('Delete Attribute'));
-        }
-    }
-
-    /**
-     * @return string
-     */
-    #[\Override]
-    public function getHeaderText()
-    {
-        if (Mage::registry('entity_attribute')->getId()) {
-            $frontendLabel = Mage::registry('entity_attribute')->getFrontendLabel();
-            if (is_array($frontendLabel)) {
-                $frontendLabel = $frontendLabel[0];
-            }
-            return Mage::helper('catalog')->__('Edit Product Attribute "%s"', $this->escapeHtml($frontendLabel));
+            $this->_removeButton('delete');
         }
-        return Mage::helper('catalog')->__('New Product Attribute');
-    }
-
-    /**
-     * @return string
-     */
-    public function getValidationUrl()
-    {
-        return $this->getUrl('*/*/validate', ['_current' => true]);
-    }
-
-    /**
-     * @return string
-     */
-    #[\Override]
-    public function getSaveUrl()
-    {
-        return $this->getUrl('*/' . $this->_controller . '/save', ['_current' => true, 'back' => null]);
     }
 }

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php

@@ -16,14 +16,6 @@
  * @category   Mage
  * @package    Mage_Adminhtml
  */
-class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
+class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Form extends Mage_Eav_Block_Adminhtml_Attribute_Edit_Form
 {
-    #[\Override]
-    protected function _prepareForm()
-    {
-        $form = new Varien_Data_Form(['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']);
-        $form->setUseContainer(true);
-        $this->setForm($form);
-        return parent::_prepareForm();
-    }
 }