Skip to content

[Sales] add getMailer and Email-Queues #5625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Hanmac wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

[Sales] add getMailer and Email-Queues #5625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3ad9da4
[Sales] add getMailer and Email-Queues
Hanmac Jun 2, 2026
c865fad
~cs fixer
Hanmac Jun 2, 2026
811ee71
~ move duplicated _getEmails to Mage_Sales_Model_Abstract
Hanmac Jun 2, 2026
7236ed6
~ phpstan
Hanmac Jun 2, 2026
ab1b5e2
~ use finally for stopEnvironmentEmulation
Hanmac Jun 3, 2026
80618b0
~ phpstan
Hanmac Jun 3, 2026
92f15a6
~ phpstan
Hanmac Jun 3, 2026
5f64268
add getPaymentBlockHtml method
Hanmac Jun 3, 2026
a0c29af
~ phpstan
Hanmac Jun 3, 2026
cd6916f
~rector
Hanmac Jun 3, 2026
3cbadba
~ add Mage_Sales_Model_Order_Comment_Abstract as base class
Hanmac Jun 3, 2026
5854cc5
~ cs fix
Hanmac Jun 3, 2026
a1155b2
~ rector add strict_types
Hanmac Jun 3, 2026
24643aa
~ rector add strict_types
Hanmac Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions .phpstan.dist.baselines/argument.type.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5826,11 +5826,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Observer.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $info of method Mage_Payment_Helper_Data::getInfoBlock() expects Mage_Payment_Model_Info, Mage_Sales_Model_Order_Payment|false given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $item of method Mage_Sales_Model_Order_Item::setParentItem() expects Mage_Sales_Model_Order_Item, Mage_Sales_Model_Order_Item|null given.',
'count' => 1,
Expand All @@ -5841,11 +5836,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $storeId of method Mage_Core_Model_App_Emulation::startEnvironmentEmulation() expects int, int|null given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $storeId of method Mage_Core_Model_Email_Template_Mailer::setStoreId() expects int, int|null given.',
'count' => 2,
Expand Down Expand Up @@ -5886,16 +5876,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Creditmemo.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $info of method Mage_Payment_Helper_Data::getInfoBlock() expects Mage_Payment_Model_Info, Mage_Sales_Model_Order_Payment|false given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Creditmemo.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $storeId of method Mage_Core_Model_App_Emulation::startEnvironmentEmulation() expects int, int|null given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Creditmemo.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $storeId of method Mage_Core_Model_Email_Template_Mailer::setStoreId() expects int, int|null given.',
'count' => 2,
Expand All @@ -5911,11 +5891,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $info of method Mage_Payment_Helper_Data::getInfoBlock() expects Mage_Payment_Model_Info, Mage_Sales_Model_Order_Payment|false given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Invoice.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $invoiceId of method Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection::setInvoiceFilter() expects int, int|string|null given.',
'count' => 1,
Expand All @@ -5926,11 +5901,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Invoice.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $storeId of method Mage_Core_Model_App_Emulation::startEnvironmentEmulation() expects int, int|null given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Invoice.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $storeId of method Mage_Core_Model_Email_Template_Mailer::setStoreId() expects int, int|null given.',
'count' => 2,
Expand Down Expand Up @@ -6066,11 +6036,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $info of method Mage_Payment_Helper_Data::getInfoBlock() expects Mage_Payment_Model_Info, Mage_Sales_Model_Order_Payment|false given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Shipment.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $shipmentId of method Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection::setShipmentFilter() expects int, int|string|null given.',
'count' => 1,
Expand All @@ -6086,11 +6051,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Shipment.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $storeId of method Mage_Core_Model_App_Emulation::startEnvironmentEmulation() expects int, int|null given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Shipment.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Parameter #1 $storeId of method Mage_Core_Model_Email_Template_Mailer::setStoreId() expects int, int|null given.',
'count' => 2,
Expand Down
25 changes: 0 additions & 25 deletions .phpstan.dist.baselines/booleanAnd.leftNotBoolean.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,11 +996,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Checkout/Controller/Action.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in &&, array|false given on the left side.',
'count' => 2,
'path' => __DIR__ . '/../app/code/core/Mage/Checkout/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in &&, Mage_Sales_Model_Quote_Address|null given on the left side.',
'count' => 3,
Expand Down Expand Up @@ -1916,31 +1911,16 @@
'count' => 2,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in &&, array|false given on the left side.',
'count' => 4,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in &&, null given on the left side.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in &&, array|bool given on the left side.',
'count' => 4,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Creditmemo.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in &&, float given on the left side.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in &&, array|bool given on the left side.',
'count' => 4,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Invoice.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in &&, float given on the left side.',
'count' => 1,
Expand Down Expand Up @@ -1991,11 +1971,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in &&, array|false given on the left side.',
'count' => 4,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Shipment.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in &&, int|string|null given on the left side.',
'count' => 1,
Expand Down
20 changes: 0 additions & 20 deletions .phpstan.dist.baselines/booleanNot.exprNotBoolean.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5751,11 +5751,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in a negated boolean, array|false given.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in a negated boolean, int|string|null given.',
'count' => 8,
Expand All @@ -5776,11 +5771,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Api.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in a negated boolean, array|bool given.',
'count' => 2,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Creditmemo.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in a negated boolean, int|string|null given.',
'count' => 1,
Expand All @@ -5796,11 +5786,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in a negated boolean, array|bool given.',
'count' => 2,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Invoice.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in a negated boolean, int|string|null given.',
'count' => 1,
Expand Down Expand Up @@ -5896,11 +5881,6 @@
'count' => 3,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in a negated boolean, array|false given.',
'count' => 2,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Shipment.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Only booleans are allowed in a negated boolean, int<0, max> given.',
'count' => 1,
Expand Down
22 changes: 1 addition & 21 deletions .phpstan.dist.baselines/empty.notAllowed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1326,11 +1326,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Checkout/Helper/Cart.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Construct empty() is not allowed. Use more strict comparison.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Checkout/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Construct empty() is not allowed. Use more strict comparison.',
'count' => 2,
Expand Down Expand Up @@ -2648,29 +2643,19 @@
];
$ignoreErrors[] = [
'rawMessage' => 'Construct empty() is not allowed. Use more strict comparison.',
'count' => 8,
'count' => 7,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Construct empty() is not allowed. Use more strict comparison.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Construct empty() is not allowed. Use more strict comparison.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Creditmemo.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Construct empty() is not allowed. Use more strict comparison.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Construct empty() is not allowed. Use more strict comparison.',
'count' => 3,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Invoice.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Construct empty() is not allowed. Use more strict comparison.',
'count' => 3,
Expand All @@ -2696,11 +2681,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Construct empty() is not allowed. Use more strict comparison.',
'count' => 2,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Shipment.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Construct empty() is not allowed. Use more strict comparison.',
'count' => 1,
Expand Down
10 changes: 0 additions & 10 deletions .phpstan.dist.baselines/foreach.nonIterable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,16 +511,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Block/Order/Totals.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Argument of an invalid type array|true supplied for foreach, only iterables are supported.',
'count' => 4,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Creditmemo.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Argument of an invalid type array|true supplied for foreach, only iterables are supported.',
'count' => 4,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Invoice.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Argument of an invalid type (iterable<Mage_Sales_Model_Order_Creditmemo>&Mage_Sales_Model_Resource_Order_Creditmemo_Collection)|false supplied for foreach, only iterables are supported.',
'count' => 1,
Expand Down
25 changes: 0 additions & 25 deletions .phpstan.dist.baselines/missingType.generics.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,21 +726,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Sales_Block_Order_Comments::getComments() return type with generic class Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract does not specify its types: T',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Block/Order/Comments.php',
];
$ignoreErrors[] = [
'rawMessage' => 'PHPDoc tag @var for variable $commentCollection contains generic class Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract but does not specify its types: T',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Block/Order/Comments.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Property Mage_Sales_Block_Order_Comments::$_commentCollection with generic class Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract does not specify its types: T',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Block/Order/Comments.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Sales_Block_Order_Details::getInvoices() return type with generic class Mage_Sales_Model_Resource_Order_Collection_Abstract does not specify its types: T',
'count' => 1,
Expand Down Expand Up @@ -856,16 +841,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Sales_Model_Order_Creditmemo::getCommentsCollection() return type with generic class Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract does not specify its types: T',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Creditmemo.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Sales_Model_Order_Invoice::getCommentsCollection() return type with generic class Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract does not specify its types: T',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Invoice.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Sales_Model_Resource_Order_Collection::addAddressFields() return type with generic class Mage_Sales_Model_Resource_Collection_Abstract does not specify its types: T',
'count' => 1,
Expand Down
25 changes: 0 additions & 25 deletions .phpstan.dist.baselines/missingType.iterableValue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10486,11 +10486,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Checkout/Helper/Cart.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Checkout_Helper_Data::_getEmails() return type has no value type specified in iterable type array.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Checkout/Helper/Data.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Checkout_Helper_Data::getRequiredAgreementIds() return type has no value type specified in iterable type array.',
'count' => 1,
Expand Down Expand Up @@ -21836,11 +21831,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Sales_Model_Order::_getEmails() return type has no value type specified in iterable type array.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Sales_Model_Order::getItemsCollection() has parameter $filterByTypes with no value type specified in iterable type array.',
'count' => 1,
Expand Down Expand Up @@ -21921,11 +21911,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Config.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Sales_Model_Order_Creditmemo::_getEmails() return type has no value type specified in iterable type array.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Creditmemo.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Sales_Model_Order_Creditmemo::getFilteredCollectionItems() has parameter $filter with no value type specified in iterable type array.',
'count' => 1,
Expand Down Expand Up @@ -21991,11 +21976,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Creditmemo/Api/V2.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Sales_Model_Order_Invoice::_getEmails() return type has no value type specified in iterable type array.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Invoice.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Sales_Model_Order_Invoice::getStates() return type has no value type specified in iterable type array.',
'count' => 1,
Expand Down Expand Up @@ -22246,11 +22226,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Sales_Model_Order_Shipment::_getEmails() return type has no value type specified in iterable type array.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Sales/Model/Order/Shipment.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Method Mage_Sales_Model_Order_Shipment_Api::_getCarriers() return type has no value type specified in iterable type array.',
'count' => 1,
Expand Down
Loading
Loading