Develop (#2)

* refactoring

Author: n3vrax

CHANGELOG.md

@@ -0,0 +1,15 @@
+## 0.1.0 - 2017-03-09
+
+Initial tagged release
+
+### Added
+* Everything
+
+### Deprecated
+* Nothing
+
+### Removed
+* Nothing
+
+### Fixed
+* Nothing

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "dotkernel/dot-controller-plugin-mail",
   "type": "library",
-  "description": "Mail controller plugin for easy access of mail services inside DK controllers",
+  "description": "DotKernel mail controller plugin component",
   "license": "MIT",
   "authors": [
     {
@@ -10,18 +10,15 @@
     }
   ],
   "require": {
-    "php": "^5.6 || ^7.0",
+    "php": "^7.1",
     "container-interop/container-interop": "^1.1",
 
-    "dotkernel/dot-controller": "0.6.x-dev"
+    "dotkernel/dot-controller": "~0.1",
+    "dotkernel/dot-mail": "~0.1"
   },
   "require-dev": {
     "phpunit/phpunit": "^4.8",
-    "squizlabs/php_codesniffer": "^2.3",
-
-    "dotkernel/dot-event": "0.6.x-dev",
-    "dotkernel/dot-helpers": "0.6.x-dev",
-    "dotkernel/dot-mail": "0.6.x-dev"
+    "squizlabs/php_codesniffer": "^2.3"
   },
   "autoload": {
     "psr-4": {
@@ -35,7 +32,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "0.6-dev"
+      "dev-master": "0.2-dev"
     }
   }
 }

src/ConfigProvider.php

@@ -7,6 +7,8 @@
  * Time: 7:49 PM
  */
 
+declare(strict_types = 1);
+
 namespace Dot\Controller\Plugin\Mail;
 
 use Dot\Controller\Plugin\Mail\Factory\MailPluginAbstractFactory;
@@ -20,11 +22,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

@@ -7,6 +7,8 @@
  * Time: 7:49 PM
  */
 
+declare(strict_types = 1);
+
 namespace Dot\Controller\Plugin\Mail\Factory;
 
 use Dot\Controller\Plugin\Mail\MailPlugin;
@@ -27,7 +29,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;
@@ -45,7 +47,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));
 
@@ -65,7 +67,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;
@@ -88,7 +90,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

@@ -7,6 +7,8 @@
  * Time: 7:49 PM
  */
 
+declare(strict_types = 1);
+
 namespace Dot\Controller\Plugin\Mail;
 
 use Dot\Controller\Plugin\PluginInterface;
@@ -83,7 +85,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])) {
@@ -109,8 +111,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);
             }
@@ -151,18 +161,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;
     }
 }