Merge branch '2.4-develop' into 2.4

mageplaza · Jan 18, 2021 · df8f442 · df8f442
2 parents f0e2cf3 + 654f20e
commit df8f442
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/Block/Adminhtml/AbandonedCart/Edit/Form.php b/Block/Adminhtml/AbandonedCart/Edit/Form.php
@@ -404,6 +404,8 @@ public function format(Address $address, $storeId, $type = 'html')
     }
 
     /**
+     * @param string|int $customerGroupId
+     *
      * @return string
      */
     public function getCustomerGroupName($customerGroupId)

diff --git a/Helper/EmailMarketing.php b/Helper/EmailMarketing.php
@@ -212,6 +212,7 @@ class EmailMarketing extends Data
      * @var null
      */
     protected $_salesAmountExpression= null;
+
     /**
      * EmailMarketing constructor.
      *
@@ -233,6 +234,10 @@ class EmailMarketing extends Data
      * @param ReportOrderCollectionFactory $reportCollectionFactory
      * @param CustomerFactory $customerFactory
      * @param SubscriberFactory $subscriberFactory
+     * @param GroupFactory $groupFactory
+     * @param OrderConfig $orderConfig
+     * @param TimezoneInterface $localeDate
+     * @param Config $addressConfig
      * @param LoggerInterface $logger
      */
     public function __construct(

diff --git a/Observer/Quote/SetToken.php b/Observer/Quote/SetToken.php
@@ -40,7 +40,8 @@ class SetToken implements ObserverInterface
     protected $random;
 
     /**
-     * BuildACEData constructor.
+     * SetToken constructor.
+     *
      * @param Random $random
      */
     public function __construct(