Merge pull request formers#255 from tortuetorche/patch-1

[L4] Support Bootstrap 3 inline checkbox and radio.

Author: Anahkiasen

src/Former/Framework/TwitterBootstrap3.php

@@ -147,6 +147,25 @@ public function errorState()
     return 'has-error';
   }
 
+  /**
+   * Returns corresponding inline class of a field
+   *
+   * @param Field $field
+   *
+   * @return string
+   */
+  public function getInlineLabelClass($field)
+  {
+    $inlineClass = parent::getInlineLabelClass($field);
+    if ($field->isOfType('checkbox', 'checkboxes')) {
+      $inlineClass = 'checkbox-'.$inlineClass;
+    } elseif ($field->isOfType('radio', 'radios')) {
+      $inlineClass = 'radio-'.$inlineClass;
+    }
+
+    return $inlineClass;
+  }
+
   /**
    * Set the fields width from a label width
    *

src/Former/Traits/Checkable.php

@@ -309,7 +309,7 @@ protected function createCheckable($item, $fallbackValue = 1)
     }
 
     // If inline items, add class
-    $isInline = $this->inline ? ' inline' : null;
+    $isInline = $this->inline ? ' '.$this->app['former.framework']->getInlineLabelClass($this) : null;
 
     // Merge custom attributes with global attributes
     $attributes = array_merge($this->attributes, $attributes);

src/Former/Traits/Framework.php

@@ -147,6 +147,19 @@ public function errorState()
     return 'error';
   }
 
+
+  /**
+   * Returns corresponding inline class of a field
+   *
+   * @param Field $field
+   *
+   * @return string
+   */
+  public function getInlineLabelClass($field)
+  {
+    return 'inline';
+  }
+
   /**
    * Set framework defaults from its config file
    */

tests/Fields/CheckboxTest.php

@@ -30,7 +30,9 @@ private function matchCheckbox($name = 'foo', $label = null, $value = 1, $inline
       'for'   => $name,
       'class' => 'checkbox',
     );
-    if ($inline) $labelAttr['class'] .= ' inline';
+    if ($inline) {
+      $labelAttr['class'] .= $this->former->framework() === 'TwitterBootstrap3' ? ' checkbox-inline' : ' inline';
+    }
     if (!$checked) unset($checkAttr['checked']);
 
     $radio = '<input'.$this->attributes($checkAttr).'>';
@@ -111,6 +113,19 @@ public function testCanCreateInlineCheckboxes()
     $this->assertEquals($matcher, $checkboxes2);
   }
 
+  public function testCanCreateInlineCheckboxesTwitterBootstrap3()
+  {
+    $this->former->framework('TwitterBootstrap3');
+
+    $checkboxes1 = $this->former->inline_checkboxes('foo')->checkboxes('foo', 'bar')->__toString();
+    $this->resetLabels();
+    $checkboxes2 = $this->former->checkboxes('foo')->inline()->checkboxes('foo', 'bar')->__toString();
+    $matcher = $this->formGroup($this->matchCheckbox('foo_0', 'Foo', 1, true).$this->matchCheckbox('foo_1', 'Bar', 1, true));
+
+    $this->assertEquals($matcher, $checkboxes1);
+    $this->assertEquals($matcher, $checkboxes2);
+  }
+
   public function testCanCreateStackedCheckboxes()
   {
     $checkboxes1 = $this->former->stacked_checkboxes('foo')->checkboxes('foo', 'bar')->__toString();

tests/Fields/RadioTest.php

@@ -30,7 +30,9 @@ private function matchRadio($name = 'foo', $label = null, $value = 1, $inline =
       'for'   => $name,
       'class' => 'radio',
     );
-    if ($inline) $labelAttr['class'] .= ' inline';
+    if ($inline) {
+      $labelAttr['class'] .= $this->former->framework() === 'TwitterBootstrap3' ? ' radio-inline' : ' inline';
+    }
     if (!$checked) unset($radioAttr['checked']);
 
     $radio = '<input'.$this->attributes($radioAttr).'>';
@@ -101,6 +103,20 @@ public function testInline()
     $this->assertEquals($matcher, $radios2);
   }
 
+  public function testInlineTwitterBootstrap3()
+  {
+    $this->former->framework('TwitterBootstrap3');
+
+    $radios1 = $this->former->inline_radios('foo')->radios('foo', 'bar')->__toString();
+    $this->resetLabels();
+    $radios2 = $this->former->radios('foo')->inline()->radios('foo', 'bar')->__toString();
+
+    $matcher = $this->formGroup($this->matchRadio('foo', 'Foo', 0, true).$this->matchRadio('foo2', 'Bar', 1, true));
+
+    $this->assertEquals($matcher, $radios1);
+    $this->assertEquals($matcher, $radios2);
+  }
+
   public function testStacked()
   {
     $radios1 = $this->former->stacked_radios('foo')->radios('foo', 'bar')->__toString();

tests/TestCases/FormerTests.php

@@ -258,6 +258,19 @@ protected function controlGroup($input = '<input type="text" name="foo" id="foo"
     return '<div class="control-group">'.$label.'<div class="controls">'.$input.'</div></div>';
   }
 
+  /**
+   * Matches a Form Group
+   *
+   * @param  string $input
+   * @param  string $label
+   *
+   * @return boolean
+   */
+  protected function formGroup($input = '<input type="text" name="foo" id="foo">', $label = '<label for="foo" class="control-label col-lg-2 col-sm-4">Foo</label>')
+  {
+    return '<div class="form-group">'.$label.'<div class="col-lg-10 col-sm-8">'.$input.'</div></div>';
+  }
+
   /**
    * Matches a required Control Group
    *