Upgrade to laravel 5.2

This commit is contained in:
Graham Campbell
2015-12-24 15:44:06 +00:00
parent 3951f0116a
commit cdc107fcb2
9 changed files with 104 additions and 76 deletions
+1 -1
View File
@@ -56,7 +56,7 @@ class StatusPageComposer
$scheduledMaintenance = Incident::scheduled()->orderBy('scheduled_at')->get();
// Component & Component Group lists.
$usedComponentGroups = Component::enabled()->where('group_id', '>', 0)->groupBy('group_id')->lists('group_id');
$usedComponentGroups = Component::enabled()->where('group_id', '>', 0)->groupBy('group_id')->pluck('group_id');
$componentGroups = ComponentGroup::whereIn('id', $usedComponentGroups)->orderBy('order')->get();
$ungroupedComponents = Component::enabled()->where('group_id', 0)->orderBy('order')->orderBy('created_at')->get();
+1 -1
View File
@@ -52,7 +52,7 @@ class Repository
public function get($name, $default = null)
{
if (!$this->settings) {
$this->settings = $this->model->all()->lists('value', 'name');
$this->settings = $this->model->all()->pluck('value', 'name');
}
if (!empty($this->settings[$name])) {
@@ -11,8 +11,8 @@
namespace CachetHQ\Cachet\Foundation\Providers;
use AltThree\Bus\Dispatcher;
use CachetHQ\Cachet\Dates\DateFactory;
use Illuminate\Bus\Dispatcher;
use Illuminate\Support\ServiceProvider;
use Illuminate\Support\Str;
@@ -21,7 +21,7 @@ class AppServiceProvider extends ServiceProvider
/**
* Boot the service provider.
*
* @param \Illuminate\Bus\Dispatcher $dispatcher
* @param \AltThree\Bus\Dispatcher $dispatcher
*/
public function boot(Dispatcher $dispatcher)
{