Pass the fields namespace as argument to MethodsDispatcher

Author: Anahkiasen

src/Former/FormerServiceProvider.php

@@ -157,7 +157,7 @@ public function bindFormer(Container $app)
     });
 
     $app->singleton('former', function ($app) {
-      return new Former($app, new MethodDispatcher($app));
+      return new Former($app, new MethodDispatcher($app, Former::FIELDSPACE));
     });
 
     Helpers::setApp($app);

src/Former/MethodDispatcher.php

@@ -18,14 +18,22 @@ class MethodDispatcher
    */
   protected $app;
 
+  /**
+   * Where fields classes are stored
+   *
+   * @var string
+   */
+  protected $fields;
+
   /**
    * Build a new Dispatcher
    *
    * @param Container $app
    */
-  public function __construct(Container $app)
+  public function __construct(Container $app, $fields)
   {
-    $this->app = $app;
+    $this->app    = $app;
+    $this->fields = $fields;
   }
 
   /**
@@ -154,7 +162,7 @@ public function toActions($method, $parameters)
   public function toFields($method, $parameters)
   {
     // Listing parameters
-    $class = Former::FIELDSPACE.static::getClassFromMethod($method);
+    $class = $this->fields.$this->getClassFromMethod($method);
     $field = new $class(
       $this->app,
       $method,
@@ -180,11 +188,11 @@ public function toFields($method, $parameters)
    *
    * @return string The correct class
    */
-  protected static function getClassFromMethod($method)
+  protected function getClassFromMethod($method)
   {
     // If the field's name directly match a class, call it
     $class = Str::singular(Str::title($method));
-    if (class_exists(Former::FIELDSPACE.$class)) {
+    if (class_exists($this->fields.$class)) {
       return $class;
     }
 

src/Former/Traits/Field.php

@@ -84,11 +84,11 @@ protected function currentFramework()
   public function __construct(Container $app, $type, $name, $label, $value, $attributes)
   {
     // Set base parameters
-    $this->app        = $app;
-    $this->attributes = (array) $attributes;
-    $this->type       = $type;
-    $this->value      = $value;
-    $this->form       = $this->app->bound('former.form') ? $this->app['former.form'] : null;
+    $this->app   = $app;
+    $this->type  = $type;
+    $this->value = $value;
+    $this->setAttributes($attributes);
+    $this->form  = $this->app->bound('former.form') ? $this->app['former.form'] : null;
 
     // Compute and translate label
     $this->automaticLabels($name, $label);