Merge pull request #8 from 4hl/master

Fix a couple minor gotchas

Author: manavo

src/Manavo/BootstrapForms/BootstrapFormsServiceProvider.php

@@ -19,7 +19,10 @@ class BootstrapFormsServiceProvider extends IlluminateHtmlServiceProvider
      */
     public function boot()
     {
-        $this->package('manavo/bootstrap-forms');
+        $app = $this->app;
+        if (version_compare($app::VERSION, '5.0') < 0) {
+            $this->package('manavo/bootstrap-forms');
+        }
     }
 
     /**

src/Manavo/BootstrapForms/FormBuilder.php

@@ -105,7 +105,7 @@ public function closeGroup()
     public function input($type, $name, $value = null, $options = [])
     {
         // Don't add form-control for some input types (like submit, checkbox, radio)
-        if (!in_array($type, ['submit', 'checkbox', 'radio', 'reset'])) {
+        if (!in_array($type, ['submit', 'checkbox', 'radio', 'reset', 'file'])) {
             $options = $this->appendClassToOptions('form-control', $options);
         }
 
@@ -194,7 +194,6 @@ protected function checkable($type, $name, $value, $checked, $options)
      *
      * @param  string $name
      * @param  mixed  $value
-     * @param  mixed  $label
      * @param  bool   $checked
      * @param  array  $options
      *
@@ -203,13 +202,14 @@ protected function checkable($type, $name, $value, $checked, $options)
     public function checkbox(
         $name,
         $value = 1,
-        $label = null,
         $checked = null,
         $options = []
     ) {
         $checkable = parent::checkbox($name, $value, $checked, $options);
 
-        return $this->wrapCheckable($label, 'checkbox', $checkable);
+        return @$options['label'] ?
+            $this->wrapCheckable($options['label'], 'checkbox', $checkable) :
+            $checkable;
     }
 
     /**