Merge pull request #1 from dotkernel/develop

Develop

Author: n3vrax

composer.json

@@ -11,18 +11,17 @@
   ],
   "require": {
     "php": "^5.6 || ^7.0",
-    "psr/http-message": "^1.0",
     "container-interop/container-interop": "^1.1",
-    "zendframework/zend-stdlib": "^3.0",
 
-    "dotkernel/dot-event": "0.6.x-dev",
-    "dotkernel/dot-helpers": "0.6.x-dev",
-    "dotkernel/dot-mail": "0.6.x-dev",
     "dotkernel/dot-controller": "0.6.x-dev"
   },
   "require-dev": {
     "phpunit/phpunit": "^4.8",
-    "squizlabs/php_codesniffer": "^2.3"
+    "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"
   },
   "autoload": {
     "psr-4": {

src/ConfigProvider.php

@@ -9,7 +9,6 @@
 
 namespace Dot\Controller\Plugin\Mail;
 
-
 use Dot\Controller\Plugin\Mail\Factory\MailPluginAbstractFactory;
 
 /**
@@ -34,4 +33,4 @@ public function __invoke()
             ],
         ];
     }
-}
+}

src/Factory/MailPluginAbstractFactory.php

@@ -9,7 +9,6 @@
 
 namespace Dot\Controller\Plugin\Mail\Factory;
 
-
 use Dot\Controller\Plugin\Mail\MailPlugin;
 use Dot\Mail\Factory\AbstractMailFactory;
 use Dot\Mail\Factory\MailServiceAbstractFactory;
@@ -42,24 +41,6 @@ public function canCreate(ContainerInterface $container, $requestedName)
         return array_key_exists($specificServiceName, $this->getConfig($container));
     }
 
-    /**
-     * @param ContainerInterface $container
-     * @param string $requestedName
-     * @param array|null $options
-     * @return MailPlugin
-     */
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
-    {
-        $specificServiceName = $this->getSpecificServiceName($requestedName);
-
-        /** @var MailServiceInterface $mailService */
-        $mailService = $container->get(sprintf(
-            '%s.%s.%s', self::DOT_MAIL_PART, MailServiceAbstractFactory::SPECIFIC_PART, $specificServiceName
-        ));
-
-        return new MailPlugin($mailService);
-    }
-
     /**
      * @param $requestedName
      * @return string
@@ -74,12 +55,9 @@ protected function getSpecificServiceName($requestedName)
 
         //discard the sendMail part
         $parts = array_slice($parts, 2);
-        $specificServiceName = '';
-        foreach ($parts as $part) {
-            $specificServiceName .= $part;
-        }
+        $specificServiceName = implode('_', $parts);
 
-        //convert from camecase to underscores and set to lower
+        //convert from camelcase to underscores and set to lower
         return strtolower($specificServiceName);
     }
 
@@ -103,4 +81,27 @@ protected function camelCaseToUnderscore($value)
 
         return preg_replace($pattern, $replacement, $value);
     }
-}
+
+    /**
+     * @param ContainerInterface $container
+     * @param string $requestedName
+     * @param array|null $options
+     * @return MailPlugin
+     */
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    {
+        $specificServiceName = $this->getSpecificServiceName($requestedName);
+
+        /** @var MailServiceInterface $mailService */
+        $mailService = $container->get(
+            sprintf(
+                '%s.%s.%s',
+                self::DOT_MAIL_PART,
+                MailServiceAbstractFactory::SPECIFIC_PART,
+                $specificServiceName
+            )
+        );
+
+        return new MailPlugin($mailService);
+    }
+}

src/MailPlugin.php

@@ -108,11 +108,10 @@ protected function applyArgsToMailService(array $args)
     {
         if (isset($args['body'])) {
             $body = $args['body'];
-            if(is_array($body)) {
+            if (is_array($body)) {
                 //consider this as a template name and its params
                 $this->mailService->setTemplate($body[0], $body[1]);
-            }
-            else {
+            } else {
                 $this->mailService->setBody($body);
             }
         }
@@ -150,20 +149,20 @@ protected function applyArgsToMailService(array $args)
     }
 
     /**
-     * @param MailServiceInterface $mailService
-     * @return $this
+     * @return MailServiceInterface
      */
-    public function setMailService(MailServiceInterface $mailService)
+    public function getMailService()
     {
-        $this->mailService = $mailService;
-        return $this;
+        return $this->mailService;
     }
 
     /**
-     * @return MailServiceInterface
+     * @param MailServiceInterface $mailService
+     * @return $this
      */
-    public function getMailService()
+    public function setMailService(MailServiceInterface $mailService)
     {
-        return $this->mailService;
+        $this->mailService = $mailService;
+        return $this;
     }
-}
+}