From 9f8db2255b9f86b113905dd4d4e862758be8c739 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Wed, 23 Dec 2015 15:04:15 +0000
Subject: [PATCH 1/3] Cleanup aliases

---
 config/app.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/app.php b/config/app.php
index 2d760339..855fac05 100644
--- a/config/app.php
+++ b/config/app.php
@@ -200,12 +200,10 @@ return [
         'Cookie'    => 'Illuminate\Support\Facades\Cookie',
         'Crypt'     => 'Illuminate\Support\Facades\Crypt',
         'DB'        => 'Illuminate\Support\Facades\DB',
-        'Eloquent'  => 'Illuminate\Database\Eloquent\Model',
         'Event'     => 'Illuminate\Support\Facades\Event',
         'File'      => 'Illuminate\Support\Facades\File',
         'Gate'      => 'Illuminate\Support\Facades\Gate',
         'Hash'      => 'Illuminate\Support\Facades\Hash',
-        'Input'     => 'Illuminate\Support\Facades\Input',
         'Lang'      => 'Illuminate\Support\Facades\Lang',
         'Log'       => 'Illuminate\Support\Facades\Log',
         'Mail'      => 'Illuminate\Support\Facades\Mail',
@@ -223,6 +221,7 @@ return [
         'Validator' => 'Illuminate\Support\Facades\Validator',
         'View'      => 'Illuminate\Support\Facades\View',
 
+        'Binput'    => 'GrahamCampbell\Binput\Facades\Binput',
         'Setting'   => 'CachetHQ\Cachet\Facades\Setting',
         'Str'       => 'Illuminate\Support\Str',
 

From 61ea28b1aada256ec5b140a7bccfa578b37532b8 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Wed, 23 Dec 2015 15:04:27 +0000
Subject: [PATCH 2/3] Use binput in the views

---
 .../views/dashboard/incidents/add.blade.php    |  6 +++---
 .../views/dashboard/metrics/add.blade.php      | 10 +++++-----
 .../views/dashboard/schedule/add.blade.php     |  6 +++---
 .../views/dashboard/subscribers/add.blade.php  |  2 +-
 resources/views/dashboard/team/add.blade.php   |  4 ++--
 resources/views/setup.blade.php                | 18 +++++++++---------
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/resources/views/dashboard/incidents/add.blade.php b/resources/views/dashboard/incidents/add.blade.php
index 0237f3ce..5658626f 100644
--- a/resources/views/dashboard/incidents/add.blade.php
+++ b/resources/views/dashboard/incidents/add.blade.php
@@ -30,7 +30,7 @@
                         @endif
                         <div class="form-group">
                             <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
-                            <input type="text" class="form-control" name="name" id="incident-name" required value="{{ Input::old('incident.name') }}">
+                            <input type="text" class="form-control" name="name" id="incident-name" required value="{{ Binput::old('incident.name') }}">
                         </div>
                         <div class="form-group">
                             <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br>
@@ -100,7 +100,7 @@
                         <div class="form-group">
                             <label>{{ trans('forms.incidents.message') }}</label>
                             <div class='markdown-control'>
-                                <textarea name="message" class="form-control autosize" rows="5" required>{{ Input::old('incident.message') }}</textarea>
+                                <textarea name="message" class="form-control autosize" rows="5" required>{{ Binput::old('incident.message') }}</textarea>
                             </div>
                         </div>
                         <div class="form-group">
@@ -110,7 +110,7 @@
                         @if(subscribers_enabled())
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" name="notify" value="1" checked="{{ Input::old('incident.message', 'checked') }}">
+                                <input type="checkbox" name="notify" value="1" checked="{{ Binput::old('incident.message', 'checked') }}">
                                 {{ trans('forms.incidents.notify_subscribers') }}
                             </label>
                         </div>
diff --git a/resources/views/dashboard/metrics/add.blade.php b/resources/views/dashboard/metrics/add.blade.php
index a85793ff..4cd8fe7a 100644
--- a/resources/views/dashboard/metrics/add.blade.php
+++ b/resources/views/dashboard/metrics/add.blade.php
@@ -19,16 +19,16 @@
                     <fieldset>
                         <div class="form-group">
                             <label for="metric-name">{{ trans('forms.metrics.name') }}</label>
-                            <input type="text" class="form-control" name="metric[name]" id="metric-name" required value="{{ Input::old('metric.name') }}">
+                            <input type="text" class="form-control" name="metric[name]" id="metric-name" required value="{{ Binput::old('metric.name') }}">
                         </div>
                         <div class="form-group">
                             <label for="metric-suffix">{{ trans('forms.metrics.suffix') }}</label>
-                            <input type="text" class="form-control" name="metric[suffix]" id="metric-suffix" required value="{{ Input::old('metric.suffix') }}">
+                            <input type="text" class="form-control" name="metric[suffix]" id="metric-suffix" required value="{{ Binput::old('metric.suffix') }}">
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.metrics.description') }}</label>
                             <div class='markdown-control'>
-                                <textarea name="metric[description]" class="form-control" rows="5">{{ Input::old('metric.description') }}</textarea>
+                                <textarea name="metric[description]" class="form-control" rows="5">{{ Binput::old('metric.description') }}</textarea>
                             </div>
                         </div>
                         <div class="form-group">
@@ -40,11 +40,11 @@
                         </div>
                         <div class="form-group">
                             <label for="metric-default_value">{{ trans('forms.metrics.default-value') }}</label>
-                            <input type="number" class="form-control" name="metric[default_value]" id="metric-default_value" value="{{ Input::old('metric.default_value') }}">
+                            <input type="number" class="form-control" name="metric[default_value]" id="metric-default_value" value="{{ Binput::old('metric.default_value') }}">
                         </div>
                         <div class="form-group">
                             <label for="metric-places">{{ trans('forms.metrics.places') }}</label>
-                            <input type="number" min="0" max="4" class="form-control" name="metric[places]" id="metric-places" required value="{{ Input::old('metric.places') }}">
+                            <input type="number" min="0" max="4" class="form-control" name="metric[places]" id="metric-places" required value="{{ Binput::old('metric.places') }}">
                         </div>
                         <div class="checkbox">
                             <label>
diff --git a/resources/views/dashboard/schedule/add.blade.php b/resources/views/dashboard/schedule/add.blade.php
index 2b9229f7..f26a5606 100644
--- a/resources/views/dashboard/schedule/add.blade.php
+++ b/resources/views/dashboard/schedule/add.blade.php
@@ -31,12 +31,12 @@
                         @endif
                         <div class="form-group">
                             <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
-                            <input type="text" class="form-control" name="incident[name]" id="incident-name" required value="{{ Input::old('incident.name') }}">
+                            <input type="text" class="form-control" name="incident[name]" id="incident-name" required value="{{ Binput::old('incident.name') }}">
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.incidents.message') }}</label>
                             <div class='markdown-control'>
-                                <textarea name="incident[message]" class="form-control autosize" rows="5" required>{{ Input::old('incident.message') }}</textarea>
+                                <textarea name="incident[message]" class="form-control autosize" rows="5" required>{{ Binput::old('incident.message') }}</textarea>
                             </div>
                         </div>
                         <div class="form-group">
@@ -46,7 +46,7 @@
                         @if(subscribers_enabled())
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" name="incident[notify]" value="1" checked="{{ Input::old('incident.message', 'checked') }}">
+                                <input type="checkbox" name="incident[notify]" value="1" checked="{{ Binput::old('incident.message', 'checked') }}">
                                 {{ trans('forms.incidents.notify_subscribers') }}
                             </label>
                         </div>
diff --git a/resources/views/dashboard/subscribers/add.blade.php b/resources/views/dashboard/subscribers/add.blade.php
index 159b7220..b58f4a4f 100644
--- a/resources/views/dashboard/subscribers/add.blade.php
+++ b/resources/views/dashboard/subscribers/add.blade.php
@@ -18,7 +18,7 @@
                 <fieldset>
                 <div class="form-group">
                     <label>{{ trans('forms.user.email') }}</label>
-                    <input type="email" class="form-control" name="email" value="{{ Input::old('email') }}" required>
+                    <input type="email" class="form-control" name="email" value="{{ Binput::old('email') }}" required>
                 </div>
                 </fieldset>
 
diff --git a/resources/views/dashboard/team/add.blade.php b/resources/views/dashboard/team/add.blade.php
index 33c8e4f5..0fae11d8 100644
--- a/resources/views/dashboard/team/add.blade.php
+++ b/resources/views/dashboard/team/add.blade.php
@@ -18,11 +18,11 @@
                     <fieldset>
                         <div class="form-group">
                             <label>{{ trans('forms.user.username') }}</label>
-                            <input type="text" class="form-control" name="username" value="{{ Input::old('username') }}" required>
+                            <input type="text" class="form-control" name="username" value="{{ Binput::old('username') }}" required>
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.user.email') }}</label>
-                            <input type="email" class="form-control" name="email" value="{{ Input::old('email') }}" required>
+                            <input type="email" class="form-control" name="email" value="{{ Binput::old('email') }}" required>
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.user.password') }}</label>
diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php
index a60ba6a4..b3c201c8 100644
--- a/resources/views/setup.blade.php
+++ b/resources/views/setup.blade.php
@@ -37,7 +37,7 @@
                         <select name="env[cache_driver]" class="form-control" required>
                             <option disabled>{{ trans('forms.setup.cache_driver') }}</option>
                             @foreach($cache_drivers as $driver => $driverName)
-                            <option value="{{ $driver }}" {{ Input::old('env.cache_driver') == $driver ? "selected" : null }}>{{ $driverName }}</option>
+                            <option value="{{ $driver }}" {{ Binput::old('env.cache_driver') == $driver ? "selected" : null }}>{{ $driverName }}</option>
                             @endforeach
                         </select>
                         @if($errors->has('env.cache_driver'))
@@ -49,7 +49,7 @@
                         <select name="env[session_driver]" class="form-control" required>
                             <option disabled>{{ trans('forms.setup.session_driver') }}</option>
                             @foreach($cache_drivers as $driver => $driverName)
-                            <option value="{{ $driver }}" {{ Input::old('env.session_driver') == $driver ? "selected" : null }}>{{ $driverName }}</option>
+                            <option value="{{ $driver }}" {{ Binput::old('env.session_driver') == $driver ? "selected" : null }}>{{ $driverName }}</option>
                             @endforeach
                         </select>
                         @if($errors->has('env.session_driver'))
@@ -68,14 +68,14 @@
                 <fieldset>
                     <div class="form-group">
                         <label>{{ trans('forms.setup.site_name') }}</label>
-                        <input type="text" name="settings[app_name]" class="form-control" placeholder="{{ trans('forms.setup.site_name') }}" value="{{ Input::old('settings.app_name', '') }}" required>
+                        <input type="text" name="settings[app_name]" class="form-control" placeholder="{{ trans('forms.setup.site_name') }}" value="{{ Binput::old('settings.app_name', '') }}" required>
                         @if($errors->has('settings.app_name'))
                         <span class="text-danger">{{ $errors->first('settings.app_name') }}</span>
                         @endif
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.setup.site_domain') }}</label>
-                        <input type="text" name="settings[app_domain]" class="form-control" placeholder="{{ trans('forms.setup.site_domain') }}" value="{{ Input::old('settings.app_domain', url()) }}" required>
+                        <input type="text" name="settings[app_domain]" class="form-control" placeholder="{{ trans('forms.setup.site_domain') }}" value="{{ Binput::old('settings.app_domain', url()) }}" required>
                         @if($errors->has('settings.app_domain'))
                         <span class="text-danger">{{ $errors->first('settings.app_domain') }}</span>
                         @endif
@@ -87,7 +87,7 @@
                             @foreach($timezones as $region => $list)
                             <optgroup label="{{ $region }}">
                             @foreach($list as $timezone => $name)
-                            <option value="{{ $timezone }}" @if(Input::old('settings.app_timezone') == $timezone) selected @endif>
+                            <option value="{{ $timezone }}" @if(Binput::old('settings.app_timezone') == $timezone) selected @endif>
                                 {{ $name }}
                             </option>
                             @endforeach
@@ -103,7 +103,7 @@
                         <select name="settings[app_locale]" class="form-control" required>
                             <option value="">Select Language</option>
                             @foreach($langs as $lang => $name)
-                            <option value="{{ $lang }}" @if(Input::old('settings.app_locale') == $lang || $user_language == $lang) selected @endif>
+                            <option value="{{ $lang }}" @if(Binput::old('settings.app_locale') == $lang || $user_language == $lang) selected @endif>
                                 {{ $name }}
                             </option>
                             @endforeach
@@ -133,21 +133,21 @@
                 <fieldset>
                     <div class="form-group">
                         <label>{{ trans("forms.setup.username") }}</label>
-                        <input type="text" name="user[username]" class="form-control" placeholder="{{ trans('forms.setup.username') }}" value="{{ Input::old('user.username', '') }}" required>
+                        <input type="text" name="user[username]" class="form-control" placeholder="{{ trans('forms.setup.username') }}" value="{{ Binput::old('user.username', '') }}" required>
                         @if($errors->has('user.username'))
                         <span class="text-danger">{{ $errors->first('user.username') }}</span>
                         @endif
                     </div>
                     <div class="form-group">
                         <label>{{ trans("forms.setup.email") }}</label>
-                        <input type="text" name="user[email]" class="form-control" placeholder="{{ trans('forms.setup.email') }}" value="{{ Input::old('user.email', '') }}" required>
+                        <input type="text" name="user[email]" class="form-control" placeholder="{{ trans('forms.setup.email') }}" value="{{ Binput::old('user.email', '') }}" required>
                         @if($errors->has('user.email'))
                         <span class="text-danger">{{ $errors->first('user.email') }}</span>
                         @endif
                     </div>
                     <div class="form-group">
                         <label>{{ trans("forms.setup.password") }}</label>
-                        <input type="password" name="user[password]" class="form-control password-strength" placeholder="{{ trans('forms.setup.password') }}" value="{{ Input::old('user.password', '') }}" required>
+                        <input type="password" name="user[password]" class="form-control password-strength" placeholder="{{ trans('forms.setup.password') }}" value="{{ Binput::old('user.password', '') }}" required>
                         <div class="strengthify-wrapper"></div>
                         @if($errors->has('user.password'))
                         <span class="text-danger">{{ $errors->first('user.password') }}</span>

From 869ebcfdfffc48bde6e91fb05fa1f92ca3000c20 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Wed, 23 Dec 2015 15:07:31 +0000
Subject: [PATCH 3/3] Removed bus too to match L5.2

---
 config/app.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/app.php b/config/app.php
index 855fac05..8572961e 100644
--- a/config/app.php
+++ b/config/app.php
@@ -194,7 +194,6 @@ return [
         'Artisan'   => 'Illuminate\Support\Facades\Artisan',
         'Auth'      => 'Illuminate\Support\Facades\Auth',
         'Blade'     => 'Illuminate\Support\Facades\Blade',
-        'Bus'       => 'Illuminate\Support\Facades\Bus',
         'Cache'     => 'Illuminate\Support\Facades\Cache',
         'Config'    => 'Illuminate\Support\Facades\Config',
         'Cookie'    => 'Illuminate\Support\Facades\Cookie',