Merge branch 'main' into chart-js

sreichel · web-flow · commit d982b4da0f3d · 2024-12-30T10:03:45.000+01:00
diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
@@ -3415,11 +3415,6 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/Directory/Model/Observer.php
 
-		-
-			message: "#^Parameter \\#2 \\$countryId of method Mage_Directory_Model_Resource_Region\\:\\:_loadByCountry\\(\\) expects int, string given\\.$#"
-			count: 2
-			path: app/code/core/Mage/Directory/Model/Resource/Region.php
-
 		-
 			message: "#^Left side of && is always true\\.$#"
 			count: 1
diff --git a/README.md b/README.md
@@ -21,19 +21,9 @@ See: https://docs.openmage.org/
 
 ---
 
-## Public Communication
+## Sponsorship
 
-* [Discord](https://discord.gg/EV8aNbU) (maintained by Flyingmana)
-
-## Maintainers
-
-* [Daniel Fahlke](https://github.com/Flyingmana)
-* [David Robinson](https://github.com/drobinson)
-* [Fabrizio Balliano](https://github.com/fballiano)
-* [Lee Saferite](https://github.com/LeeSaferite)
-* [Mohamed Elidrissi](https://github.com/elidrissidev)
-* [Ng Kiat Siong](https://github.com/kiatng)
-* [Tymoteusz Motylewski](https://github.com/tmotyl)
+* [opencollective](https://opencollective.com/openmage) (maintained by [Daniel Fahlke](https://github.com/Flyingmana) and [Colin Mollenhour](https://github.com/colinmollenhour))
 
 ## License
 
diff --git a/app/Mage.php b/app/Mage.php
@@ -577,7 +577,7 @@ public static function getControllerInstance($class, $request, $response, array
     }
 
     /**
-     * Retrieve resource vodel object singleton
+     * Retrieve resource model object singleton
      *
      * @param   string $modelClass
      * @return  object
diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php
@@ -45,10 +45,10 @@
  * @method $this setIncludeInMenu(int $value)
  * @method bool getInitialSetupFlag()
  * @method $this setInitialSetupFlag(bool $value)
- * @method bool getIsActive()
- * @method $this setIsActive(bool $value)
- * @method bool getIsAnchor()
- * @method $this setIsAnchor(bool $value)
+ * @method int getIsActive()
+ * @method $this setIsActive(int $value)
+ * @method int getIsAnchor()
+ * @method $this setIsAnchor(int $value)
  * @method $this setIsChangedProductList(bool $bool)
  *
  * @method int getLandingPage()
diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php
@@ -533,6 +533,14 @@ public function estimatePostAction()
         $regionId   = (string) $this->getRequest()->getParam('region_id');
         $region     = (string) $this->getRequest()->getParam('region');
 
+        try {
+            Mage::getModel('directory/country')->loadByCode($country);
+        } catch (Mage_Core_Exception $e) {
+            $this->_getSession()->addError($e->getMessage());
+            $this->_goBack();
+            return;
+        }
+
         $this->_getQuote()->getShippingAddress()
             ->setCountryId($country)
             ->setCity($city)
diff --git a/app/code/core/Mage/Core/Model/Abstract.php b/app/code/core/Mage/Core/Model/Abstract.php
@@ -441,7 +441,7 @@ protected function _beforeSave()
      * Get list of cache tags applied to model object.
      * Return false if cache tags are not supported by model
      *
-     * @return array | false
+     * @return array|false
      */
     public function getCacheTags()
     {
@@ -467,7 +467,7 @@ public function getCacheTags()
     /**
      * Get cache tags associated with object id
      *
-     * @return array|bool
+     * @return array|false
      */
     public function getCacheIdTags()
     {
diff --git a/app/code/core/Mage/Core/Model/Resource/Resource.php b/app/code/core/Mage/Core/Model/Resource/Resource.php
@@ -84,7 +84,7 @@ protected function _loadVersionData($needType)
      * Get Module version from DB
      *
      * @param string $resName
-     * @return bool|string
+     * @return string|false
      * @SuppressWarnings(PHPMD.CamelCaseVariableName)
      */
     public function getDbVersion($resName)
diff --git a/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php
@@ -21,6 +21,8 @@
  * @package    Mage_Directory
  *
  * @property Mage_Directory_Model_Country[] $_items
+ * @method  Mage_Directory_Model_Country getFirstItem()
+ * @method  Mage_Directory_Model_Country getLastItem()
  */
 class Mage_Directory_Model_Resource_Country_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Directory/Model/Resource/Region.php b/app/code/core/Mage/Directory/Model/Resource/Region.php
@@ -84,7 +84,7 @@ protected function _getLoadSelect($field, $value, $object)
      * Load object by country id and code or default name
      *
      * @param Mage_Core_Model_Abstract $object
-     * @param int $countryId
+     * @param string $countryId
      * @param string $value
      * @param string $field
      *
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Entity/Attribute.php
@@ -22,6 +22,7 @@
  *
  * @method Mage_Eav_Model_Resource_Entity_Attribute _getResource()
  * @method Mage_Eav_Model_Resource_Entity_Attribute getResource()
+ * @method Mage_Eav_Model_Resource_Entity_Attribute_Collection getCollection()
  * @method Mage_Eav_Model_Resource_Entity_Attribute_Collection getResourceCollection()
  *
  * @method int getAttributeGroupId()
diff --git a/app/code/core/Mage/Rss/Block/Catalog/Category.php b/app/code/core/Mage/Rss/Block/Catalog/Category.php
@@ -55,7 +55,7 @@ protected function _toHtml()
             if ($category->getId()) {
                 $layer = Mage::getSingleton('catalog/layer')->setStore($storeId);
                 //want to load all products no matter anchor or not
-                $category->setIsAnchor(true);
+                $category->setIsAnchor(1);
                 $newurl = $category->getUrl();
                 $title = $category->getName();
                 $data = ['title' => $title,
diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php
@@ -64,7 +64,7 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
         $this->_calculator->init($store->getWebsiteId(), $quote->getCustomerGroupId(), $quote->getCouponCode());
         $this->_calculator->initTotals($items, $address);
 
-        $address->setDiscountDescription([]);
+        $address->setDiscountDescription('');
         /** @var Mage_Sales_Model_Quote_Item[] $items */
         $items = $this->_calculator->sortItemsByPriority($items);
         foreach ($items as $item) {
@@ -79,9 +79,6 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
                     continue;
                 }
 
-                $eventArgs['item'] = $item;
-                Mage::dispatchEvent('sales_quote_address_discount_item', $eventArgs);
-
                 if ($item->getHasChildren() && $item->isChildrenCalculated()) {
                     foreach ($item->getChildren() as $child) {
                         $this->_calculator->process($child);
@@ -92,6 +89,8 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
                     }
                 } else {
                     $this->_calculator->process($item);
+                    $eventArgs['item'] = $item;
+                    Mage::dispatchEvent('sales_quote_address_discount_item', $eventArgs);
                     $this->_aggregateItemDiscount($item);
                 }
             }
@@ -143,7 +142,7 @@ public function fetch(Mage_Sales_Model_Quote_Address $address)
 
         if ($amount != 0) {
             $description = $address->getDiscountDescription();
-            if (strlen($description)) {
+            if (is_string($description) && strlen($description)) {
                 $title = Mage::helper('sales')->__('Discount (%s)', $description);
             } else {
                 $title = Mage::helper('sales')->__('Discount');
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -81,7 +81,7 @@ extra:
     - icon: fontawesome/brands/github
       link: https://github.com/OpenMage/magento-lts
     - icon: fontawesome/brands/discord
-      link: https://discord.gg/EV8aNbU
+      link: https://discord.gg/R2q5WadstX
     - icon: fontawesome/brands/stack-overflow
       link: https://magento.stackexchange.com/tags/openmage
     - icon: fontawesome/brands/x-twitter

Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ public static function getControllerInstance($class, $request, $response, array`
`577`	`577`	`}`
`578`	`578`
`579`	`579`	`/**`
`580`		`- * Retrieve resource vodel object singleton`
	`580`	`+ * Retrieve resource model object singleton`
`581`	`581`	`*`
`582`	`582`	`* @param string $modelClass`
`583`	`583`	`* @return object`
Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ protected function _beforeSave()`
`441`	`441`	`* Get list of cache tags applied to model object.`
`442`	`442`	`* Return false if cache tags are not supported by model`
`443`	`443`	`*`
`444`		`- * @return array \| false`
	`444`	`+ * @return array\|false`
`445`	`445`	`*/`
`446`	`446`	`public function getCacheTags()`
`447`	`447`	`{`
`@@ -467,7 +467,7 @@ public function getCacheTags()`
`467`	`467`	`/**`
`468`	`468`	`* Get cache tags associated with object id`
`469`	`469`	`*`
`470`		`- * @return array\|bool`
	`470`	`+ * @return array\|false`
`471`	`471`	`*/`
`472`	`472`	`public function getCacheIdTags()`
`473`	`473`	`{`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ protected function _loadVersionData($needType)`
`84`	`84`	`* Get Module version from DB`
`85`	`85`	`*`
`86`	`86`	`* @param string $resName`
`87`		`- * @return bool\|string`
	`87`	`+ * @return string\|false`
`88`	`88`	`* @SuppressWarnings(PHPMD.CamelCaseVariableName)`
`89`	`89`	`*/`
`90`	`90`	`public function getDbVersion($resName)`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`	`* @package Mage_Directory`
`22`	`22`	`*`
`23`	`23`	`* @property Mage_Directory_Model_Country[] $_items`
	`24`	`+ * @method Mage_Directory_Model_Country getFirstItem()`
	`25`	`+ * @method Mage_Directory_Model_Country getLastItem()`
`24`	`26`	`*/`
`25`	`27`	`class Mage_Directory_Model_Resource_Country_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract`
`26`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ protected function _getLoadSelect($field, $value, $object)`
`84`	`84`	`* Load object by country id and code or default name`
`85`	`85`	`*`
`86`	`86`	`* @param Mage_Core_Model_Abstract $object`
`87`		`- * @param int $countryId`
	`87`	`+ * @param string $countryId`
`88`	`88`	`* @param string $value`
`89`	`89`	`* @param string $field`
`90`	`90`	`*`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`* @method Mage_Eav_Model_Resource_Entity_Attribute _getResource()`
`24`	`24`	`* @method Mage_Eav_Model_Resource_Entity_Attribute getResource()`
	`25`	`+ * @method Mage_Eav_Model_Resource_Entity_Attribute_Collection getCollection()`
`25`	`26`	`* @method Mage_Eav_Model_Resource_Entity_Attribute_Collection getResourceCollection()`
`26`	`27`	`*`
`27`	`28`	`* @method int getAttributeGroupId()`