From 8d51cd348f06af6b427799df738b5520a687e8b8 Mon Sep 17 00:00:00 2001 From: Jeremy Quinton Date: Wed, 15 Aug 2018 13:26:10 +0200 Subject: [PATCH] Upgrading to Laravel 5.6 1) Changed method call from lists to pluck. 2) Use set put instead of session set. 3) Removed references to artisan optimize command. 4) Added additionl check to base controller if auth user not set redirect to login. 5) Flush the session on logout. 6) Updated Event and Route service providers to work with Laravel 5.6. 7) Added new default logging config file. 8) Bump PHP versions from 7.0.30 to 7.1.20. 9) Added missing translations. 10) Fixed some issues with the templates. --- Dockerfile-composer | 2 +- Dockerfile-php | 2 +- .../Controllers/EventAttendeesController.php | 10 +-- .../Controllers/EventCheckoutController.php | 2 +- app/Http/Controllers/EventController.php | 2 +- app/Http/Controllers/InstallerController.php | 1 - .../Controllers/ManageAccountController.php | 6 +- app/Http/Controllers/MyBaseController.php | 6 +- app/Http/Controllers/UserLogoutController.php | 3 +- app/Models/Event.php | 2 +- app/Providers/EventServiceProvider.php | 4 +- app/Providers/RouteServiceProvider.php | 4 +- config/logging.php | 81 +++++++++++++++++++ resources/lang/en/Order.php | 4 +- .../views/ManageEvent/Dashboard.blade.php | 5 +- .../views/ManageOrganiser/Dashboard.blade.php | 2 +- 16 files changed, 112 insertions(+), 24 deletions(-) create mode 100644 config/logging.php diff --git a/Dockerfile-composer b/Dockerfile-composer index fa0ee0a7..5e4a03c2 100644 --- a/Dockerfile-composer +++ b/Dockerfile-composer @@ -1,4 +1,4 @@ -FROM php:7.0.30-fpm +FROM php:7.1.20-fpm RUN apt-get update && apt-get install -y \ libpq-dev \ libmcrypt-dev \ diff --git a/Dockerfile-php b/Dockerfile-php index 24b3bdf9..ade8d7bc 100644 --- a/Dockerfile-php +++ b/Dockerfile-php @@ -1,4 +1,4 @@ -FROM php:7.0.30-fpm +FROM php:7.1.20-fpm RUN apt-get update && apt-get install -y \ libpq-dev \ libmcrypt-dev \ diff --git a/app/Http/Controllers/EventAttendeesController.php b/app/Http/Controllers/EventAttendeesController.php index e43872c6..d7ff56ba 100644 --- a/app/Http/Controllers/EventAttendeesController.php +++ b/app/Http/Controllers/EventAttendeesController.php @@ -98,7 +98,7 @@ class EventAttendeesController extends MyBaseController return view('ManageEvent.Modals.InviteAttendee', [ 'event' => $event, - 'tickets' => $event->tickets()->lists('title', 'id'), + 'tickets' => $event->tickets()->pluck('title', 'id'), ]); } @@ -252,7 +252,7 @@ class EventAttendeesController extends MyBaseController return view('ManageEvent.Modals.ImportAttendee', [ 'event' => $event, - 'tickets' => $event->tickets()->lists('title', 'id'), + 'tickets' => $event->tickets()->pluck('title', 'id'), ]); } @@ -474,7 +474,7 @@ class EventAttendeesController extends MyBaseController { $data = [ 'event' => Event::scope()->find($event_id), - 'tickets' => Event::scope()->find($event_id)->tickets()->lists('title', 'id')->toArray(), + 'tickets' => Event::scope()->find($event_id)->tickets()->pluck('title', 'id')->toArray(), ]; return view('ManageEvent.Modals.MessageAttendees', $data); @@ -621,7 +621,7 @@ class EventAttendeesController extends MyBaseController $data = [ 'attendee' => $attendee, 'event' => $attendee->event, - 'tickets' => $attendee->event->tickets->lists('title', 'id'), + 'tickets' => $attendee->event->tickets->pluck('title', 'id'), ]; return view('ManageEvent.Modals.EditAttendee', $data); @@ -684,7 +684,7 @@ class EventAttendeesController extends MyBaseController $data = [ 'attendee' => $attendee, 'event' => $attendee->event, - 'tickets' => $attendee->event->tickets->lists('title', 'id'), + 'tickets' => $attendee->event->tickets->pluck('title', 'id'), ]; return view('ManageEvent.Modals.CancelAttendee', $data); diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index 24741023..129e3d79 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -200,7 +200,7 @@ class EventCheckoutController extends Controller /* * The 'ticket_order_{event_id}' session stores everything we need to complete the transaction. */ - session()->set('ticket_order_' . $event->id, [ + session()->put('ticket_order_' . $event->id, [ 'validation_rules' => $validation_rules, 'validation_messages' => $validation_messages, 'event_id' => $event->id, diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php index 29489e3d..caa66e12 100644 --- a/app/Http/Controllers/EventController.php +++ b/app/Http/Controllers/EventController.php @@ -24,7 +24,7 @@ class EventController extends MyBaseController { $data = [ 'modal_id' => $request->get('modal_id'), - 'organisers' => Organiser::scope()->lists('name', 'id'), + 'organisers' => Organiser::scope()->pluck('name', 'id'), 'organiser_id' => $request->get('organiser_id') ? $request->get('organiser_id') : false, ]; diff --git a/app/Http/Controllers/InstallerController.php b/app/Http/Controllers/InstallerController.php index 987f4245..6d8df91b 100644 --- a/app/Http/Controllers/InstallerController.php +++ b/app/Http/Controllers/InstallerController.php @@ -222,7 +222,6 @@ class InstallerController extends Controller if (Timezone::count() == 0) { Artisan::call('db:seed', ['--force' => true]); } - Artisan::call('optimize', ['--force' => true]); $fp = fopen(base_path() . '/installed', 'w'); fwrite($fp, $version); diff --git a/app/Http/Controllers/ManageAccountController.php b/app/Http/Controllers/ManageAccountController.php index 00a149e6..c1839cea 100644 --- a/app/Http/Controllers/ManageAccountController.php +++ b/app/Http/Controllers/ManageAccountController.php @@ -29,9 +29,9 @@ class ManageAccountController extends MyBaseController { $data = [ 'account' => Account::find(Auth::user()->account_id), - 'timezones' => Timezone::lists('location', 'id'), - 'currencies' => Currency::lists('title', 'id'), - 'payment_gateways' => PaymentGateway::lists('provider_name', 'id'), + 'timezones' => Timezone::pluck('location', 'id'), + 'currencies' => Currency::pluck('title', 'id'), + 'payment_gateways' => PaymentGateway::pluck('provider_name', 'id'), 'account_payment_gateways' => AccountPaymentGateway::scope()->get(), 'version_info' => $this->getVersionInfo(), ]; diff --git a/app/Http/Controllers/MyBaseController.php b/app/Http/Controllers/MyBaseController.php index a320e9d3..1af9f87d 100644 --- a/app/Http/Controllers/MyBaseController.php +++ b/app/Http/Controllers/MyBaseController.php @@ -13,6 +13,11 @@ class MyBaseController extends Controller { public function __construct() { + + if (empty(Auth::user())) { + return redirect()->to('/login'); + } + /* * Set up JS across all views */ @@ -29,7 +34,6 @@ class MyBaseController extends Controller 'DateTimeFormat' => 'dd-MM-yyyy hh:mm', 'GenericErrorMessage' => trans("Controllers.whoops"), ]); - /* * Share the organizers across all views */ diff --git a/app/Http/Controllers/UserLogoutController.php b/app/Http/Controllers/UserLogoutController.php index 52500a96..486606b8 100644 --- a/app/Http/Controllers/UserLogoutController.php +++ b/app/Http/Controllers/UserLogoutController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use Illuminate\Contracts\Auth\Guard; +use Illuminate\Support\Facades\Session; class UserLogoutController extends Controller { @@ -21,7 +22,7 @@ class UserLogoutController extends Controller public function doLogout() { $this->auth->logout(); - + Session::flush(); return redirect()->to('/?logged_out=yup'); } } diff --git a/app/Models/Event.php b/app/Models/Event.php index 93880e3a..4f62a28e 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -233,7 +233,7 @@ class Event extends MyBaseModel 'Attendee Name', 'Attendee Email', 'Attendee Ticket' - ], $this->questions->lists('title')->toArray()); + ], $this->questions->pluck('title')->toArray()); $attendees = $this->attendees()->has('answers')->get(); diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index daafd442..ab95405e 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -25,9 +25,9 @@ class EventServiceProvider extends ServiceProvider * * @return void */ - public function boot(DispatcherContract $events) + public function boot() { - parent::boot($events); + parent::boot(); // } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 3ff78c92..40e3f484 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -23,9 +23,9 @@ class RouteServiceProvider extends ServiceProvider * * @return void */ - public function boot(Router $router) + public function boot() { - parent::boot($router); + parent::boot(); // } diff --git a/config/logging.php b/config/logging.php new file mode 100644 index 00000000..5c3722bd --- /dev/null +++ b/config/logging.php @@ -0,0 +1,81 @@ + env('LOG_CHANNEL', 'stack'), + + /* + |-------------------------------------------------------------------------- + | Log Channels + |-------------------------------------------------------------------------- + | + | Here you may configure the log channels for your application. Out of + | the box, Laravel uses the Monolog PHP logging library. This gives + | you a variety of powerful log handlers / formatters to utilize. + | + | Available Drivers: "single", "daily", "slack", "syslog", + | "errorlog", "monolog", + | "custom", "stack" + | + */ + + 'channels' => [ + 'stack' => [ + 'driver' => 'stack', + 'channels' => ['single'], + ], + + 'single' => [ + 'driver' => 'single', + 'path' => storage_path('logs/laravel.log'), + 'level' => 'debug', + ], + + 'daily' => [ + 'driver' => 'daily', + 'path' => storage_path('logs/laravel.log'), + 'level' => 'debug', + 'days' => 7, + ], + + 'slack' => [ + 'driver' => 'slack', + 'url' => env('LOG_SLACK_WEBHOOK_URL'), + 'username' => 'Laravel Log', + 'emoji' => ':boom:', + 'level' => 'critical', + ], + + 'stderr' => [ + 'driver' => 'monolog', + 'handler' => StreamHandler::class, + 'with' => [ + 'stream' => 'php://stderr', + ], + ], + + 'syslog' => [ + 'driver' => 'syslog', + 'level' => 'debug', + ], + + 'errorlog' => [ + 'driver' => 'errorlog', + 'level' => 'debug', + ], + ], + +]; \ No newline at end of file diff --git a/resources/lang/en/Order.php b/resources/lang/en/Order.php index 8aee5019..9a9543f2 100644 --- a/resources/lang/en/Order.php +++ b/resources/lang/en/Order.php @@ -18,7 +18,7 @@ return array ( 'arrived' => 'Arrived', 'attendee_cancelled' => 'Cancelled', 'attendee_refunded' => 'Refunded', - 'awaiting_payment' => 'awaiting_payment', + 'awaiting_payment' => 'Awaiting Payment', 'before_order' => 'Message to display to attendees before they complete their order.', 'before_order_help' => 'This message will be displayed to attendees immediately before they finalize their order.', 'booking_fee' => 'Booking Fee', @@ -41,7 +41,7 @@ return array ( 'price' => 'Price', 'purchase_date' => 'Purchase Date', 'quantity' => 'Quantity', - 'recent_orders' => 'recent_orders', + 'recent_orders' => 'Recent Orders', 'reference' => 'Reference', 'refund/cancel' => 'Refund / Cancel', 'status' => 'Status', diff --git a/resources/views/ManageEvent/Dashboard.blade.php b/resources/views/ManageEvent/Dashboard.blade.php index 17d704de..a5705003 100644 --- a/resources/views/ManageEvent/Dashboard.blade.php +++ b/resources/views/ManageEvent/Dashboard.blade.php @@ -10,7 +10,10 @@ @include('ManageEvent.Partials.TopNav') @stop -@section('page_title', ' '.trans("basic.event_dashboard")) +@section('page_title') + +@lang("basic.event_dashboard") +@endsection @section('menu') @include('ManageEvent.Partials.Sidebar') diff --git a/resources/views/ManageOrganiser/Dashboard.blade.php b/resources/views/ManageOrganiser/Dashboard.blade.php index 37a6099a..793cbf9a 100644 --- a/resources/views/ManageOrganiser/Dashboard.blade.php +++ b/resources/views/ManageOrganiser/Dashboard.blade.php @@ -3,7 +3,7 @@ @section('title') @parent @lang("Organiser.dashboard") -@stop +@endsection @section('top_nav') @include('ManageOrganiser.Partials.TopNav')