Merge branch 'main' into dependabot/composer/phpstan/phpstan-1.12.3

OpenMage · Sep 18, 2024 · f10038f · f10038f
2 parents 3e7c6b9 + 1c8a5b8
commit f10038f
Show file tree

Hide file tree

Showing 255 changed files with 570 additions and 502 deletions.
diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
@@ -2710,11 +2710,6 @@ parameters:
  count: 2
  path: app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
 
- -
- message: "#^Method Mage_Directory_Model_Region\\:\\:loadByName\\(\\) invoked with 1 parameter, 2 required\\.$#"
- count: 1
- path: app/code/core/Mage/Customer/Model/Customer.php
-
  -
  message: "#^Parameter \\#1 \\$data \\(stdClass\\) of method Mage_Customer_Model_Customer_Api_V2\\:\\:_prepareData\\(\\) should be compatible with parameter \\$data \\(array\\) of method Mage_Customer_Model_Customer_Api\\:\\:_prepareData\\(\\)$#"
  count: 1

diff --git a/app/code/core/Mage/Admin/Model/Session.php b/app/code/core/Mage/Admin/Model/Session.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Admin
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2018-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2018-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -54,7 +54,7 @@ class Mage_Admin_Model_Session extends Mage_Core_Model_Session_Abstract
  public const XML_PATH_ALLOW_SID_FOR_ADMIN_AREA = 'web/session/use_admin_sid';
 
  /**
- * Whether it is the first page after successfull login
+ * Whether it is the first page after successful login
  *
  * @var bool|null
  */
@@ -256,7 +256,7 @@ public function isLoggedIn()
  }
 
  /**
- * Check if it is the first page after successfull login
+ * Check if it is the first page after successful login
  *
  * @return bool
  */

diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -50,7 +50,7 @@ public function getCurrentStore()
  }
 
  /**
- * Returns additional values for js config, con be overriden by descedants
+ * Returns additional values for js config, con be overridden by descendants
  *
  * @return array
  */

diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -54,7 +54,7 @@ public function getProductId()
  }
 
  /**
- * Indentifies edit mode of popup
+ * Identifies edit mode of popup
  *
  * @return bool
  */

diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -79,7 +79,7 @@ protected function _getAdditionalElementTypes()
  }
 
  /**
- * Custom additional elemnt html
+ * Custom additional element html
  *
  * @param Varien_Data_Form_Element_Abstract $element
  * @return string

diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -30,7 +30,7 @@ public function getProduct()
  }
 
  /**
- * Get store object of curently edited product
+ * Get store object of currently edited product
  *
  * @return Mage_Core_Model_Store
  */

diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -43,7 +43,7 @@ public function getElementHtml()
  }
 
  /**
- * Dublicate interface of Varien_Data_Form_Element_Abstract::setReadonly
+ * Duplicate interface of Varien_Data_Form_Element_Abstract::setReadonly
  *
  * @param bool $readonly
  * @param bool $useDisabled

diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php
@@ -9,12 +9,12 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
 /**
- * Directoty tree renderer for Cms Wysiwyg Images
+ * Directory tree renderer for Cms Wysiwyg Images
  *
  * @category Mage
  * @package Mage_Adminhtml

diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Adminpass.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Adminpass.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 

diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php b/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -32,7 +32,7 @@ class Mage_Adminhtml_Block_Report_Filter_Form extends Mage_Adminhtml_Block_Widge
  protected $_fieldVisibility = [];
 
  /**
- * Report field opions
+ * Report field options
  */
  protected $_fieldOptions = [];
 
@@ -170,7 +170,7 @@ protected function _prepareForm()
  }
 
  /**
- * Initialize form fileds values
+ * Initialize form fields values
  * Method will be called after prepareForm and can be used for field values initialization
  *
  * @return Mage_Adminhtml_Block_Widget_Form

diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
@@ -409,10 +409,10 @@ public function addGrandTotals($total)
  }
  }
  /*
- * recalc totals if we have average
+ * recalculate totals if we have average
  */
  foreach ($this->getColumns() as $key => $_column) {
- if (str_contains($_column->getTotal(), '/')) {
+ if ($_column->hasTotal() && str_contains($_column->getTotal(), '/')) {
  list($t1, $t2) = explode('/', $_column->getTotal());
  if ($this->getGrandTotals()->getData($t2) != 0) {
  $this->getGrandTotals()->setData(

diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2017-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2017-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -85,7 +85,7 @@ protected function _getAggregatedColumns()
 
  /**
  * Add column to grid
- * Overriden to add support for visibility_filter column option
+ * Overridden to add support for visibility_filter column option
  * It stands for conditional visibility of the column depending on filter field values
  * Value of visibility_filter supports (filter_field_name => filter_field_value) pairs
  *

diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -22,7 +22,7 @@
 class Mage_Adminhtml_Block_Sales_Order_Create_Data extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract
 {
  /**
- * Retrieve avilable currency codes
+ * Retrieve available currency codes
  *
  * @return array
  */

diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -146,7 +146,7 @@ public function _prepareForm()
  $this->_prepareVisibleFields($fieldset);
  }
 
- // Set default sender and recipient from billing and shipping adresses
+ // Set default sender and recipient from billing and shipping addresses
  if (!$this->getMessage()->getSender()) {
  $this->getMessage()->setSender($this->getDefaultSender());
  }
@@ -157,7 +157,7 @@ public function _prepareForm()
 
  $this->getMessage()->setType($this->getEntityType());
 
- // Overriden default data with edited when block reloads througth Ajax
+ // Overridden default data with edited when block reloads through Ajax
  $this->_applyPostData();
 
  $form->setValues($this->getMessage()->getData());

diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -75,7 +75,7 @@ protected function _prepareColumns()
  }
 
  /**
- * Retrieve Transaction addtitional info
+ * Retrieve Transaction additional info
  *
  * @return array
  */

diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php
@@ -704,7 +704,7 @@ protected function _getAdditionalElementTypes()
  }
 
  /**
- * Temporary moved those $this->getRequest()->getParam('blabla') from the code accross this block
+ * Temporary moved those $this->getRequest()->getParam('blabla') from the code across this block
  * to getBlala() methods to be later set from controller with setters
  */
  /**

diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php
@@ -9,12 +9,12 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
 /**
- * System congifuration shipping methods allow all countries selec
+ * System configuration shipping methods allow all countries select
  *
  * @category Mage
  * @package Mage_Adminhtml

diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php
@@ -9,12 +9,12 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
 /**
- * System congifuration shipping methods allow all countries selec
+ * System configuration shipping methods allow all countries select
  *
  * @category Mage
  * @package Mage_Adminhtml

diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -358,7 +358,7 @@ public function getUsedCurrentlyForPaths($asJSON = true)
  }
 
  /**
- * Convert xml config pathes to decorated names
+ * Convert xml config paths to decorated names
  *
  * @param array $paths
  * @return array

diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -27,7 +27,7 @@ class Mage_Adminhtml_Block_Tag_Store_Switcher extends Mage_Adminhtml_Block_Store
  protected $_hasDefaultOption = false;
 
  /**
- * Set overriden params
+ * Set overridden params
  */
  public function __construct()
  {

diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php
@@ -9,7 +9,7 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2022-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
@@ -22,7 +22,7 @@
 class Mage_Adminhtml_Block_Urlrewrite extends Mage_Adminhtml_Block_Widget_Grid_Container
 {
  /**
- * Part for generating apropriate grid block name
+ * Part for generating appropriate grid block name
  *
  * @var string
  */

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php
@@ -9,12 +9,12 @@
  * @category Mage
  * @package Mage_Adminhtml
  * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright Copyright (c) 2019-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
  */
 
 /**
- * Grid colum filter block
+ * Grid column filter block
  *
  * @category Mage
  * @package Mage_Adminhtml