Merge branch 'main' into next

Author: fballiano

app/Mage.php

@@ -216,7 +216,7 @@ public static function getOpenMageVersionInfo(): array
             return [
                 'major'     => '20',
                 'minor'     => '1',
-                'patch'     => '0',
+                'patch'     => '1',
                 'stability' => '', // beta,alpha,rc
                 'number'    => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
             ];
@@ -225,7 +225,7 @@ public static function getOpenMageVersionInfo(): array
         return [
             'major'     => '19',
             'minor'     => '5',
-            'patch'     => '0',
+            'patch'     => '1',
             'stability' => '', // beta,alpha,rc
             'number'    => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
         ];

app/code/core/Mage/Sales/Model/Quote.php

@@ -2096,10 +2096,10 @@ public function getCouponCode(): string
     }
 
     /**
-     * @param string $couponCode
+     * @param string|null $couponCode
      * @return $this
      */
-    public function setCouponCode(string $couponCode)
+    public function setCouponCode(?string $couponCode)
     {
         return $this->setData('coupon_code', $couponCode);
     }