Merge remote-tracking branch 'origin/master'

# Conflicts:
#	CHANGELOG.md
#	composer.json

Author: n3vrax

src/ConfigProvider.php

@@ -5,6 +5,8 @@
  * @license https://github.com/dotkernel/dot-controller-plugin-mail/blob/master/LICENSE.md MIT License
  */
 
+declare(strict_types = 1);
+
 namespace Dot\Controller\Plugin\Mail;
 
 use Dot\Controller\Plugin\Mail\Factory\MailPluginAbstractFactory;
@@ -18,11 +20,10 @@ class ConfigProvider
     /**
      * @return array
      */
-    public function __invoke()
+    public function __invoke(): array
     {
         return [
             'dot_controller' => [
-
                 'plugin_manager' => [
                     'abstract_factories' => [
                         MailPluginAbstractFactory::class,

src/Factory/MailPluginAbstractFactory.php

@@ -5,6 +5,8 @@
  * @license https://github.com/dotkernel/dot-controller-plugin-mail/blob/master/LICENSE.md MIT License
  */
 
+declare(strict_types = 1);
+
 namespace Dot\Controller\Plugin\Mail\Factory;
 
 use Dot\Controller\Plugin\Mail\MailPlugin;
@@ -25,7 +27,7 @@ class MailPluginAbstractFactory extends AbstractMailFactory
      * @param string $requestedName
      * @return bool
      */
-    public function canCreate(ContainerInterface $container, $requestedName)
+    public function canCreate(ContainerInterface $container, $requestedName): bool
     {
         if (strpos($requestedName, 'sendMail') !== 0) {
             return false;
@@ -43,7 +45,7 @@ public function canCreate(ContainerInterface $container, $requestedName)
      * @param $requestedName
      * @return string
      */
-    protected function getSpecificServiceName($requestedName)
+    protected function getSpecificServiceName(string $requestedName): string
     {
         $parts = explode('_', $this->camelCaseToUnderscore($requestedName));
 
@@ -63,7 +65,7 @@ protected function getSpecificServiceName($requestedName)
      * @param $value
      * @return mixed
      */
-    protected function camelCaseToUnderscore($value)
+    protected function camelCaseToUnderscore(string $value): string
     {
         if (!is_scalar($value) && !is_array($value)) {
             return $value;
@@ -86,7 +88,7 @@ protected function camelCaseToUnderscore($value)
      * @param array|null $options
      * @return MailPlugin
      */
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null): MailPlugin
     {
         $specificServiceName = $this->getSpecificServiceName($requestedName);
 

src/MailPlugin.php

@@ -5,6 +5,8 @@
  * @license https://github.com/dotkernel/dot-controller-plugin-mail/blob/master/LICENSE.md MIT License
  */
 
+declare(strict_types = 1);
+
 namespace Dot\Controller\Plugin\Mail;
 
 use Dot\Controller\Plugin\PluginInterface;
@@ -81,7 +83,7 @@ public function __invoke(
      * @param array $args
      * @return array
      */
-    protected function normalizeMailArgs(array $args)
+    protected function normalizeMailArgs(array $args): array
     {
         // If the first argument is an array, use it as the mail configuration
         if (is_array($args[0])) {
@@ -107,8 +109,16 @@ protected function applyArgsToMailService(array $args)
         if (isset($args['body'])) {
             $body = $args['body'];
             if (is_array($body)) {
-                //consider this as a template name and its params
-                $this->mailService->setTemplate($body[0], $body[1]);
+                $charset = $body['charset'] ?? MailServiceInterface::DEFAULT_CHARSET;
+                if (isset($body['content']) && is_string($body['content'])) {
+                    $this->mailService->setBody($body['content'], $charset);
+                } elseif (isset($body['template']) && is_array($body['template'])) {
+                    $name = $body['template']['name'] ?? '';
+                    $params = $body['template']['params'] ?? [];
+                    if (!empty($name)) {
+                        $this->mailService->setTemplate($name, $params, $charset);
+                    }
+                }
             } else {
                 $this->mailService->setBody($body);
             }
@@ -149,18 +159,16 @@ protected function applyArgsToMailService(array $args)
     /**
      * @return MailServiceInterface
      */
-    public function getMailService()
+    public function getMailService(): MailServiceInterface
     {
         return $this->mailService;
     }
 
     /**
      * @param MailServiceInterface $mailService
-     * @return $this
      */
     public function setMailService(MailServiceInterface $mailService)
     {
         $this->mailService = $mailService;
-        return $this;
     }
 }