diff --git a/Changelog b/Changelog index 74e65577c..7c8ca6e6b 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-03-07 DariusIII + * Chg: Update laravel/framework to version 5.6.9 and laravel/tinker to version 1.0.4 * Chg: Update example .env file * Fix: Fix bad logic when checking for existing title * Chg: Add check for existing title in TV class add function diff --git a/composer.lock b/composer.lock index 90486b67d..b3956dff0 100644 --- a/composer.lock +++ b/composer.lock @@ -3241,16 +3241,16 @@ }, { "name": "laravel/framework", - "version": "v5.6.7", + "version": "v5.6.9", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "18402cd4b83fd1d944f3baa0d8cc26d7dfcce333" + "reference": "98fdbb098cf52a74441fe949be121c18e3dbbe6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/18402cd4b83fd1d944f3baa0d8cc26d7dfcce333", - "reference": "18402cd4b83fd1d944f3baa0d8cc26d7dfcce333", + "url": "https://api.github.com/repos/laravel/framework/zipball/98fdbb098cf52a74441fe949be121c18e3dbbe6a", + "reference": "98fdbb098cf52a74441fe949be121c18e3dbbe6a", "shasum": "" }, "require": { @@ -3278,6 +3278,9 @@ "tijsverkoyen/css-to-inline-styles": "^2.2.1", "vlucas/phpdotenv": "~2.2" }, + "conflict": { + "tightenco/collect": "<5.5.33" + }, "replace": { "illuminate/auth": "self.version", "illuminate/broadcasting": "self.version", @@ -3306,8 +3309,7 @@ "illuminate/support": "self.version", "illuminate/translation": "self.version", "illuminate/validation": "self.version", - "illuminate/view": "self.version", - "tightenco/collect": "<5.5.33" + "illuminate/view": "self.version" }, "require-dev": { "aws/aws-sdk-php": "~3.0", @@ -3373,7 +3375,7 @@ "framework", "laravel" ], - "time": "2018-02-28T14:50:53+00:00" + "time": "2018-03-07T14:04:49+00:00" }, { "name": "laravel/scout", @@ -3442,16 +3444,16 @@ }, { "name": "laravel/tinker", - "version": "v1.0.3", + "version": "v1.0.4", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "852c2abe0b0991555a403f1c0583e64de6acb4a6" + "reference": "eb8d3cfb41b7f74fb0ef4724e459d44f4cbb35b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/852c2abe0b0991555a403f1c0583e64de6acb4a6", - "reference": "852c2abe0b0991555a403f1c0583e64de6acb4a6", + "url": "https://api.github.com/repos/laravel/tinker/zipball/eb8d3cfb41b7f74fb0ef4724e459d44f4cbb35b8", + "reference": "eb8d3cfb41b7f74fb0ef4724e459d44f4cbb35b8", "shasum": "" }, "require": { @@ -3501,7 +3503,7 @@ "laravel", "psysh" ], - "time": "2017-12-18T16:25:11+00:00" + "time": "2018-03-06T13:48:07+00:00" }, { "name": "league/csv",