diff --git a/Changelog b/Changelog index a049ec4cb..c2860c765 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2018-10-24 DariusIII + * Chg: Update laravel/framework to 5.7.10 again 2018-10-23 DariusIII * Fix: Downgrade laravel/framework to 5.7.9 due to breaking changes * Chg: Remove unused assets from composer.json diff --git a/composer.json b/composer.json index 472fc4b51..e45cc8657 100755 --- a/composer.json +++ b/composer.json @@ -139,7 +139,7 @@ "joshpinkney/tv-maze-php-api": "dev-master", "jrean/laravel-user-verification": "^7.0", "kevinlebrun/colors.php": "^1.0", - "laravel/framework": "5.7.9", + "laravel/framework": "5.7.*", "laravel/scout": "^5.0", "laravel/tinker": "~1.0", "laravelcollective/html": "^5.6", diff --git a/composer.lock b/composer.lock index f3526e7a9..c2f99b547 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": "5aac132366b503b8f0aa78f01064ece7", + "content-hash": "fe891424162955e68bf5bcdd3773941a", "packages": [ { "name": "aharen/omdbapi", @@ -321,7 +321,8 @@ "Gemfile.lock", "*.md" ] - } + }, + "time": "2016-06-06T17:37:52+00:00" }, { "name": "bower-asset/autosize", @@ -350,7 +351,8 @@ "form", "textarea", "ui" - ] + ], + "time": "2017-05-19T15:36:30+00:00" }, { "name": "bower-asset/bootstrap", @@ -399,7 +401,8 @@ "mobile-first", "responsive", "web" - ] + ], + "time": "2016-07-25T15:51:55+00:00" }, { "name": "bower-asset/bootstrap-3.x", @@ -448,7 +451,8 @@ "mobile-first", "responsive", "web" - ] + ], + "time": "2016-07-25T15:51:55+00:00" }, { "name": "bower-asset/bootstrap-datepicker", @@ -477,7 +481,8 @@ }, "license": [ "Apache-2.0" - ] + ], + "time": "2016-08-05T09:50:13+00:00" }, { "name": "bower-asset/bootstrap-hover-dropdown", @@ -507,7 +512,8 @@ "dropdowns", "hover", "twitter" - ] + ], + "time": "2015-12-01T23:35:57+00:00" }, { "name": "bower-asset/bootstrap-progressbar", @@ -541,7 +547,8 @@ }, "license": [ "MIT" - ] + ], + "time": "2015-05-15T18:56:17+00:00" }, { "name": "bower-asset/colorbox", @@ -582,7 +589,8 @@ "modal", "popup", "ui" - ] + ], + "time": "2016-05-10T22:21:33+00:00" }, { "name": "bower-asset/datatables", @@ -697,7 +705,8 @@ "tests", "examples" ] - } + }, + "time": "2015-01-26T21:19:01+00:00" }, { "name": "bower-asset/flexboxgrid", @@ -733,7 +742,8 @@ "css", "flexbox", "grid" - ] + ], + "time": "2016-08-14T16:43:18+00:00" }, { "name": "bower-asset/font-awesome", @@ -778,7 +788,8 @@ "src", "build.xml" ] - } + }, + "time": "2015-07-20T20:04:00+00:00" }, { "name": "bower-asset/icheck", @@ -828,7 +839,8 @@ "replacement", "skins", "ui" - ] + ], + "time": "2014-03-03T17:36:28+00:00" }, { "name": "bower-asset/jquery", @@ -927,7 +939,8 @@ "scroll", "scrolltop", "scrolltotop" - ] + ], + "time": "2017-08-31T15:51:29+00:00" }, { "name": "bower-asset/jquery-migrate-3.0.x", @@ -946,7 +959,8 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "jquery-migrate.js" - } + }, + "time": "2016-06-10T14:28:59+00:00" }, { "name": "bower-asset/jquery.nicescroll", @@ -976,7 +990,8 @@ "demo", "package.json" ] - } + }, + "time": "2016-03-01T20:38:24+00:00" }, { "name": "bower-asset/pace", @@ -1022,7 +1037,8 @@ "progress", "progress", "spinner" - ] + ], + "time": "2014-11-06T16:31:34+00:00" }, { "name": "bower-asset/pnotify", @@ -1074,7 +1090,8 @@ "license": [ "Apache-2.0" ], - "description": "JavaScript notification plugin." + "description": "JavaScript notification plugin.", + "time": "2017-07-31T21:50:29+00:00" }, { "name": "bower-asset/respond", @@ -1098,7 +1115,8 @@ "test" ] }, - "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)" + "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)", + "time": "2013-12-19T04:44:31+00:00" }, { "name": "bower-asset/slimscroll", @@ -1139,7 +1157,8 @@ "scrolling", "slimscroll", "ui" - ] + ], + "time": "2016-06-11T09:19:14+00:00" }, { "name": "bower-asset/tinymce-dist", @@ -3503,16 +3522,16 @@ }, { "name": "laravel/framework", - "version": "v5.7.9", + "version": "v5.7.10", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "172f69f86bb86e107fb9fafff293b4b01291cf05" + "reference": "7d748c33b8c409b9b0c96704d6493853de41754d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/172f69f86bb86e107fb9fafff293b4b01291cf05", - "reference": "172f69f86bb86e107fb9fafff293b4b01291cf05", + "url": "https://api.github.com/repos/laravel/framework/zipball/7d748c33b8c409b9b0c96704d6493853de41754d", + "reference": "7d748c33b8c409b9b0c96704d6493853de41754d", "shasum": "" }, "require": { @@ -3594,6 +3613,7 @@ "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).", "ext-pcntl": "Required to use all features of the queue worker.", "ext-posix": "Required to use all features of the queue worker.", + "filp/whoops": "Required for friendly error pages in development (^2.1.4).", "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).", @@ -3641,7 +3661,7 @@ "framework", "laravel" ], - "time": "2018-10-09T13:28:28+00:00" + "time": "2018-10-23T14:05:19+00:00" }, { "name": "laravel/scout", diff --git a/public/index.php b/public/index.php index e61a04845..bceabcaa1 100644 --- a/public/index.php +++ b/public/index.php @@ -2,8 +2,8 @@ require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'resources/views/themes/smarty.php'; -$kernel = $app->make(\Illuminate\Contracts\Http\Kernel::class); +$kernel = $app->make(Illuminate\Contracts\Http\Kernel::class); -$response = $kernel->handle($request = \Illuminate\Http\Request::capture()); +$response = $kernel->handle($request = Illuminate\Http\Request::capture()); $response->send(); $kernel->terminate($request, $response);