Merge branch 'main' into topic-composer-plugin-v3

MahoCommerce · Dec 10, 2024 · 39d4d00 · 39d4d00
2 parents 2290cd1 + 0e31ebf
commit 39d4d00
Show file tree

Hide file tree

Showing 791 changed files with 764 additions and 61,957 deletions.
diff --git a/.phpstan.baseline.neon b/.phpstan.baseline.neon
@@ -1830,12 +1830,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/Block/Messages.php
 
-		-
-			message: '#^Call to an undefined method Zend_Controller_Router_Interface\:\:addRoute\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: app/code/core/Mage/Core/Controller/Front/Router.php
-
 		-
 			message: '#^Constructor of class Mage_Core_Controller_Varien_Action has an unused parameter \$invokeArgs\.$#'
 			identifier: constructor.unusedParameter

diff --git a/app/Mage.php b/app/Mage.php
@@ -318,7 +318,7 @@ public static function getStoreConfigFlag($path, $store = null)
     /**
      * Get base URL path by type
      *
-     * @param string $type
+     * @param Mage_Core_Model_Store::URL_TYPE_* $type
      * @param null|bool $secure
      * @return string
      */

diff --git a/app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php b/app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php
@@ -6,10 +6,11 @@
  * @package    Mage_Admin
  * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://magento.com)
  * @copyright  Copyright (c) 2020-2024 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)
  */
 
-/** @var Mage_Core_Model_Resource_Setup $installer */
+/** @var Mage_Core_Model_Resource_Setup $this */
 $installer = $this;
 $installer->startSetup();
 

diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php
diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php
diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.1-0.7.2.php