Close formers#250 - Wrap appended buttons in special class in BS3

Author: Anahkiasen

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 3.4.2
 
+- [add] Added the ability to specify multiple namespaces to look for fields in the MethodDispatcher
 - [fix] Fixed some bug when fetching data from the request
 - [fix] Fixed spaces in validation rules causing errors
 

src/Former/Form/Group.php

@@ -460,17 +460,7 @@ protected function placeAround($items, $place)
   {
     // Iterate over the items and place them where they should
     foreach ((array) $items as $item) {
-
-      // Render the item if it's an object
-      if (is_object($item) and method_exists($item, '__toString')) {
-        $item  = $item->__toString();
-      }
-
-      // If the item is not a button, wrap it
-      if (is_string($item) and !Str::startsWith($item, '<button')) {
-        $item = $this->app['former.framework']->placeAround($item);
-      }
-
+      $item = $this->app['former.framework']->placeAround($item);
       $this->{$place}[] = $item;
     }
   }

src/Former/Framework/TwitterBootstrap.php

@@ -281,6 +281,16 @@ public function createIcon($iconType, $attributes = array(), $iconSettings = arr
    */
   public function placeAround($item)
   {
+    // Render object
+    if (is_object($item) and method_exists($item, '__toString')) {
+      $item = $item->__toString();
+    }
+
+    // Return unwrapped if button
+    if (strpos($item, '<button') !== false) {
+      return $item;
+    }
+
     return Element::create('span', $item)->addClass('add-on');
   }
 

src/Former/Framework/TwitterBootstrap3.php

@@ -331,7 +331,15 @@ public function createDisabledField(Field $field)
    */
   public function placeAround($item)
   {
-    return Element::create('span', $item)->addClass('input-group-addon');
+    // Render object
+    if (is_object($item) and method_exists($item, '__toString')) {
+      $item = $item->__toString();
+    }
+
+    // Get class to use
+    $class = (strpos($item, '<button') !== false) ? 'btn' : 'addon';
+
+    return Element::create('span', $item)->addClass('input-group-'.$class);
   }
 
   /**

tests/Framework/TwitterBootstrap3Test.php

@@ -191,4 +191,11 @@ public function testAddFormControlClassToInlineActionsBlock()
     $this->former->close();
   }
 
+  public function testButtonsAreWrappedInSpecialClass()
+  {
+    $button = $this->former->text('foo')->append($this->former->button('Search'))->wrapAndRender();
+    $matcher = '<span class="input-group-btn"><button class="btn" type="button">Search</button></span>';
+
+    $this->assertContains($matcher, $button);
+  }
 }