From 8aa920ca3a072023259fbf36a82db0265dc35c0c Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 7 Jul 2017 12:59:59 -0700 Subject: [PATCH] Update composer --- composer.json | 2 +- composer.lock | 22 +++++++++++----------- config/app.php | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 4324d72bc1..f3781f5b1c 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "fideloper/proxy": "^3.1", "intervention/image": "^2.3", "javiereguiluz/easyslugger": "^1.0", - "laravel/framework": "5.4.*", + "laravel/framework": "5.4.27", "laravel/passport": "^1.0", "laravel/tinker": "^1.0", "laravelcollective/html": "^5.3", diff --git a/composer.lock b/composer.lock index c83928dde0..5606a7b008 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "06255ce35a99703a945dfa6ae6bedbc8", + "content-hash": "dd84e08e5e7eca2c1e032c6357ca2500", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.30.2", + "version": "3.30.3", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "20539a38dc643a2700f80ae8647dbd1a05d3f7a9" + "reference": "2208af5a13082a0e5c1b7a8f4f7336a7e8805966" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/20539a38dc643a2700f80ae8647dbd1a05d3f7a9", - "reference": "20539a38dc643a2700f80ae8647dbd1a05d3f7a9", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2208af5a13082a0e5c1b7a8f4f7336a7e8805966", + "reference": "2208af5a13082a0e5c1b7a8f4f7336a7e8805966", "shasum": "" }, "require": { @@ -84,7 +84,7 @@ "s3", "sdk" ], - "time": "2017-06-23T18:54:40+00:00" + "time": "2017-06-27T22:53:36+00:00" }, { "name": "aws/aws-sdk-php-laravel", @@ -2671,16 +2671,16 @@ }, { "name": "psy/psysh", - "version": "v0.8.7", + "version": "v0.8.8", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "be969b9dc89dcaefdb9a3117fa91fa38bca19f50" + "reference": "fe65c30cbc55c71e61ba3a38b5a581149be31b8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/be969b9dc89dcaefdb9a3117fa91fa38bca19f50", - "reference": "be969b9dc89dcaefdb9a3117fa91fa38bca19f50", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/fe65c30cbc55c71e61ba3a38b5a581149be31b8e", + "reference": "fe65c30cbc55c71e61ba3a38b5a581149be31b8e", "shasum": "" }, "require": { @@ -2740,7 +2740,7 @@ "interactive", "shell" ], - "time": "2017-06-20T12:51:31+00:00" + "time": "2017-06-24T06:16:19+00:00" }, { "name": "ramsey/uuid", diff --git a/config/app.php b/config/app.php index 58f5d9f059..ef207e62c3 100755 --- a/config/app.php +++ b/config/app.php @@ -285,8 +285,8 @@ return [ 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, 'Input' => Illuminate\Support\Facades\Input::class, - 'Form' => 'Collective\Html\FormFacade', - 'Html' => 'Collective\Html\HtmlFacade', + 'Form' => Collective\Html\FormFacade::class, + 'Html' => Collective\Html\HtmlFacade::class, 'Google2FA' => PragmaRX\Google2FA\Vendor\Laravel\Facade::class, 'Debugbar' => Barryvdh\Debugbar\Facade::class, 'Image' => Intervention\Image\ImageManagerStatic::class,