WIP

Author: tomkiernan120

php-error.log

@@ -0,0 +1,4 @@
+[19-Feb-2019 17:13:21 Europe/London] PHP Catchable fatal error:  Object of class Test could not be converted to string in /websites/active/_tom/HTTPFriend/src/Form/FormHandler.php on line 39
+[19-Feb-2019 17:13:42 Europe/London] PHP Catchable fatal error:  Object of class Test could not be converted to string in /websites/active/_tom/HTTPFriend/src/Form/FormHandler.php on line 39
+[19-Feb-2019 17:17:18 Europe/London] 
+[19-Feb-2019 17:17:18 Europe/London] PHP Fatal error:  Call to a member function text() on null in /websites/active/_tom/HTTPFriend/test/index.php on line 21

src/Form/Handler.php renamed to src/Form/FormHandler.php

@@ -4,7 +4,7 @@
 
 use HTTPFriend\Tags\Tag as Tag;
 
-class Handler
+class FormHandler
 {
 
   public $subittedData;
@@ -16,25 +16,34 @@ public function __construct()
     $this->tag = new Tag;
   }
 
-  public function open($formSettings = [])
+  public function open( $formSettings = [])
   {
 
     if (!isset($formSettings["method"])) {
       $attributes["method"] = "POST";
-    } else {
+    } 
+    else {
       $attributes["method"] = trim($formSettings["method"]);
     }
 
     if (isset($formSettings["action"])) {
       $attributes["action"] = $formSettings["action"];
-    } else {
+    } 
+    else {
       $attributes["action"] = "./";
     }
 
     $formname = "http-friend-name-";
 
-    if (isset($formSettings["controller"]) && isset($formSettings["controllerMethod"])) {
-      $formname .= "-{$formSettings["controller"]}-{$formSettings["controllerMethod"]}";
+    if( isset( $formSettings["controller"] ) && is_string( $formSettings["controller"] ) ) {
+      $formname .= "{$formSettings["controller"]}-";
+    }
+    else if( is_object( $formSettings["controller"] ) ){
+      $formname .= get_class( $formSettings["controller"] )."-";
+    }
+
+    if( isset( $formSettings["controllerMethod"] ) && is_string( $formSettings["controllerMethod"] ) ) {
+      $formname .= "-{$formSettings["controllerMethod"]}";
     }
 
     $formname .= "-{$this->formcount}";
@@ -46,13 +55,15 @@ public function open($formSettings = [])
     }
 
     ob_start();
+
     $this->tag->output(["tag" => "form", "attr" => $attributes]);
 
     $this->tag->output(["tag" => "input", "attr" => ["type" => "hidden", "name" => $formname]]);
 
     $this->formcount++;
 
     echo ob_get_clean();
+
     return $this;
   }
 
@@ -65,21 +76,29 @@ public function close()
   public function processFormSubmission($data = [], $settings)
   {
     $returnData = [];
-    if (isset($settings["controller"]) && class_exists($settings["controller"])) {
-
+    if (isset($settings["controller"]) && is_string( $settings["controller"] ) && class_exists($settings["controller"]) ) {
       $controller = new $settings["controller"](@$settings["controllerPassin"]);
+    }
+    else if( isset( $settings["controller"] ) && is_object( $settings["controller"] ) ){
+      $controller = $settings["controller"];
+    }
+     else if( !isset( $settings["controller"] ) ) {
+      throw new \Exception("No Controller passed to form");
+    }
+    else {
+      throw new \Exception("Could not find {$settings["controller"]}");
+    }
 
-      if (isset($settings["controllerMethod"]) && method_exists($controller, $settings["controllerMethod"])) {
-        $returnData = $controller->{$settings["controllerMethod"]}(@$settings["passin"]);
-      } else {
-        throw new Exception("No method defined for {$settings["controller"]}:{$settings["controllerMethod"]}");
-      }
+    if (isset($settings["controllerMethod"]) && method_exists( $controller, $settings["controllerMethod"])) {
+      $returnData = $controller->{$settings["controllerMethod"]}(@$settings["passin"]);
     } else {
-      throw new Exception("Could not find {$settings["controller"]}");
+      throw new \Exception("No method defined for {$settings["controller"]}:{$settings["controllerMethod"]}");
     }
 
     return $returnData;
-  }
+  } 
+   
+
 
   public function text($attr = [], $options = [])
   {

src/HTTPHelper.php

@@ -3,7 +3,7 @@
 namespace HTTPFriend;
 
 
-use HTTPFriend\Form\Handler as Handler;
+use HTTPFriend\Form\FormHandler as FormHandler;
 use HTTPFriend\Tags\Tag as Tag;
 use HTTPFriend\Tags\Link as Link;
 use HTTPFriend\Tags\Meta as Meta;
@@ -24,7 +24,7 @@ class HTTPHelper
     public function __construct($config = [])
     {
         $this->setConfig($config);
-        $this->form = $this->form ?: new Handler;
+        $this->form = $this->form ?: new FormHandler;
         $this->tag = $this->tag ? : new Tag;
         $this->CSS = $this->CSS ? : new Css;
         $this->JS = $this->JS ? : new Js;