Merge branch 'main' into phpstan-v2

Author: sreichel

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
 

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');

composer.lock

@@ -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