Merge Incompatible Laravel 5.2 Changes

README.md

@@ -2,6 +2,8 @@
 
 Using [@stidges](https://github.com/stidges)' code for bootstrap forms to create a composer package. You can find the original article here: http://blog.stidges.com/post/easy-bootstrap-forms-in-laravel
 
+Note this is not compatible with Laravel < 5.2.
+
 ## Install
 
 ```
@@ -10,19 +12,17 @@ composer require manavo/laravel-bootstrap-forms ~0.1
 
 ## Configure
 
-Make sure you comment out the existing HtmlServiceProvider (Illuminate\Html\HtmlServiceProvider):
+Make sure you comment out the existing HtmlServiceProvider (Collectve\Html\HtmlServiceProvider):
 
 ```php
 <?php
-// File (Laravel 4): app/config/app.php
-// OR
 // File (Laravel 5): config/app.php
 
 return array(
     // ...
     'providers' => array(
         // ...
-        // 'Illuminate\Html\HtmlServiceProvider',
+        // 'Collective\Html\HtmlServiceProvider',
         'Manavo\BootstrapForms\BootstrapFormsServiceProvider',
         // ...
     ),
@@ -35,15 +35,15 @@ No change is necessary for the Form Facade.
 ## Example
 
 ```
-{{ Form::open([ 'route' => 'posts.store' ]) }}
+{!! Form::open([ 'route' => 'posts.store' ]) !!}
 
-    {{ Form::openGroup('title', 'Title') }}
-        {{ Form::text('title') }}
-    {{ Form::closeGroup() }}
+    {!! Form::openGroup('title', 'Title') !!}
+        {!! Form::text('title') !!}
+    {!! Form::closeGroup() !!}
 
-    {{ Form::openGroup('status', 'Status') }}
-        {{ Form::select('status', $statusOptions) }}
-    {{ Form::closeGroup() }}
+    {!! Form::openGroup('status', 'Status') !!}
+        {!! Form::select('status', $statusOptions) !!}
+    {!! Form::closeGroup() !!}
 
-{{ Form::close() }}
+{!! Form::close() !!}
 ```

composer.json

@@ -6,10 +6,15 @@
         {
             "name": "Philip Manavopoulos",
             "email": "[email protected]"
+        },
+        {
+            "name": "David Lloyd",
+            "email": "[email protected]"
         }
     ],
     "require": {
-        "php": ">=5.4.0"
+        "php": ">=5.4.0",
+        "laravelcollective/html": "5.2.*"
     },
     "autoload": {
         "psr-0": {

src/Manavo/BootstrapForms/BootstrapFormsServiceProvider.php

@@ -1,8 +1,8 @@
 <?php namespace Manavo\BootstrapForms;
 
-use Illuminate\Html\HtmlServiceProvider as IlluminateHtmlServiceProvider;
+use Collective\Html\HtmlServiceProvider as CollectiveHtmlServiceProvider;
 
-class BootstrapFormsServiceProvider extends IlluminateHtmlServiceProvider
+class BootstrapFormsServiceProvider extends CollectiveHtmlServiceProvider
 {
 
     /**
@@ -32,9 +32,9 @@ public function boot()
      */
     public function registerFormBuilder()
     {
-        $this->app->bindShared('form', function ($app) {
+        $this->app->singleton('form', function ($app) {
             $form = new FormBuilder($app['html'], $app['url'],
-                $app['session.store']->getToken());
+                $app['view'], $app['session.store']->getToken());
 
             return $form->setSessionStore($app['session.store']);
         });

src/Manavo/BootstrapForms/FormBuilder.php

@@ -2,9 +2,9 @@
 
 namespace Manavo\BootstrapForms;
 
-use Illuminate\Html\FormBuilder as IlluminateFormBuilder;
+use Collective\Html\FormBuilder as CollectiveFormBuilder;
 
-class FormBuilder extends IlluminateFormBuilder
+class FormBuilder extends CollectiveFormBuilder
 {
 
     /**