From e40c634ea825037dfb29afa1a44a8cf830dcf112 Mon Sep 17 00:00:00 2001 From: Infacq Date: Fri, 22 May 2015 15:06:34 +0800 Subject: [PATCH 1/4] change to official community project --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 23390e0c1890..17401a68df19 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "coatesap/omnipay-realex": "~2.0", "fruitcakestudio/omnipay-sisow": "~2.0", "alfaproject/omnipay-skrill": "dev-master", - "illuminate/html": "5.*", + "laravelcollective/html": "~5.0" "omnipay/bitpay": "dev-master" }, "require-dev": { From 4284ab6f91e13b9b2cc86d1b3528f7e318b3d1d9 Mon Sep 17 00:00:00 2001 From: Infacq Date: Fri, 22 May 2015 15:09:14 +0800 Subject: [PATCH 2/4] to suit with Laravel Collective Syntax --- config/app.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/app.php b/config/app.php index d4ca7d6d4020..1e0ef2f30a6f 100644 --- a/config/app.php +++ b/config/app.php @@ -146,7 +146,7 @@ return [ 'Intervention\Image\ImageServiceProvider', 'Webpatser\Countries\CountriesServiceProvider', 'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider', - 'Illuminate\Html\HtmlServiceProvider', + 'Collective\Html\HtmlServiceProvider', /* * Application Service Providers... @@ -244,8 +244,8 @@ return [ // Added Class Aliases 'Utils' => 'App\Libraries\Utils', - 'Form' => 'Illuminate\Html\FormFacade', - 'HTML' => 'Illuminate\Html\HtmlFacade', + 'Form' => 'Collective\Html\FormFacade', + 'Html' => 'Collective\Html\HtmlFacade', 'SSH' => 'Illuminate\Support\Facades\SSH', 'Alert' => 'Bootstrapper\Facades\Alert', 'Badge' => 'Bootstrapper\Facades\Badge', From 6bf806450c84134e65afc9b6ee951fc600aa0b56 Mon Sep 17 00:00:00 2001 From: Infacq Date: Fri, 22 May 2015 15:10:55 +0800 Subject: [PATCH 3/4] change to blade style for CSRF --- resources/views/master.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php index a6432352749f..117d60cc83a0 100644 --- a/resources/views/master.blade.php +++ b/resources/views/master.blade.php @@ -15,7 +15,7 @@ - + From 9f388c7a10b9ca59393b4e7f4f9a92771dee0727 Mon Sep 17 00:00:00 2001 From: Infacq Date: Fri, 22 May 2015 15:11:54 +0800 Subject: [PATCH 4/4] fix comma --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 17401a68df19..11d7862d5ff2 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "coatesap/omnipay-realex": "~2.0", "fruitcakestudio/omnipay-sisow": "~2.0", "alfaproject/omnipay-skrill": "dev-master", - "laravelcollective/html": "~5.0" + "laravelcollective/html": "~5.0", "omnipay/bitpay": "dev-master" }, "require-dev": {