review

Author: kostant85

composer.json

@@ -6,10 +6,10 @@
     },
     "autoload": {
         "files": [
-            "src/Form2Email/functions.php"
+            "src/functions.php"
         ],
         "psr-4": {
-            "justcoded\\form2email\\": "src/Form2Email/"
+            "justcoded\\form2email\\": "src/"
         }
     },
     "license": "MIT",

examples/form.php

@@ -2,10 +2,15 @@
 
 require __DIR__.'/../vendor/autoload.php';
 
-use justcoded\form2email\Handler\FormHandler;
+
+use justcoded\form2email\FormHandler;
 use justcoded\form2email\Handler\MailHandler;
 use justcoded\form2email\Message\Message;
 
+/*
+ini_set('display_errors', 1);
+error_reporting(E_ALL);*/
+
 $validation  = [
     'rules' => [
         'required' => [
@@ -43,7 +48,7 @@
 
 $mailerHandler = new MailHandler($mailerConfig, new Message($message));
 
-$formHandler = new FormHandler($validation, $mailerHandler->getMailer());
+$formHandler = new FormHandler($validation, $mailerHandler);
 
 if ($formHandler->validate($_POST)) {
     $formHandler->process();

src/Form2Email/Mailer/MailerInterface.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace justcoded\form2email\Handler;
+namespace justcoded\form2email;
 
-use justcoded\form2email\Mailer\MailerInterface;
+
+use justcoded\form2email\Handler\HandlerInterface;
 use Valitron\Validator;
 
 class FormHandler
@@ -19,7 +20,7 @@ class FormHandler
 
     protected $formFields;
 
-    public function __construct(array $validation, MailerInterface $handler, string $response = 'json')
+    public function __construct(array $validation, HandlerInterface $handler, string $response = 'json')
     {
         $this->validation = $validation;
 

src/Form2Email/functions.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace justcoded\form2email\Handler;
+
+interface HandlerInterface
+{
+    public function process($formFields);
+}

src/Form2Email/Handler/FormHandler.php src/FormHandler.phpsrc/Form2Email/Handler/FormHandler.php renamed to src/FormHandler.php

@@ -2,10 +2,10 @@
 
 namespace justcoded\form2email\Handler;
 
-use justcoded\form2email\Mailer\PhpMailerSend;
+use justcoded\form2email\Mailer\PhpHandlerSend;
 use justcoded\form2email\Message\Message;
 
-class MailHandler
+class MailHandler implements HandlerInterface
 {
     const USE_PHPMAILER = 1;
     const USE_POSTMARKAPP = 2;
@@ -26,10 +26,14 @@ public function getMailer()
 
         switch ($mailerId) {
             case self::USE_PHPMAILER:
-                return new PhpMailerSend($this->config, $this->message);
+                return new PhpHandlerSend($this->config, $this->message);
         }
 
         throw new \Exception('Bad config');
     }
 
+    public function process($data)
+    {
+        $this->getMailer()->send($data);
+    }
 }

src/Handler/HandlerInterface.php

@@ -2,11 +2,12 @@
 
 namespace justcoded\form2email\Mailer;
 
+
 use justcoded\form2email\Message\Message;
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception;
 
-class PhpMailerSend implements MailerInterface
+class PhpHandlerSend
 {
     protected $message;
 
@@ -58,7 +59,7 @@ public function getPassword()
     }
 
 
-    public function process($formFields)
+    public function send($formFields)
     {
         $mail = new PHPMailer(true);                    // Passing `true` enables exceptions
         try {
@@ -94,7 +95,7 @@ public function process($formFields)
             //Content
             $mail->isHTML(true);                                  // Set email format to HTML
             $mail->Subject = $this->message->getSubject();
-            $mail->Body = $this->message->getTemplate($formFields);;
+            $mail->Body = $this->message->getTemplate($formFields);
             $mail->AltBody = $this->message->getAltBody();
 
             $mail->send();

src/Form2Email/Handler/MailHandler.php src/Handler/MailHandler.phpsrc/Form2Email/Handler/MailHandler.php renamed to src/Handler/MailHandler.php

@@ -0,0 +1,17 @@
+<?php
+
+if (!function_exists('template')) {
+    function template ($templateName, $data) {
+        $wholePath = __DIR__ . '/../examples/' . $templateName;
+        ob_start();
+        require $wholePath;
+        $templateString = ob_get_clean();
+
+//        return preg_replace("|{(\w*)}|e", '$data["$1"]', $templateString);
+        foreach ($data as $key => $field) {
+            $templateString = str_replace('{' . $key . '}', $field,$templateString);
+        }
+
+        return $templateString;
+    }
+}