Update to support Laravel 5.4 (#321)

* chnaged getToken() to token() to support laravel 5.4 * added backward compatibility with Laravel < 5.4 * pass PSR-2 validation
patricktalmadge · Apr 2, 2017 · 52cffc6 · 52cffc6
1 parent a0d0689
commit 52cffc6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/docs/files/Bootstrapper%2FBootstrapperServiceProvider.php.txt b/docs/files/Bootstrapper%2FBootstrapperServiceProvider.php.txt
@@ -180,7 +180,7 @@ class BootstrapperServiceProvider extends ServiceProvider
                 $form = new Form(
                     $app['html'],
                     $app['url'],
-                    $app['session.store']->getToken()
+                    (method_exists($app['session.store'], 'getToken') ? $app['session.store']->getToken() : $app['session.store']->token())
                 );
 
                 return $form->setSessionStore($app['session.store']);

diff --git a/docs/files/BootstrapperServiceProvider.php.txt b/docs/files/BootstrapperServiceProvider.php.txt
@@ -138,7 +138,7 @@ class BootstrapperServiceProvider extends ServiceProvider
                 $form = new Form(
                     $app['html'],
                     $app['url'],
-                    $app['session.store']->getToken()
+                    (method_exists($app['session.store'], 'getToken') ? $app['session.store']->getToken() : $app['session.store']->token())
                 );
 
                 return $form->setSessionStore($app['session.store']);

diff --git a/src/Bootstrapper/BootstrapperL5ServiceProvider.php b/src/Bootstrapper/BootstrapperL5ServiceProvider.php
@@ -203,11 +203,12 @@ function ($app) {
         $this->app->bind(
             'bootstrapper::form',
             function ($app) {
+                $tokenMethod = method_exists($app['session.store'], 'getToken') ? 'getToken' : 'token';
                 $form = new Form(
                     $app->make('collective::html'),
                     $app->make('url'),
                     $app->make('view'),
-                    $app['session.store']->getToken()
+                    $app['session.store']->$tokenMethod()
                 );
 
                 return $form->setSessionStore($app['session.store']);

diff --git a/tests/spec/Bootstrapper/BootstrapperL5ServiceProviderSpec.php b/tests/spec/Bootstrapper/BootstrapperL5ServiceProviderSpec.php
@@ -96,6 +96,7 @@ public function make($abstract, $parameters = array())
                 case 'session.store':
                     $mock = \Mockery::mock('Illuminate\\Session\\Store');
                     $mock->shouldReceive('getToken');
+                    $mock->shouldReceive('token');
                     return $mock;
                 case 'files':
                     $mock = \Mockery::mock('Files');