Merge branch 'main' into rector-2-cq

OpenMage · Sep 22, 2024 · 6110b0d · 6110b0d
2 parents 5696be4 + 75cd467
commit 6110b0d
Show file tree

Hide file tree

Showing 36 changed files with 76 additions and 57 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,6 +3,7 @@
 /.github export-ignore
 /dev export-ignore
 /docs export-ignore
+/tests export-ignore
 
 /.all-contributorsrc export-ignore
 /.gitattributes export-ignore
@@ -16,6 +17,7 @@
 /.phpmd.dist.xml export-ignore
 /.phpstan.dist.baseline.neon export-ignore
 /.phpstan.dist.neon export-ignore
+/rector.php export-ignore
 
 /README.md export-ignore
 

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -895,12 +895,9 @@
 'phpunit':
  - changed-files:
  - any-glob-to-any-file: [
- dev/test/*,
- dev/phpunit*,
- dev/sonar*,
  phpunit*,
- .github/workflows/phpunit.yml,
- .github/workflows/sonar.yml
+ tests/*,
+ .github/workflows/phpunit.yml
  ]
 
 'ddev':
@@ -912,7 +909,7 @@
 
 'rector':
  - changed-files:
-  - any-glob-to-any-file: [
-  rector.php,
-  .github/workflows/rector.yml
-  ]
+ - any-glob-to-any-file: [
+ rector.php,
+ .github/workflows/rector.yml
+ ]
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php
@@ -26,7 +26,7 @@ public function render(Varien_Object $row)
  $href = $row->getPreviewUrl();
  } else {
  $urlModel = Mage::getModel('core/url')->setStore($row->getData('_first_store_id'));
- $href = $urlModel->getUrl(
+ $href = $urlModel->getDirectUrl(
  $row->getIdentifier(),
  [
  '_current' => false,

diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php
@@ -41,7 +41,7 @@ public function preDispatch()
  protected function _initAction()
  {
  $this->loadLayout();
- $this->_setActiveMenu('system/services/roles');
+ $this->_setActiveMenu('system/api/roles');
  $this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'));
  $this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'));
  $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));

diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php
@@ -39,7 +39,7 @@ public function preDispatch()
  protected function _initAction()
  {
  $this->loadLayout()
- ->_setActiveMenu('system/services/users')
+ ->_setActiveMenu('system/api/users')
  ->_addBreadcrumb($this->__('Web Services'), $this->__('Web Services'))
  ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
  ->_addBreadcrumb($this->__('Users'), $this->__('Users'))

diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
@@ -155,7 +155,7 @@ public function editAction()
  /**
  * Set active menu item
  */
- $this->_setActiveMenu('customer/new');
+ $this->_setActiveMenu('customer/manage');
 
  $this->renderLayout();
  }

diff --git a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php
@@ -26,7 +26,7 @@ public function indexAction()
  $this->_title($this->__('System'))->_title($this->__('Notifications'));
 
  $this->loadLayout()
- ->_setActiveMenu('system/notification')
+ ->_setActiveMenu('system/adminnotification')
  ->_addBreadcrumb(Mage::helper('adminnotification')->__('Messages Inbox'), Mage::helper('adminhtml')->__('Messages Inbox'))
  ->_addContent($this->getLayout()->createBlock('adminhtml/notification_inbox'))
  ->renderLayout();

diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php
@@ -33,7 +33,7 @@ class Mage_Adminhtml_Permissions_BlockController extends Mage_Adminhtml_Controll
  protected function _initAction()
  {
  $this->loadLayout()
- ->_setActiveMenu('system/acl')
+ ->_setActiveMenu('system/acl/blocks')
  ->_addBreadcrumb($this->__('System'), $this->__('System'))
  ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
  ->_addBreadcrumb($this->__('Blocks'), $this->__('Blocks'));

diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php
@@ -28,7 +28,7 @@ class Mage_Adminhtml_Permissions_OrphanedResourceController extends Mage_Adminht
  protected function _initAction()
  {
  $this->loadLayout()
- ->_setActiveMenu('system/acl')
+ ->_setActiveMenu('system/acl/orphaned_resources')
  ->_addBreadcrumb($this->__('System'), $this->__('System'))
  ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
  ->_addBreadcrumb($this->__('Orphaned Resources'), $this->__('Orphaned Role Resources'));

diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php
@@ -46,7 +46,7 @@ public function preDispatch()
  protected function _initAction()
  {
  $this->loadLayout();
- $this->_setActiveMenu('system/acl');
+ $this->_setActiveMenu('system/acl/roles');
  $this->_addBreadcrumb($this->__('System'), $this->__('System'));
  $this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'));
  $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));

diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php
@@ -39,7 +39,7 @@ public function preDispatch()
  protected function _initAction()
  {
  $this->loadLayout()
- ->_setActiveMenu('system/acl')
+ ->_setActiveMenu('system/acl/users')
  ->_addBreadcrumb($this->__('System'), $this->__('System'))
  ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
  ->_addBreadcrumb($this->__('Users'), $this->__('Users'))

diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php
@@ -33,7 +33,7 @@ class Mage_Adminhtml_Permissions_VariableController extends Mage_Adminhtml_Contr
  protected function _initAction()
  {
  $this->loadLayout()
- ->_setActiveMenu('system/acl')
+ ->_setActiveMenu('system/acl/variables')
  ->_addBreadcrumb($this->__('System'), $this->__('System'))
  ->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
  ->_addBreadcrumb($this->__('Variables'), $this->__('Variables'));

diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php
@@ -42,7 +42,7 @@ public function accountsAction()
  ->_title($this->__('New Accounts'));
 
  $this->_initAction()
- ->_setActiveMenu('report/customer/accounts')
+ ->_setActiveMenu('report/customers/accounts')
  ->_addBreadcrumb(Mage::helper('adminhtml')->__('New Accounts'), Mage::helper('adminhtml')->__('New Accounts'))
  ->_addContent($this->getLayout()->createBlock('adminhtml/report_customer_accounts'))
  ->renderLayout();
@@ -79,7 +79,7 @@ public function ordersAction()
  ->_title($this->__('Customers by Number of Orders'));
 
  $this->_initAction()
- ->_setActiveMenu('report/customer/orders')
+ ->_setActiveMenu('report/customers/orders')
  ->_addBreadcrumb(
  Mage::helper('reports')->__('Customers by Number of Orders'),
  Mage::helper('reports')->__('Customers by Number of Orders')
@@ -119,7 +119,7 @@ public function totalsAction()
  ->_title($this->__('Customers by Orders Total'));
 
  $this->_initAction()
- ->_setActiveMenu('report/customer/totals')
+ ->_setActiveMenu('report/customers/totals')
  ->_addBreadcrumb(
  Mage::helper('reports')->__('Customers by Orders Total'),
  Mage::helper('reports')->__('Customers by Orders Total')

diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php
@@ -73,7 +73,7 @@ public function soldAction()
  ->_title($this->__('Products Ordered'));
 
  $this->_initAction()
- ->_setActiveMenu('report/product/sold')
+ ->_setActiveMenu('report/products/sold')
  ->_addBreadcrumb(Mage::helper('reports')->__('Products Ordered'), Mage::helper('reports')->__('Products Ordered'))
  ->_addContent($this->getLayout()->createBlock('adminhtml/report_product_sold'))
  ->renderLayout();
@@ -161,7 +161,7 @@ public function lowstockAction()
  ->_title($this->__('Low Stock'));
 
  $this->_initAction()
- ->_setActiveMenu('report/product/lowstock')
+ ->_setActiveMenu('report/products/lowstock')
  ->_addBreadcrumb(Mage::helper('reports')->__('Low Stock'), Mage::helper('reports')->__('Low Stock'))
  ->_addContent($this->getLayout()->createBlock('adminhtml/report_product_lowstock'))
  ->renderLayout();
@@ -203,7 +203,7 @@ public function downloadsAction()
  ->_title($this->__('Downloads'));
 
  $this->_initAction()
- ->_setActiveMenu('report/product/downloads')
+ ->_setActiveMenu('report/products/downloads')
  ->_addBreadcrumb(Mage::helper('reports')->__('Downloads'), Mage::helper('reports')->__('Downloads'))
  ->_addContent($this->getLayout()->createBlock('adminhtml/report_product_downloads'))
  ->renderLayout();

diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
@@ -40,7 +40,7 @@ public function salesAction()
  $this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_ORDER_FLAG_CODE, 'sales');
 
  $this->_initAction()
- ->_setActiveMenu('report/sales/sales')
+ ->_setActiveMenu('report/salesroot/sales')
  ->_addBreadcrumb(Mage::helper('adminhtml')->__('Sales Report'), Mage::helper('adminhtml')->__('Sales Report'));
 
  $gridBlock = $this->getLayout()->getBlock('report_sales_sales.grid');
@@ -159,7 +159,7 @@ public function taxAction()
  $this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_TAX_FLAG_CODE, 'tax');
 
  $this->_initAction()
- ->_setActiveMenu('report/sales/tax')
+ ->_setActiveMenu('report/salesroot/tax')
  ->_addBreadcrumb(Mage::helper('adminhtml')->__('Tax'), Mage::helper('adminhtml')->__('Tax'));
 
  $gridBlock = $this->getLayout()->getBlock('report_sales_tax.grid');
@@ -202,7 +202,7 @@ public function shippingAction()
  $this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_SHIPPING_FLAG_CODE, 'shipping');
 
  $this->_initAction()
- ->_setActiveMenu('report/sales/shipping')
+ ->_setActiveMenu('report/salesroot/shipping')
  ->_addBreadcrumb(Mage::helper('adminhtml')->__('Shipping'), Mage::helper('adminhtml')->__('Shipping'));
 
  $gridBlock = $this->getLayout()->getBlock('report_sales_shipping.grid');
@@ -245,7 +245,7 @@ public function invoicedAction()
  $this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_INVOICE_FLAG_CODE, 'invoiced');
 
  $this->_initAction()
- ->_setActiveMenu('report/sales/invoiced')
+ ->_setActiveMenu('report/salesroot/invoiced')
  ->_addBreadcrumb(Mage::helper('adminhtml')->__('Total Invoiced'), Mage::helper('adminhtml')->__('Total Invoiced'));
 
  $gridBlock = $this->getLayout()->getBlock('report_sales_invoiced.grid');
@@ -288,7 +288,7 @@ public function refundedAction()
  $this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_REFUNDED_FLAG_CODE, 'refunded');
 
  $this->_initAction()
- ->_setActiveMenu('report/sales/refunded')
+ ->_setActiveMenu('report/salesroot/refunded')
  ->_addBreadcrumb(Mage::helper('adminhtml')->__('Total Refunded'), Mage::helper('adminhtml')->__('Total Refunded'));
 
  $gridBlock = $this->getLayout()->getBlock('report_sales_refunded.grid');
@@ -331,7 +331,7 @@ public function couponsAction()
  $this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_COUPONS_FLAG_CODE, 'coupons');
 
  $this->_initAction()
- ->_setActiveMenu('report/sales/coupons')
+ ->_setActiveMenu('report/salesroot/coupons')
  ->_addBreadcrumb(Mage::helper('adminhtml')->__('Coupons'), Mage::helper('adminhtml')->__('Coupons'));
 
  $gridBlock = $this->getLayout()->getBlock('report_sales_coupons.grid');

diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php
@@ -57,7 +57,7 @@ protected function _initStatus()
  public function indexAction()
  {
  $this->_title($this->__('Sales'))->_title($this->__('Order Statuses'));
- $this->loadLayout()->_setActiveMenu('system')->renderLayout();
+ $this->loadLayout()->_setActiveMenu('system/order_statuses')->renderLayout();
  }
 
  /**
@@ -73,6 +73,7 @@ public function newAction()
  }
  $this->_title($this->__('Sales'))->_title($this->__('Create New Order Status'));
  $this->loadLayout()
+ ->_setActiveMenu('system/order_statuses')
  ->renderLayout();
  }
 
@@ -86,6 +87,7 @@ public function editAction()
  Mage::register('current_status', $status);
  $this->_title($this->__('Sales'))->_title($this->__('Edit Order Status'));
  $this->loadLayout()
+ ->_setActiveMenu('system/order_statuses')
  ->renderLayout();
  } else {
  $this->_getSession()->addError(
@@ -161,6 +163,7 @@ public function assignAction()
  {
  $this->_title($this->__('Sales'))->_title($this->__('Assign Order Status to State'));
  $this->loadLayout()
+ ->_setActiveMenu('system/order_statuses')
  ->renderLayout();
  }
 

diff --git a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php
@@ -32,7 +32,7 @@ public function indexAction()
  $this->_title($this->__('System'))->_title($this->__('My Account'));
 
  $this->loadLayout();
- $this->_setActiveMenu('system/account');
+ $this->_setActiveMenu('system/myaccount');
  $this->_addContent($this->getLayout()->createBlock('adminhtml/system_account_edit'));
  $this->renderLayout();
  }

diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php
@@ -47,7 +47,7 @@ public function indexAction()
  /**
  * Set active menu item
  */
- $this->_setActiveMenu('system/convert');
+ $this->_setActiveMenu('system/convert/gui');
 
  /**
  * Append profiles block to content
@@ -89,7 +89,7 @@ public function editAction()
 
  $this->_title($profile->getId() ? $profile->getName() : $this->__('New Profile'));
 
- $this->_setActiveMenu('system/convert');
+ $this->_setActiveMenu('system/convert/gui');
 
  $this->_addContent(
  $this->getLayout()->createBlock('adminhtml/system_convert_gui_edit')

diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php
@@ -71,7 +71,7 @@ public function indexAction()
  /**
  * Set active menu item
  */
- $this->_setActiveMenu('system/convert');
+ $this->_setActiveMenu('system/convert/profiles');
 
  /**
  * Append profiles block to content
@@ -121,7 +121,7 @@ public function editAction()
 
  $this->_title($profile->getId() ? $profile->getName() : $this->__('New Profile'));
 
- $this->_setActiveMenu('system/convert');
+ $this->_setActiveMenu('system/convert/profiles');
 
  $this->_addContent(
  $this->getLayout()->createBlock('adminhtml/system_convert_profile_edit')

diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
@@ -50,7 +50,7 @@ public function indexAction()
  $this->_title($this->__('System'))->_title($this->__('Manage Currency Rates'));
 
  $this->loadLayout();
- $this->_setActiveMenu('system/currency');
+ $this->_setActiveMenu('system/currency/rates');
  $this->_addContent($this->getLayout()->createBlock('adminhtml/system_currency'));
  $this->renderLayout();
  }

diff --git a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php
@@ -41,7 +41,7 @@ public function indexAction()
  $this->_title($this->__('System'))->_title($this->__('Design'));
 
  $this->loadLayout();
- $this->_setActiveMenu('system');
+ $this->_setActiveMenu('system/design');
  $this->_addContent($this->getLayout()->createBlock('adminhtml/system_design'));
  $this->renderLayout();
  }
@@ -61,7 +61,7 @@ public function editAction()
  $this->_title($this->__('System'))->_title($this->__('Design'));
 
  $this->loadLayout();
- $this->_setActiveMenu('system');
+ $this->_setActiveMenu('system/design');
  $this->getLayout()->getBlock('head')->setCanLoadExtJs(true);
 
  $id = (int) $this->getRequest()->getParam('id');

diff --git a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php
@@ -47,7 +47,7 @@ public function indexAction()
  ->_title($this->__('Web Services'))
  ->_title($this->__('REST Attributes'));
 
- $this->loadLayout()->_setActiveMenu('system/services/attributes');
+ $this->loadLayout()->_setActiveMenu('system/api/rest_attributes');
 
  $this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'))
  ->_addBreadcrumb($this->__('REST Attributes'), $this->__('REST Attributes'))
@@ -62,7 +62,7 @@ public function indexAction()
  public function editAction()
  {
  $this->loadLayout()
- ->_setActiveMenu('system/services/attributes');
+ ->_setActiveMenu('system/api/rest_attributes');
 
  $type = $this->getRequest()->getParam('type');
 

diff --git a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php
@@ -41,7 +41,7 @@ public function indexAction()
  ->_title($this->__('Web Services'))
  ->_title($this->__('REST Roles'));
 
- $this->loadLayout()->_setActiveMenu('system/services/roles');
+ $this->loadLayout()->_setActiveMenu('system/api/rest_roles');
  $this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'));
  $this->_addBreadcrumb($this->__('REST Roles'), $this->__('REST Roles'));
  $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));
@@ -82,7 +82,7 @@ public function newAction()
  ->_title($this->__('Web Services'))
  ->_title($this->__('Rest Roles'));
 
- $this->loadLayout()->_setActiveMenu('system/services/roles');
+ $this->loadLayout()->_setActiveMenu('system/api/rest_roles');
  $this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'));
  $this->_addBreadcrumb($this->__('REST Roles'), $this->__('REST Roles'));
  $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));

diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php
@@ -699,7 +699,7 @@ public function getStockItem()
  */
  public function hasStockItem()
  {
- return !!$this->_stockItem;
+ return (bool) $this->_stockItem;
  }
 
  /**

diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
@@ -561,7 +561,7 @@ public function checkProductBuyState($product = null)
  if ($option->getIsRequire()) {
  $customOption = $this->getProduct($product)
  ->getCustomOption(self::OPTION_PREFIX . $option->getId());
- if (!$customOption || $customOption->getValue() === null || strlen($customOption->getValue()) === 0) {
+ if (!$customOption || $customOption->getValue() === null || (string) $customOption->getValue() === '') {
  $this->getProduct($product)->setSkipCheckRequiredOption(true);
  Mage::throwException(
  Mage::helper('catalog')->__('The product has required options')