Skip to content

Symfony four #3

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

Open
baron-suslin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Symfony four #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
566dc44
For symfony four.
Feb 15, 2019
24386e5
Change Swift_Mime_Message to Swift_Message
Feb 15, 2019
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 Email/AbstractEmailType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ abstract class AbstractEmailType implements EmailTypeInterface
/**
* {@inheritdoc}
*/
abstract public function buildMessage(\Swift_Mime_Message $message, array $parameters);
abstract public function buildMessage(\Swift_Message $message, array $parameters);

/**
* @param EngineInterface $templating
Expand Down
4 changes: 2 additions & 2 deletions Email/EmailTypeInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ interface EmailTypeInterface
/**
* Builds message instance
*
* @param \Swift_Mime_Message $message
* @param \Swift_Message $message
* @return mixed
*/
public function buildMessage(\Swift_Mime_Message $message, array $parameters);
public function buildMessage(\Swift_Message $message, array $parameters);

/**
* Set's templating engine
Expand Down
2 changes: 1 addition & 1 deletion Email/TemplateType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ protected function setTemplateVariable($key, $value)
/**
* {@inheritdoc}
*/
public function buildMessage(\Swift_Mime_Message $message, array $parameters)
public function buildMessage(\Swift_Message $message, array $parameters)
{
if ($this->subject instanceof TranslatableString) {
$this->subject = $this->subject->getString($this->getTranslator());
Expand Down
6 changes: 3 additions & 3 deletions Service/EmailSender.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ public function addParameter($key, $value)
$this->parameters[$key] = $value;
}

public function buildMessage(EmailTypeInterface $type, \Swift_Mime_Message $message = null)
public function buildMessage(EmailTypeInterface $type, \Swift_Message $message = null)
{
if (null === $message) {
$message = \Swift_Message::newInstance();
$message = new \Swift_Message();
}

$type->setTemplating($this->templating);
Expand All @@ -52,7 +52,7 @@ public function buildMessage(EmailTypeInterface $type, \Swift_Mime_Message $mess
return $message;
}

public function sendMessage(\Swift_Mime_Message $message)
public function sendMessage(\Swift_Message $message)
{
return $this->mailer->send($message);
}
Expand Down
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
}
],
"require": {
"swiftmailer/swiftmailer": "^4.2 || ^5.0",
"symfony/framework-bundle": "^2.3 || ^3.0",
"symfony/dependency-injection": "^3.1",
"symfony/yaml": "^2.3 || ^3.0"
"swiftmailer/swiftmailer": "^4.2 || ^6.0",
"symfony/framework-bundle": "^3.0 || ^4.1",
"symfony/dependency-injection": "^3.1 || ^4.1",
"symfony/yaml": "^3.0 || ^4.1"
},
"autoload": {
"psr-4": {
Expand Down