Merge pull request #10 from grossvogel/laravel-version-bump

Work with Laravel up to 5.4
LifeboyTech · Jun 6, 2017 · 1441f0a · 1441f0a
2 parents 28faf16 + 1e8ca9b
commit 1441f0a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -12,8 +12,8 @@
     "require": {
         "php": ">=5.4.0",
         "illuminate/support": "~5.0",
-        "laravelcollective/html": "5.2.*",
-        "laracasts/generators": "1.1.3"
+        "laravelcollective/html": ">=5.2.0",
+        "laracasts/generators": "dev-master"
     },
     "autoload": {
         "classmap": [

diff --git a/src/Lifeboy/Station/Filters/Session.php b/src/Lifeboy/Station/Filters/Session.php
@@ -39,7 +39,7 @@ static function hydrate(){
 
 		$user_id			= Auth::user()->id;
 		$user				= User::find($user_id);
-		$group_names		= $user->groups->lists('name');
+		$group_names		= $user->groups->pluck('name');
 		$primary_group		= $group_names->first();
 		$app_groups			= StationConfig::app('user_groups');
 		$starting_panel		= $app_groups[$primary_group]['starting_panel'];
@@ -58,4 +58,4 @@ static function hydrate(){
             'gravatar_hash'         => md5($user['email'])
 		));
     }
-}
+}
diff --git a/src/Lifeboy/Station/StationServiceProvider.php b/src/Lifeboy/Station/StationServiceProvider.php
@@ -51,7 +51,7 @@ public function register()
      */
     protected function registerStationBuild()
     {
-            $this->app['station:build'] = $this->app->share(function($app)
+            $this->app->singleton('station:build', function($app)
             {
                     //$cache = new Cache($app['files']);
                     //$generator = new Generators\ModelGenerator($app['files'], $cache);
@@ -70,4 +70,4 @@ public function provides()
 		return array();
 	}
 
-}
+}
diff --git a/src/views/layouts/form.blade.php b/src/views/layouts/form.blade.php
@@ -230,7 +230,7 @@
 					@if($element_info['type']=='multiselect' && isset($foreign_data[$element_name]))
 						{!! Form::select($element_name.'[]', 
 							$foreign_data[$element_name], 
-							(old($element_name) || !isset($passed_model)) ? null : $passed_model->$element_name->lists('id')->toArray(), 
+							(old($element_name) || !isset($passed_model)) ? null : $passed_model->$element_name->pluck('id')->toArray(), 
 							['multiple' => 'multiple','class'=>'chosen-select', 'style' => 'width: 400px', 'id' => $id, 'data-placeholder' => 'Please choose...']) !!}
 					@endif