From 0ce77608a4ba61cb6f0d87f3a966d276c55335bb Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Thu, 12 Sep 2019 19:03:15 -0400 Subject: [PATCH 1/2] Upgrade to Laravel 5.5 and PHP 7.3 --- .../Commands/ChargeRenewalInvoices.php | 2 +- app/Console/Commands/CheckData.php | 2 +- app/Console/Commands/CreateLuisData.php | 2 +- app/Console/Commands/CreateTestData.php | 2 +- app/Console/Commands/MakeModuleSettings.php | 2 +- app/Console/Commands/PruneData.php | 2 +- .../Commands/RemoveOrphanedDocuments.php | 2 +- app/Console/Commands/ResetData.php | 2 +- app/Console/Commands/SendOverdueTickets.php | 2 +- .../Commands/SendRecurringInvoices.php | 2 +- app/Console/Commands/SendReminders.php | 6 +- app/Console/Commands/SendRenewalInvoices.php | 2 +- app/Console/Commands/TestOFX.php | 2 +- app/Console/Commands/UpdateKey.php | 2 +- app/Console/Commands/stubs/command.stub | 2 +- app/Http/Controllers/AppController.php | 3 - app/Http/Controllers/Auth/AuthController.php | 2 +- app/Http/Controllers/CalendarController.php | 2 +- app/Http/Controllers/ClientController.php | 4 +- .../Controllers/ClientPortalController.php | 2 +- .../ClientPortalProposalController.php | 2 +- app/Http/Controllers/InvoiceApiController.php | 4 +- app/Http/Controllers/InvoiceController.php | 2 +- app/Http/Controllers/ProjectController.php | 2 +- app/Http/Controllers/ProposalController.php | 2 +- app/Http/Controllers/ReportController.php | 6 +- app/Http/Controllers/TaskKanbanController.php | 2 +- app/Http/Requests/RegisterRequest.php | 19 - app/Http/Requests/Request.php | 20 +- app/Ninja/Mailers/ContactMailer.php | 2 +- .../RecurringExpenseRepository.php | 2 +- app/Ninja/Repositories/TicketRepository.php | 2 +- composer.json | 18 +- composer.lock | 550 +++++++++++++++--- resources/views/header.blade.php | 2 +- 35 files changed, 515 insertions(+), 167 deletions(-) diff --git a/app/Console/Commands/ChargeRenewalInvoices.php b/app/Console/Commands/ChargeRenewalInvoices.php index 2a33e6b73094..e52566f15f9f 100644 --- a/app/Console/Commands/ChargeRenewalInvoices.php +++ b/app/Console/Commands/ChargeRenewalInvoices.php @@ -57,7 +57,7 @@ class ChargeRenewalInvoices extends Command $this->paymentService = $paymentService; } - public function fire() + public function handle() { $this->info(date('r').' ChargeRenewalInvoices...'); diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php index 410360e9967c..48c57c7567f9 100644 --- a/app/Console/Commands/CheckData.php +++ b/app/Console/Commands/CheckData.php @@ -67,7 +67,7 @@ class CheckData extends Command protected $log = ''; protected $isValid = true; - public function fire() + public function handle() { $this->logMessage(date('Y-m-d h:i:s') . ' Running CheckData...'); diff --git a/app/Console/Commands/CreateLuisData.php b/app/Console/Commands/CreateLuisData.php index 39a32bc74d54..00c446305902 100644 --- a/app/Console/Commands/CreateLuisData.php +++ b/app/Console/Commands/CreateLuisData.php @@ -37,7 +37,7 @@ class CreateLuisData extends Command /** * @return bool */ - public function fire() + public function handle() { $this->fakerField = $this->argument('faker_field'); diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php index 78a96fb5c0a0..48559bf2c30d 100644 --- a/app/Console/Commands/CreateTestData.php +++ b/app/Console/Commands/CreateTestData.php @@ -87,7 +87,7 @@ class CreateTestData extends Command /** * @return bool */ - public function fire() + public function handle() { if (Utils::isNinjaProd()) { $this->info('Unable to run in production'); diff --git a/app/Console/Commands/MakeModuleSettings.php b/app/Console/Commands/MakeModuleSettings.php index 874d541b72fe..199af1514244 100644 --- a/app/Console/Commands/MakeModuleSettings.php +++ b/app/Console/Commands/MakeModuleSettings.php @@ -52,7 +52,7 @@ class MakeModuleSettings extends GeneratorCommand ]))->render(); } - public function fire() { + public function handle() { $this->info('Creating settings view template for ' . $this->getModuleName()); $module = $this->laravel['modules']->findOrFail($this->getModuleName()); diff --git a/app/Console/Commands/PruneData.php b/app/Console/Commands/PruneData.php index 668bbafc0dc5..ed40aadc501e 100644 --- a/app/Console/Commands/PruneData.php +++ b/app/Console/Commands/PruneData.php @@ -21,7 +21,7 @@ class PruneData extends Command */ protected $description = 'Delete inactive accounts'; - public function fire() + public function handle() { $this->info(date('r').' Running PruneData...'); diff --git a/app/Console/Commands/RemoveOrphanedDocuments.php b/app/Console/Commands/RemoveOrphanedDocuments.php index f53e1f6ac082..c8da63933149 100644 --- a/app/Console/Commands/RemoveOrphanedDocuments.php +++ b/app/Console/Commands/RemoveOrphanedDocuments.php @@ -21,7 +21,7 @@ class RemoveOrphanedDocuments extends Command */ protected $description = 'Removes old documents not associated with an expense or invoice'; - public function fire() + public function handle() { $this->info(date('r').' Running RemoveOrphanedDocuments...'); diff --git a/app/Console/Commands/ResetData.php b/app/Console/Commands/ResetData.php index bd268dd79504..3dfba018aeec 100644 --- a/app/Console/Commands/ResetData.php +++ b/app/Console/Commands/ResetData.php @@ -21,7 +21,7 @@ class ResetData extends Command */ protected $description = 'Reset data'; - public function fire() + public function handle() { $this->info(date('r') . ' Running ResetData...'); diff --git a/app/Console/Commands/SendOverdueTickets.php b/app/Console/Commands/SendOverdueTickets.php index ccfae0c87e5f..409cde512da3 100644 --- a/app/Console/Commands/SendOverdueTickets.php +++ b/app/Console/Commands/SendOverdueTickets.php @@ -30,7 +30,7 @@ class SendOverdueTickets extends Command } - public function fire() + public function handle() { $this->info(date('r') . ' Running SendOverdueTickets...'); diff --git a/app/Console/Commands/SendRecurringInvoices.php b/app/Console/Commands/SendRecurringInvoices.php index 8ad0175d1ab5..34bdfe14d53a 100644 --- a/app/Console/Commands/SendRecurringInvoices.php +++ b/app/Console/Commands/SendRecurringInvoices.php @@ -48,7 +48,7 @@ class SendRecurringInvoices extends Command $this->recurringExpenseRepo = $recurringExpenseRepo; } - public function fire() + public function handle() { $this->info(date('r') . ' Running SendRecurringInvoices...'); diff --git a/app/Console/Commands/SendReminders.php b/app/Console/Commands/SendReminders.php index 5af20726593b..bd06bce12355 100644 --- a/app/Console/Commands/SendReminders.php +++ b/app/Console/Commands/SendReminders.php @@ -70,7 +70,7 @@ class SendReminders extends Command $this->userMailer = $userMailer; } - public function fire() + public function handle() { $this->info(date('r') . ' Running SendReminders...'); @@ -229,8 +229,8 @@ class SendReminders extends Command // send email as user auth()->onceUsingId($user->id); - $report = dispatch(new RunReport($scheduledReport->user, $reportType, $config, true)); - $file = dispatch(new ExportReportResults($scheduledReport->user, $config['export_format'], $reportType, $report->exportParams)); + $report = dispatch_now(new RunReport($scheduledReport->user, $reportType, $config, true)); + $file = dispatch_now(new ExportReportResults($scheduledReport->user, $config['export_format'], $reportType, $report->exportParams)); if ($file) { try { diff --git a/app/Console/Commands/SendRenewalInvoices.php b/app/Console/Commands/SendRenewalInvoices.php index dcd1bcc2e018..16e7ebdb210a 100644 --- a/app/Console/Commands/SendRenewalInvoices.php +++ b/app/Console/Commands/SendRenewalInvoices.php @@ -48,7 +48,7 @@ class SendRenewalInvoices extends Command $this->accountRepo = $repo; } - public function fire() + public function handle() { $this->info(date('r').' Running SendRenewalInvoices...'); diff --git a/app/Console/Commands/TestOFX.php b/app/Console/Commands/TestOFX.php index 763566d47b3f..5a76c5df666c 100644 --- a/app/Console/Commands/TestOFX.php +++ b/app/Console/Commands/TestOFX.php @@ -37,7 +37,7 @@ class TestOFX extends Command $this->bankAccountService = $bankAccountService; } - public function fire() + public function handle() { $this->info(date('r').' Running TestOFX...'); } diff --git a/app/Console/Commands/UpdateKey.php b/app/Console/Commands/UpdateKey.php index 0cae42271f1f..4395cc98e596 100644 --- a/app/Console/Commands/UpdateKey.php +++ b/app/Console/Commands/UpdateKey.php @@ -27,7 +27,7 @@ class UpdateKey extends Command */ protected $description = 'Update application key'; - public function fire() + public function handle() { $this->info(date('r') . ' Running UpdateKey...'); diff --git a/app/Console/Commands/stubs/command.stub b/app/Console/Commands/stubs/command.stub index 153760132982..e9ef865676fa 100644 --- a/app/Console/Commands/stubs/command.stub +++ b/app/Console/Commands/stubs/command.stub @@ -37,7 +37,7 @@ class $CLASS$ extends Command * * @return mixed */ - public function fire() + public function handle() { // } diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php index b492cded169a..6a19ebd7ca7a 100644 --- a/app/Http/Controllers/AppController.php +++ b/app/Http/Controllers/AppController.php @@ -131,7 +131,6 @@ class AppController extends BaseController Cache::flush(); Artisan::call('db:seed', ['--force' => true, '--class' => 'UpdateSeeder']); - Artisan::call('optimize', ['--force' => true]); if (! Account::count()) { $firstName = trim(Input::get('first_name')); @@ -269,7 +268,6 @@ class AppController extends BaseController if (Industry::count() == 0) { Artisan::call('db:seed', ['--force' => true]); } - Artisan::call('optimize', ['--force' => true]); } catch (Exception $e) { Utils::logError($e); @@ -307,7 +305,6 @@ class AppController extends BaseController Artisan::call('route:clear'); Artisan::call('view:clear'); Artisan::call('config:clear'); - Artisan::call('optimize', ['--force' => true]); Auth::logout(); Cache::flush(); Session::flush(); diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 016cb29d264b..c38a4ff99f2b 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -42,7 +42,7 @@ class AuthController extends Controller */ public function oauthLogin($provider, Request $request) { - return $this->authService->execute($provider, $request->has('code')); + return $this->authService->execute($provider, $request->filled('code')); } /** diff --git a/app/Http/Controllers/CalendarController.php b/app/Http/Controllers/CalendarController.php index 7911d8127994..e8377267028d 100644 --- a/app/Http/Controllers/CalendarController.php +++ b/app/Http/Controllers/CalendarController.php @@ -25,7 +25,7 @@ class CalendarController extends BaseController public function loadEvents() { if (auth()->user()->account->hasFeature(FEATURE_REPORTS)) { - $events = dispatch(new GenerateCalendarEvents()); + $events = dispatch_now(new GenerateCalendarEvents()); } else { $events = []; } diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php index a67b36dbbb07..64111976f4a0 100644 --- a/app/Http/Controllers/ClientController.php +++ b/app/Http/Controllers/ClientController.php @@ -280,14 +280,14 @@ class ClientController extends BaseController public function getEmailHistory() { - $history = dispatch(new LoadPostmarkHistory(request()->email)); + $history = dispatch_now(new LoadPostmarkHistory(request()->email)); return response()->json($history); } public function reactivateEmail() { - $result = dispatch(new ReactivatePostmarkEmail(request()->bounce_id)); + $result = dispatch_now(new ReactivatePostmarkEmail(request()->bounce_id)); return response()->json($result); } diff --git a/app/Http/Controllers/ClientPortalController.php b/app/Http/Controllers/ClientPortalController.php index 4bf1c92849d8..7a56a1958f45 100644 --- a/app/Http/Controllers/ClientPortalController.php +++ b/app/Http/Controllers/ClientPortalController.php @@ -1058,7 +1058,7 @@ class ClientPortalController extends BaseController } if (request()->json) { - return dispatch(new GenerateStatementData($client, request()->all(), $contact)); + return dispatch_now(new GenerateStatementData($client, request()->all(), $contact)); } $data = [ diff --git a/app/Http/Controllers/ClientPortalProposalController.php b/app/Http/Controllers/ClientPortalProposalController.php index 340b9f1a703e..9b3c2770b75d 100644 --- a/app/Http/Controllers/ClientPortalProposalController.php +++ b/app/Http/Controllers/ClientPortalProposalController.php @@ -54,7 +54,7 @@ class ClientPortalProposalController extends BaseController $proposal = $invitation->proposal; - $pdf = dispatch(new ConvertProposalToPdf($proposal)); + $pdf = dispatch_now(new ConvertProposalToPdf($proposal)); $this->downloadResponse($proposal->getFilename(), $pdf); } diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php index 1f5ef965bd41..6d9d9091d927 100644 --- a/app/Http/Controllers/InvoiceApiController.php +++ b/app/Http/Controllers/InvoiceApiController.php @@ -73,11 +73,11 @@ class InvoiceApiController extends BaseAPIController $invoices->where('invoice_status_id', '>=', $statusId); } - if (request()->has('is_recurring')) { + if (request()->filled('is_recurring')) { $invoices->where('is_recurring', '=', request()->is_recurring); } - if (request()->has('invoice_type_id')) { + if (request()->filled('invoice_type_id')) { $invoices->where('invoice_type_id', '=', request()->invoice_type_id); } diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 69804dab5078..d28464e733b3 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -321,7 +321,7 @@ class InvoiceController extends BaseController // Check for any taxes which have been deleted $taxRateOptions = $account->present()->taxRateOptions; - if ($invoice->exists) { + if ($invoice->exists && !$invoice->deleted_at) { foreach ($invoice->getTaxes() as $key => $rate) { $key = '0 ' . $key; // mark it as a standard exclusive rate option if (isset($taxRateOptions[$key])) { diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index c7739d3b9919..63356019c54a 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -54,7 +54,7 @@ class ProjectController extends BaseController { $account = auth()->user()->account; $project = $request->entity(); - $chartData = dispatch(new GenerateProjectChartData($project)); + $chartData = dispatch_now(new GenerateProjectChartData($project)); $data = [ 'account' => auth()->user()->account, diff --git a/app/Http/Controllers/ProposalController.php b/app/Http/Controllers/ProposalController.php index 1c93ad6482ed..9030d693b2b7 100644 --- a/app/Http/Controllers/ProposalController.php +++ b/app/Http/Controllers/ProposalController.php @@ -168,7 +168,7 @@ class ProposalController extends BaseController { $proposal = $request->entity(); - $pdf = dispatch(new ConvertProposalToPdf($proposal)); + $pdf = dispatch_now(new ConvertProposalToPdf($proposal)); $this->downloadResponse($proposal->getFilename(), $pdf); } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index bc3997f836cc..aa1e6bc84f53 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -112,11 +112,11 @@ class ReportController extends BaseController 'start_date' => $params['startDate'], 'end_date' => $params['endDate'], ]; - $report = dispatch(new RunReport(auth()->user(), $reportType, $config, $isExport)); + $report = dispatch_now(new RunReport(auth()->user(), $reportType, $config, $isExport)); $params = array_merge($params, $report->exportParams); switch ($action) { case 'export': - return dispatch(new ExportReportResults(auth()->user(), $format, $reportType, $params))->export($format); + return dispatch_now(new ExportReportResults(auth()->user(), $format, $reportType, $params))->export($format); break; case 'schedule': self::schedule($params, $config); @@ -191,7 +191,7 @@ class ReportController extends BaseController public function loadEmailReport($startDate, $endDate) { - $data = dispatch(new LoadPostmarkStats($startDate, $endDate)); + $data = dispatch_now(new LoadPostmarkStats($startDate, $endDate)); return response()->json($data); } diff --git a/app/Http/Controllers/TaskKanbanController.php b/app/Http/Controllers/TaskKanbanController.php index f00be58d7f92..51ea9a9e8565 100644 --- a/app/Http/Controllers/TaskKanbanController.php +++ b/app/Http/Controllers/TaskKanbanController.php @@ -125,7 +125,7 @@ class TaskKanbanController extends BaseController $origSortOrder = $status->sort_order; $newSortOrder = request('sort_order'); - if (request()->has('sort_order') && $newSortOrder != $origSortOrder) { + if (request()->filled('sort_order') && $newSortOrder != $origSortOrder) { TaskStatus::scope() ->where('sort_order', '>', $origSortOrder) ->decrement('sort_order'); diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php index 6275a8ce300d..8f912fb29a42 100644 --- a/app/Http/Requests/RegisterRequest.php +++ b/app/Http/Requests/RegisterRequest.php @@ -39,23 +39,4 @@ class RegisterRequest extends Request return $rules; } - - public function response(array $errors) - { - /* If the user is not validating from a mobile app - pass through parent::response */ - if (! isset($this->req->api_secret)) { - return parent::response($errors); - } - - /* If the user is validating from a mobile app - pass through first error string and return error */ - foreach ($errors as $error) { - foreach ($error as $key => $value) { - $message['error'] = ['message' => $value]; - $message = json_encode($message, JSON_PRETTY_PRINT); - $headers = Utils::getApiHeaders(); - - return Response::make($message, 400, $headers); - } - } - } } diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php index 4ce91b8540c4..b10182c32020 100644 --- a/app/Http/Requests/Request.php +++ b/app/Http/Requests/Request.php @@ -3,7 +3,9 @@ namespace App\Http\Requests; use App\Libraries\Utils; +use Illuminate\Contracts\Validation\Validator; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Validation\ValidationException; use Response; // https://laracasts.com/discuss/channels/general-discussion/laravel-5-modify-input-before-validation/replies/34366 @@ -54,22 +56,20 @@ abstract class Request extends FormRequest return $this->all(); } - public function response(array $errors) + protected function failedValidation(Validator $validator) { /* If the user is not validating from a mobile app - pass through parent::response */ - if (! request()->api_secret) { - return parent::response($errors); + if ( ! request()->api_secret) { + parent::failedValidation($validator); } /* If the user is validating from a mobile app - pass through first error string and return error */ - foreach ($errors as $error) { - foreach ($error as $key => $value) { - $message['error'] = ['message' => $value]; - $message = json_encode($message, JSON_PRETTY_PRINT); - $headers = Utils::getApiHeaders(); + if ($value = $validator->getMessageBag()->first()) { + $message['error'] = ['message' => $value]; + $message = json_encode($message, JSON_PRETTY_PRINT); + $headers = Utils::getApiHeaders(); - return Response::make($message, 400, $headers); - } + throw new ValidationException($validator, Response::make($message, 400, $headers)); } } } diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php index 1cac0d5f44f8..4e934c6e602a 100644 --- a/app/Ninja/Mailers/ContactMailer.php +++ b/app/Ninja/Mailers/ContactMailer.php @@ -71,7 +71,7 @@ class ContactMailer extends Mailer $ublString = false; if ($account->attachUBL() && ! $proposal) { - $ublString = dispatch(new ConvertInvoiceToUbl($invoice)); + $ublString = dispatch_now(new ConvertInvoiceToUbl($invoice)); } $documentStrings = []; diff --git a/app/Ninja/Repositories/RecurringExpenseRepository.php b/app/Ninja/Repositories/RecurringExpenseRepository.php index 3b5050dfb602..fc5c91bb739f 100644 --- a/app/Ninja/Repositories/RecurringExpenseRepository.php +++ b/app/Ninja/Repositories/RecurringExpenseRepository.php @@ -115,7 +115,7 @@ class RecurringExpenseRepository extends BaseRepository $expense->fill($input); if (isset($input['start_date'])) { - if ($expense->exists && $expense->start_date && $expense->start_date != Utils::toSqlDate($input['start_date'])) { + if ($expense->exists && !$expense->deleted_at && $expense->start_date && $expense->start_date != Utils::toSqlDate($input['start_date'])) { $expense->last_sent_date = null; } $expense->start_date = Utils::toSqlDate($input['start_date']); diff --git a/app/Ninja/Repositories/TicketRepository.php b/app/Ninja/Repositories/TicketRepository.php index fad688846485..c095830704fb 100644 --- a/app/Ninja/Repositories/TicketRepository.php +++ b/app/Ninja/Repositories/TicketRepository.php @@ -276,7 +276,7 @@ class TicketRepository extends BaseRepository */ if($input['action'] != TICKET_SAVE_ONLY) - $this->dispatch(new TicketAction($changedAttributes, $oldTicket, $ticket, $input['action'])); + $this->dispatch_now(new TicketAction($changedAttributes, $oldTicket, $ticket, $input['action'])); return $ticket; diff --git a/composer.json b/composer.json index f598075694f0..c2729dbb4077 100644 --- a/composer.json +++ b/composer.json @@ -41,18 +41,18 @@ "jlapp/swaggervel": "master-dev", "jonnyw/php-phantomjs": "dev-fixes", "laracasts/presenter": "dev-master", - "laravel/framework": "5.4.*", + "laravel/framework": "5.5.*", "laravel/legacy-encrypter": "^1.0", "laravel/socialite": "3.0.x-dev", "laravel/tinker": "^1.0", - "laravelcollective/html": "5.4.*", + "laravelcollective/html": "5.5.*", "league/csv": "^9.1", "league/flysystem-aws-s3-v3": "~1.0", "league/flysystem-rackspace": "~1.0", "league/fractal": "0.13.*", "maatwebsite/excel": "~2.0", - "mpdf/mpdf": "7.1.0", - "nesbot/carbon": "^1.25", + "mpdf/mpdf": "7.1.7", + "nesbot/carbon": "^1.26", "nwidart/laravel-modules": "1.*", "omnipay/authorizenet": "dev-solution-id as 2.5.0", "omnipay/firstdata": "^2.4", @@ -106,18 +106,20 @@ "post-install-cmd": [ "rm bootstrap/cache/compiled.php || true", "php artisan view:clear", - "php artisan clear-compiled", - "php artisan optimize" + "php artisan clear-compiled" ], "post-update-cmd": [ "rm bootstrap/cache/compiled.php || true", "php artisan view:clear", - "php artisan clear-compiled", - "php artisan optimize" + "php artisan clear-compiled" ], "post-create-project-cmd": [ "php -r \"copy('.env.example', '.env');\"", "php artisan key:generate" + ], + "post-autoload-dump": [ + "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", + "@php artisan package:discover" ] }, "minimum-stability": "dev", diff --git a/composer.lock b/composer.lock index 0a97c88be3f7..5c1b143c4210 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "35ab1773191336eb4a8fa7f0fe0527c4", + "content-hash": "69f5b4652eea49d4f571aef80b45df47", "packages": [ { "name": "abdala/omnipay-pagseguro", @@ -2311,6 +2311,64 @@ "homepage": "https://github.com/dompdf/dompdf", "time": "2015-12-07T04:07:13+00:00" }, + { + "name": "egulias/email-validator", + "version": "2.1.11", + "source": { + "type": "git", + "url": "https://github.com/egulias/EmailValidator.git", + "reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/92dd169c32f6f55ba570c309d83f5209cefb5e23", + "reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23", + "shasum": "" + }, + "require": { + "doctrine/lexer": "^1.0.1", + "php": ">= 5.5" + }, + "require-dev": { + "dominicsayers/isemail": "dev-master", + "phpunit/phpunit": "^4.8.35||^5.7||^6.0", + "satooshi/php-coveralls": "^1.0.1", + "symfony/phpunit-bridge": "^4.4@dev" + }, + "suggest": { + "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Egulias\\EmailValidator\\": "EmailValidator" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eduardo Gulias Davis" + } + ], + "description": "A library for validating emails against several RFCs", + "homepage": "https://github.com/egulias/EmailValidator", + "keywords": [ + "email", + "emailvalidation", + "emailvalidator", + "validation", + "validator" + ], + "time": "2019-08-13T17:33:27+00:00" + }, { "name": "elasticsearch/elasticsearch", "version": "v5.3.2", @@ -3961,7 +4019,7 @@ "time": "2017-06-01T20:29:30+00:00" }, { - "name": "jeremeamia/superclosure", + "name": "jeremeamia/SuperClosure", "version": "2.3.0", "source": { "type": "git", @@ -4184,6 +4242,51 @@ ], "time": "2015-06-05T12:03:08+00:00" }, + { + "name": "kylekatarnls/update-helper", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/kylekatarnls/update-helper.git", + "reference": "5786fa188e0361b9adf9e8199d7280d1b2db165e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kylekatarnls/update-helper/zipball/5786fa188e0361b9adf9e8199d7280d1b2db165e", + "reference": "5786fa188e0361b9adf9e8199d7280d1b2db165e", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.1.0 || ^2.0.0", + "php": ">=5.3.0" + }, + "require-dev": { + "codeclimate/php-test-reporter": "dev-master", + "composer/composer": "2.0.x-dev || ^2.0.0-dev", + "phpunit/phpunit": ">=4.8.35 <6.0" + }, + "type": "composer-plugin", + "extra": { + "class": "UpdateHelper\\ComposerPlugin" + }, + "autoload": { + "psr-0": { + "UpdateHelper\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kyle", + "email": "kylekatarnls@gmail.com" + } + ], + "description": "Update helper", + "time": "2019-07-29T11:03:54+00:00" + }, { "name": "laracasts/presenter", "version": "dev-master", @@ -4232,39 +4335,40 @@ }, { "name": "laravel/framework", - "version": "v5.4.36", + "version": "v5.5.48", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9" + "reference": "e3e8d585dcfab5abe6261b060f4df0d48f9924bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/1062a22232071c3e8636487c86ec1ae75681bbf9", - "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9", + "url": "https://api.github.com/repos/laravel/framework/zipball/e3e8d585dcfab5abe6261b060f4df0d48f9924bf", + "reference": "e3e8d585dcfab5abe6261b060f4df0d48f9924bf", "shasum": "" }, "require": { "doctrine/inflector": "~1.1", - "erusev/parsedown": "~1.6", + "erusev/parsedown": "~1.7", "ext-mbstring": "*", "ext-openssl": "*", - "league/flysystem": "~1.0", - "monolog/monolog": "~1.11", + "league/flysystem": "^1.0.8", + "monolog/monolog": "~1.12", "mtdowling/cron-expression": "~1.0", - "nesbot/carbon": "~1.20", - "paragonie/random_compat": "~1.4|~2.0", - "php": ">=5.6.4", + "nesbot/carbon": "^1.26.0", + "php": ">=7.0", + "psr/container": "~1.0", + "psr/simple-cache": "^1.0", "ramsey/uuid": "~3.0", - "swiftmailer/swiftmailer": "~5.4", - "symfony/console": "~3.2", - "symfony/debug": "~3.2", - "symfony/finder": "~3.2", - "symfony/http-foundation": "~3.2", - "symfony/http-kernel": "~3.2", - "symfony/process": "~3.2", - "symfony/routing": "~3.2", - "symfony/var-dumper": "~3.2", + "swiftmailer/swiftmailer": "~6.0", + "symfony/console": "~3.3", + "symfony/debug": "~3.3", + "symfony/finder": "~3.3", + "symfony/http-foundation": "~3.3", + "symfony/http-kernel": "~3.3", + "symfony/process": "~3.3", + "symfony/routing": "~3.3", + "symfony/var-dumper": "~3.3", "tijsverkoyen/css-to-inline-styles": "~2.2", "vlucas/phpdotenv": "~2.2" }, @@ -4281,7 +4385,6 @@ "illuminate/database": "self.version", "illuminate/encryption": "self.version", "illuminate/events": "self.version", - "illuminate/exception": "self.version", "illuminate/filesystem": "self.version", "illuminate/hashing": "self.version", "illuminate/http": "self.version", @@ -4298,38 +4401,43 @@ "illuminate/translation": "self.version", "illuminate/validation": "self.version", "illuminate/view": "self.version", - "tightenco/collect": "self.version" + "tightenco/collect": "<5.5.33" }, "require-dev": { "aws/aws-sdk-php": "~3.0", "doctrine/dbal": "~2.5", - "mockery/mockery": "~0.9.4", + "filp/whoops": "^2.1.4", + "mockery/mockery": "~1.0", + "orchestra/testbench-core": "3.5.*", "pda/pheanstalk": "~3.0", - "phpunit/phpunit": "~5.7", - "predis/predis": "~1.0", - "symfony/css-selector": "~3.2", - "symfony/dom-crawler": "~3.2" + "phpunit/phpunit": "~6.0", + "predis/predis": "^1.1.1", + "symfony/css-selector": "~3.3", + "symfony/dom-crawler": "~3.3" }, "suggest": { "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.5).", + "ext-pcntl": "Required to use all features of the queue worker.", + "ext-posix": "Required to use all features of the queue worker.", "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).", "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).", "laravel/tinker": "Required to use the tinker console command (~1.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", + "league/flysystem-cached-adapter": "Required to use Flysystem caching (~1.0).", "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).", "nexmo/client": "Required to use the Nexmo transport (~1.0).", "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).", "predis/predis": "Required to use the redis cache and queue drivers (~1.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).", - "symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.2).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.2).", - "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)." + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0).", + "symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.3).", + "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.3).", + "symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "5.5-dev" } }, "autoload": { @@ -4357,7 +4465,7 @@ "framework", "laravel" ], - "time": "2017-08-30T09:26:16+00:00" + "time": "2019-08-20T15:46:40+00:00" }, { "name": "laravel/legacy-encrypter", @@ -4599,32 +4707,46 @@ }, { "name": "laravelcollective/html", - "version": "v5.4.9", + "version": "v5.5.4", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "f04965dc688254f4c77f684ab0b42264f9eb9634" + "reference": "04c596a69975b901f2223eb6eb4adf55354121c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/f04965dc688254f4c77f684ab0b42264f9eb9634", - "reference": "f04965dc688254f4c77f684ab0b42264f9eb9634", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/04c596a69975b901f2223eb6eb4adf55354121c2", + "reference": "04c596a69975b901f2223eb6eb4adf55354121c2", "shasum": "" }, "require": { - "illuminate/http": "5.4.*", - "illuminate/routing": "5.4.*", - "illuminate/session": "5.4.*", - "illuminate/support": "5.4.*", - "illuminate/view": "5.4.*", - "php": ">=5.6.4" + "illuminate/http": "5.5.*", + "illuminate/routing": "5.5.*", + "illuminate/session": "5.5.*", + "illuminate/support": "5.5.*", + "illuminate/view": "5.5.*", + "php": ">=7.0.0" }, "require-dev": { - "illuminate/database": "5.4.*", + "illuminate/database": "5.5.*", "mockery/mockery": "~0.9.4", "phpunit/phpunit": "~5.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.5-dev" + }, + "laravel": { + "providers": [ + "Collective\\Html\\HtmlServiceProvider" + ], + "aliases": { + "Form": "Collective\\Html\\FormFacade", + "Html": "Collective\\Html\\HtmlFacade" + } + } + }, "autoload": { "psr-4": { "Collective\\Html\\": "src/" @@ -4648,8 +4770,8 @@ } ], "description": "HTML and Form Builders for the Laravel Framework", - "homepage": "http://laravelcollective.com", - "time": "2017-08-12T15:52:38+00:00" + "homepage": "https://laravelcollective.com", + "time": "2018-03-24T00:39:21+00:00" }, { "name": "league/csv", @@ -5083,12 +5205,12 @@ "source": { "type": "git", "url": "https://github.com/lokielse/omnipay-alipay.git", - "reference": "0a8e30dd1c9c8cc4a4cffbc8e381a7b1284d3b95" + "reference": "294449c11dcba9f2669666f2a3dc44cd07f7597f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lokielse/omnipay-alipay/zipball/0a8e30dd1c9c8cc4a4cffbc8e381a7b1284d3b95", - "reference": "0a8e30dd1c9c8cc4a4cffbc8e381a7b1284d3b95", + "url": "https://api.github.com/repos/lokielse/omnipay-alipay/zipball/294449c11dcba9f2669666f2a3dc44cd07f7597f", + "reference": "294449c11dcba9f2669666f2a3dc44cd07f7597f", "shasum": "" }, "require": { @@ -5543,24 +5665,24 @@ }, { "name": "mpdf/mpdf", - "version": "v7.1.0", + "version": "v7.1.7", "source": { "type": "git", "url": "https://github.com/mpdf/mpdf.git", - "reference": "8e3d0d7bf74f71d04904215fb487d01e924c469a" + "reference": "ac60286a7dc5250c293afebd2bd9414e58a02466" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mpdf/mpdf/zipball/8e3d0d7bf74f71d04904215fb487d01e924c469a", - "reference": "8e3d0d7bf74f71d04904215fb487d01e924c469a", + "url": "https://api.github.com/repos/mpdf/mpdf/zipball/ac60286a7dc5250c293afebd2bd9414e58a02466", + "reference": "ac60286a7dc5250c293afebd2bd9414e58a02466", "shasum": "" }, "require": { "ext-gd": "*", "ext-mbstring": "*", "myclabs/deep-copy": "^1.7", - "paragonie/random_compat": "^1.4|^2.0", - "php": "^5.6 || ~7.0.0 || ~7.1.0 || ~7.2.0", + "paragonie/random_compat": "^1.4|^2.0|9.99.99", + "php": "^5.6 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0", "psr/log": "^1.0", "setasign/fpdi": "1.6.*" }, @@ -5578,7 +5700,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-development": "7.0-dev" + "dev-development": "7.x-dev" } }, "autoload": { @@ -5600,14 +5722,14 @@ "role": "Developer (retired)" } ], - "description": "A PHP class to generate PDF files from HTML with Unicode/UTF-8 and CJK support", + "description": "PHP library generating PDF files from UTF-8 encoded HTML", "homepage": "https://mpdf.github.io", "keywords": [ "pdf", "php", "utf-8" ], - "time": "2018-05-18T05:41:37+00:00" + "time": "2018-11-29T18:21:32+00:00" }, { "name": "mtdowling/cron-expression", @@ -5755,35 +5877,43 @@ }, { "name": "nesbot/carbon", - "version": "1.25.0", + "version": "1.39.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4" + "reference": "dd62a58af4e0775a45ea5f99d0363d81b7d9a1e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cbcf13da0b531767e39eb86e9687f5deba9857b4", - "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/dd62a58af4e0775a45ea5f99d0363d81b7d9a1e0", + "reference": "dd62a58af4e0775a45ea5f99d0363d81b7d9a1e0", "shasum": "" }, "require": { + "kylekatarnls/update-helper": "^1.1", "php": ">=5.3.9", "symfony/translation": "~2.6 || ~3.0 || ~4.0" }, "require-dev": { + "composer/composer": "^1.2", "friendsofphp/php-cs-fixer": "~2", "phpunit/phpunit": "^4.8.35 || ^5.7" }, + "bin": [ + "bin/upgrade-carbon" + ], "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.23-dev" + "update-helper": "Carbon\\Upgrade", + "laravel": { + "providers": [ + "Carbon\\Laravel\\ServiceProvider" + ] } }, "autoload": { "psr-4": { - "Carbon\\": "src/Carbon/" + "": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -5804,7 +5934,7 @@ "datetime", "time" ], - "time": "2018-03-19T15:50:49+00:00" + "time": "2019-06-11T09:07:59+00:00" }, { "name": "nikic/php-parser", @@ -8472,6 +8602,54 @@ ], "time": "2016-10-10T12:19:37+00:00" }, + { + "name": "psr/simple-cache", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "time": "2017-10-23T01:57:42+00:00" + }, { "name": "psy/psysh", "version": "v0.8.17", @@ -9324,29 +9502,37 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.9", + "version": "v6.2.1", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "7ffc1ea296ed14bf8260b6ef11b80208dbadba91" + "reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/7ffc1ea296ed14bf8260b6ef11b80208dbadba91", - "reference": "7ffc1ea296ed14bf8260b6ef11b80208dbadba91", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a", + "reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a", "shasum": "" }, "require": { - "php": ">=5.3.3" + "egulias/email-validator": "~2.0", + "php": ">=7.0.0", + "symfony/polyfill-iconv": "^1.0", + "symfony/polyfill-intl-idn": "^1.10", + "symfony/polyfill-mbstring": "^1.0" }, "require-dev": { "mockery/mockery": "~0.9.1", - "symfony/phpunit-bridge": "~3.2" + "symfony/phpunit-bridge": "^3.4.19|^4.1.8" + }, + "suggest": { + "ext-intl": "Needed to support internationalized email addresses", + "true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "6.2-dev" } }, "autoload": { @@ -9374,7 +9560,7 @@ "mail", "mailer" ], - "time": "2018-01-23T07:37:21+00:00" + "time": "2019-04-21T09:21:45+00:00" }, { "name": "symfony/class-loader", @@ -10098,6 +10284,127 @@ ], "time": "2018-01-11T07:56:07+00:00" }, + { + "name": "symfony/polyfill-iconv", + "version": "v1.12.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-iconv.git", + "reference": "685968b11e61a347c18bf25db32effa478be610f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/685968b11e61a347c18bf25db32effa478be610f", + "reference": "685968b11e61a347c18bf25db32effa478be610f", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-iconv": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.12-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Iconv\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Iconv extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "iconv", + "polyfill", + "portable", + "shim" + ], + "time": "2019-08-06T08:03:45+00:00" + }, + { + "name": "symfony/polyfill-intl-idn", + "version": "v1.12.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-idn.git", + "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6af626ae6fa37d396dc90a399c0ff08e5cfc45b2", + "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php72": "^1.9" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.12-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Laurent Bassin", + "email": "laurent@bassin.info" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "idn", + "intl", + "polyfill", + "portable", + "shim" + ], + "time": "2019-08-06T08:03:45+00:00" + }, { "name": "symfony/polyfill-mbstring", "version": "v1.10.0", @@ -10272,6 +10579,61 @@ ], "time": "2018-09-21T06:26:08+00:00" }, + { + "name": "symfony/polyfill-php72", + "version": "v1.12.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "04ce3335667451138df4307d6a9b61565560199e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e", + "reference": "04ce3335667451138df4307d6a9b61565560199e", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.12-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2019-08-06T08:03:45+00:00" + }, { "name": "symfony/polyfill-util", "version": "v1.7.0", @@ -11105,7 +11467,7 @@ "iso_3166_3", "laravel" ], - "time": "2019-07-12T14:06:05+00:00" + "time": "2017-10-15T11:08:15+00:00" }, { "name": "websight/l5-google-cloud-storage", @@ -11113,18 +11475,24 @@ "source": { "type": "git", "url": "https://github.com/hillelcoren/l5-google-cloud-storage.git", - "reference": "ca2023b646b4b3e318b8945d023af14120c2c117" + "reference": "4bf1d928ec553fca1e7202738bc0fc7d9dc069d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hillelcoren/l5-google-cloud-storage/zipball/ca2023b646b4b3e318b8945d023af14120c2c117", - "reference": "ca2023b646b4b3e318b8945d023af14120c2c117", + "url": "https://api.github.com/repos/hillelcoren/l5-google-cloud-storage/zipball/4bf1d928ec553fca1e7202738bc0fc7d9dc069d2", + "reference": "4bf1d928ec553fca1e7202738bc0fc7d9dc069d2", "shasum": "" }, "require": { "cedricziel/flysystem-gcs": "^1.0", - "illuminate/filesystem": "~5.0.17|5.1.*|5.2.*|5.3.*|5.4.*", - "illuminate/support": "~5.0.17|5.1.*|5.2.*|5.3.*|5.4.*" + "illuminate/filesystem": "~5.0.17|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*", + "illuminate/support": "~5.0.17|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*" + }, + "require-dev": { + "phpunit/phpunit": "^6.5" + }, + "suggest": { + "laravel/lumen-framework": "To test the Lumen bindings" }, "type": "library", "extra": { @@ -11134,29 +11502,28 @@ }, "autoload": { "psr-4": { - "Websight\\GcsProvider\\": "src/Websight/GcsProvider/" + "Websight\\GcsProvider\\": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { "name": "Cedric Ziel", - "email": "ziel@websight.de" + "email": "cedric@cedric-ziel.com" } ], - "description": "Laravel 5 Flysystem Google Cloud Storage Service Provider", + "description": "Laravel 5 Flysystem Google Cloud Storage Service Provider", "homepage": "https://github.com/websightgmbh/l5-google-cloud-storage", "keywords": [ - "flysystem", + "Flysystem", "laravel", - "laravel5" + "laravel5", + "lumen" ], - "support": { - "source": "https://github.com/hillelcoren/l5-google-cloud-storage/tree/master" - }, - "time": "2017-07-13T08:04:13+00:00" + "time": "2018-03-23T08:09:41+00:00" }, { "name": "wepay/php-sdk", @@ -12308,7 +12675,8 @@ "authors": [ { "name": "Chris Boulton", - "homepage": "http://github.com/chrisboulton" + "homepage": "http://github.com/chrisboulton", + "role": "Original developer" } ], "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).", diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php index 974192e51231..f74609afb941 100644 --- a/resources/views/header.blade.php +++ b/resources/views/header.blade.php @@ -513,7 +513,7 @@ @if (!isset($showBreadcrumbs) || $showBreadcrumbs) - {!! Form::breadcrumbs((! empty($entity) && $entity->exists) ? $entity->present()->statusLabel : false) !!} + {!! Form::breadcrumbs((! empty($entity) && $entity->exists && !$entity->deleted_at) ? $entity->present()->statusLabel : false) !!} @endif @yield('content') From ac1e48455f3623bc6f0e67fc1800bd651941327f Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Sat, 14 Sep 2019 14:35:11 -0400 Subject: [PATCH 2/2] Upgrade modules and debugbar dependencies --- composer.json | 4 +-- composer.lock | 74 +++++++++++++++++++++++++++++++++------------------ 2 files changed, 50 insertions(+), 28 deletions(-) diff --git a/composer.json b/composer.json index c2729dbb4077..5d55a601ee73 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "bacon/bacon-qr-code": "^1.0", "barracudanetworks/archivestream-php": "1.0.5", "barryvdh/laravel-cors": "^0.9.1", - "barryvdh/laravel-debugbar": "~2.2", + "barryvdh/laravel-debugbar": "~3.0.1", "barryvdh/laravel-ide-helper": "~2.2", "cerdic/css-tidy": "~v1.5", "chumper/datatable": "dev-add-back-options", @@ -53,7 +53,7 @@ "maatwebsite/excel": "~2.0", "mpdf/mpdf": "7.1.7", "nesbot/carbon": "^1.26", - "nwidart/laravel-modules": "1.*", + "nwidart/laravel-modules": "2.0.*", "omnipay/authorizenet": "dev-solution-id as 2.5.0", "omnipay/firstdata": "^2.4", "omnipay/payfast": "dev-master", diff --git a/composer.lock b/composer.lock index 5c1b143c4210..c6d6ea329541 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "69f5b4652eea49d4f571aef80b45df47", + "content-hash": "7a2fd23f5878498afcc54b1bc31def3e", "packages": [ { "name": "abdala/omnipay-pagseguro", @@ -621,25 +621,44 @@ }, { "name": "barryvdh/laravel-debugbar", - "version": "v2.4.3", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "d7c88f08131f6404cb714f3f6cf0642f6afa3903" + "reference": "bce341e3194bbeffa60ac782d645067557f5075e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/d7c88f08131f6404cb714f3f6cf0642f6afa3903", - "reference": "d7c88f08131f6404cb714f3f6cf0642f6afa3903", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/bce341e3194bbeffa60ac782d645067557f5075e", + "reference": "bce341e3194bbeffa60ac782d645067557f5075e", "shasum": "" }, "require": { - "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*", - "maximebf/debugbar": "~1.13.0", - "php": ">=5.5.9", - "symfony/finder": "~2.7|~3.0" + "illuminate/routing": "5.5.x", + "illuminate/session": "5.5.x", + "illuminate/support": "5.5.x", + "maximebf/debugbar": "~1.14.0", + "php": ">=7.0", + "symfony/debug": "^3", + "symfony/finder": "^3" + }, + "require-dev": { + "illuminate/framework": "5.5.x" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + }, + "laravel": { + "providers": [ + "Barryvdh\\Debugbar\\ServiceProvider" + ], + "aliases": { + "Debugbar": "Barryvdh\\Debugbar\\Facade" + } + } + }, "autoload": { "psr-4": { "Barryvdh\\Debugbar\\": "src/" @@ -666,7 +685,7 @@ "profiler", "webprofiler" ], - "time": "2017-07-21T11:56:48+00:00" + "time": "2017-08-29T08:54:25+00:00" }, { "name": "barryvdh/laravel-ide-helper", @@ -5328,16 +5347,16 @@ }, { "name": "maximebf/debugbar", - "version": "1.13.1", + "version": "v1.14.1", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "afee79a236348e39a44cb837106b7c5b4897ac2a" + "reference": "64251a392344e3d22f3d21c3b7c531ba96eb01d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/afee79a236348e39a44cb837106b7c5b4897ac2a", - "reference": "afee79a236348e39a44cb837106b7c5b4897ac2a", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/64251a392344e3d22f3d21c3b7c531ba96eb01d2", + "reference": "64251a392344e3d22f3d21c3b7c531ba96eb01d2", "shasum": "" }, "require": { @@ -5356,7 +5375,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -5385,7 +5404,7 @@ "debug", "debugbar" ], - "time": "2017-01-05T08:46:19+00:00" + "time": "2017-09-13T12:19:36+00:00" }, { "name": "meebio/omnipay-creditcall", @@ -5989,28 +6008,28 @@ }, { "name": "nwidart/laravel-modules", - "version": "1.27.2", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/nWidart/laravel-modules.git", - "reference": "5f149198bd3d4cf9c9323a301d5b8b0aabc44591" + "reference": "bb70bccf1c6909777d9ee748e84370a7417a1b3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nWidart/laravel-modules/zipball/5f149198bd3d4cf9c9323a301d5b8b0aabc44591", - "reference": "5f149198bd3d4cf9c9323a301d5b8b0aabc44591", + "url": "https://api.github.com/repos/nWidart/laravel-modules/zipball/bb70bccf1c6909777d9ee748e84370a7417a1b3c", + "reference": "bb70bccf1c6909777d9ee748e84370a7417a1b3c", "shasum": "" }, "require": { - "laravel/framework": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*", - "php": ">=5.5" + "laravel/framework": "5.5.*", + "php": ">=7.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.4", - "mockery/mockery": "~0.9.3", - "orchestra/testbench": "^3.1|^3.2|^3.3|^3.4", + "mockery/mockery": "~0.9", + "orchestra/testbench": "^3.5", "phpro/grumphp": "^0.11", - "phpunit/phpunit": "~5.7" + "phpunit/phpunit": "~6.0" }, "type": "library", "extra": { @@ -6021,6 +6040,9 @@ "aliases": { "Module": "Nwidart\\Modules\\Facades\\Module" } + }, + "branch-alias": { + "dev-master": "2.0-dev" } }, "autoload": { @@ -6051,7 +6073,7 @@ "nwidart", "rad" ], - "time": "2017-08-31T16:09:16+00:00" + "time": "2017-08-31T17:00:30+00:00" }, { "name": "omnipay/2checkout",