Skip to content

Replaced Zend_Mail_Transport_Sendmail with Laminas\Mail\Transport\Sendmail #3191

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.

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/code/core/Mage/Core/Model/Email/Queue.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public function send()
if ($message->getId()) {
$parameters = new Varien_Object($message->getMessageParameters());
if ($parameters->getReturnPathEmail() !== null) {
$mailTransport = new Zend_Mail_Transport_Sendmail("-f" . $parameters->getReturnPathEmail());
$mailTransport = new \Laminas\Mail\Transport\Sendmail("-f" . $parameters->getReturnPathEmail());
Zend_Mail::setDefaultTransport($mailTransport);
}

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Core/Model/Email/Template.php
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ public function send($email, $name = null, array $variables = [])
$mail = $this->getMail();

if ($returnPathEmail !== null) {
$mailTransport = new Zend_Mail_Transport_Sendmail("-f" . $returnPathEmail);
$mailTransport = new \Laminas\Mail\Transport\Sendmail("-f" . $returnPathEmail);
Zend_Mail::setDefaultTransport($mailTransport);
}

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Core/Model/Email/Transport.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
* @category Mage
* @package Mage_Core
*/
class Mage_Core_Model_Email_Transport extends Zend_Mail_Transport_Sendmail
class Mage_Core_Model_Email_Transport extends \Laminas\Mail\Transport\Sendmail
{
}
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"colinmollenhour/cache-backend-redis": "^1.14",
"colinmollenhour/magento-redis-session": "^3.1",
"cweagans/composer-patches": "^1.7",
"laminas/laminas-mail": "^2.16",
"magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0",
"pelago/emogrifier": "^7.0",
"phpseclib/mcrypt_compat": "^2.0.3",
Expand Down
Loading