From 0762e5cf530adfcd7c5f1f80186bff88f85a02de Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 2 Jan 2016 14:59:59 +1100
Subject: [PATCH] Remove dependency on illuminate\html

---
 composer.json                     | 3 +--
 modules/backend/widgets/Lists.php | 2 +-
 modules/system/aliases.php        | 5 ++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 472fdb9b3..b58203c1f 100644
--- a/composer.json
+++ b/composer.json
@@ -29,8 +29,7 @@
         "october/system": "~1.0",
         "october/backend": "~1.0",
         "october/cms": "~1.0",
-        "laravel/framework": "5.1.*",
-        "illuminate/html": "5.0.*"
+        "laravel/framework": "5.1.*"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 516f7353a..f7f571d38 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -1,7 +1,7 @@
 <?php namespace Backend\Widgets;
 
 use Db;
-use HTML as Html;
+use Html;
 use App;
 use Lang;
 use Input;
diff --git a/modules/system/aliases.php b/modules/system/aliases.php
index 8a89a8c46..e667169e2 100644
--- a/modules/system/aliases.php
+++ b/modules/system/aliases.php
@@ -34,9 +34,6 @@ return [
     'URL'       => 'Illuminate\Support\Facades\URL',
     'Validator' => 'Illuminate\Support\Facades\Validator',
     'View'      => 'Illuminate\Support\Facades\View',
-    'Form'      => 'Illuminate\Html\FormFacade',
-    'Html'      => 'Illuminate\Html\HtmlFacade', // Preferred
-    'HTML'      => 'Illuminate\Html\HtmlFacade',
 
     /*
      * October aliases
@@ -47,6 +44,8 @@ return [
     'Config'          => 'October\Rain\Support\Facades\Config',
     'Seeder'          => 'October\Rain\Database\Updates\Seeder',
     'Flash'           => 'October\Rain\Support\Facades\Flash',
+    'Form'            => 'October\Rain\Support\Facades\Form',
+    'Html'            => 'October\Rain\Support\Facades\Html',
     'Http'            => 'October\Rain\Support\Facades\Http',
     'Str'             => 'October\Rain\Support\Facades\Str',
     'Markdown'        => 'October\Rain\Support\Facades\Markdown',