From 6e0ecf4d963d8f0e696b8a8f97392f6fbaf7b2ea Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Sat, 17 Dec 2016 22:56:00 +0800
Subject: [PATCH] remove unnecessary directories

---
 app/Http/Middleware/VerifyCsrfToken.php  | 17 -----------------
 app/Http/Requests/Request.php            | 10 ----------
 app/Providers/BootServiceProvider.php    | 11 +++++++----
 app/Services/{Database => }/Database.php |  2 +-
 4 files changed, 8 insertions(+), 32 deletions(-)
 delete mode 100644 app/Http/Middleware/VerifyCsrfToken.php
 delete mode 100644 app/Http/Requests/Request.php
 rename app/Services/{Database => }/Database.php (99%)

diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
deleted file mode 100644
index a2c35414..00000000
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
-
-class VerifyCsrfToken extends BaseVerifier
-{
-    /**
-     * The URIs that should be excluded from CSRF verification.
-     *
-     * @var array
-     */
-    protected $except = [
-        //
-    ];
-}
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
deleted file mode 100644
index 76b2ffd4..00000000
--- a/app/Http/Requests/Request.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-abstract class Request extends FormRequest
-{
-    //
-}
diff --git a/app/Providers/BootServiceProvider.php b/app/Providers/BootServiceProvider.php
index fcee4609..4b3b6d73 100644
--- a/app/Providers/BootServiceProvider.php
+++ b/app/Providers/BootServiceProvider.php
@@ -5,9 +5,11 @@ namespace App\Providers;
 use View;
 use Utils;
 use Schema;
+use App\Services\Database;
 use Illuminate\Http\Request;
 use Illuminate\Support\ServiceProvider;
 use App\Exceptions\PrettyPageException;
+use App\Services\Repositories\OptionRepository;
 
 class BootServiceProvider extends ServiceProvider
 {
@@ -21,8 +23,9 @@ class BootServiceProvider extends ServiceProvider
         View::addExtension('tpl', 'blade');
 
         $this->checkFileExists();
-        $this->checkDbConfig();
+        $this->checkDbConnection();
 
+        // skip the installation check when setup or under CLI
         if (!$request->is('setup') && !$request->is('setup/*') && PHP_SAPI != "cli") {
             $this->checkInstallation();
         }
@@ -35,7 +38,7 @@ class BootServiceProvider extends ServiceProvider
         }
     }
 
-    protected function checkDbConfig()
+    protected function checkDbConnection()
     {
         $config = config('database.connections.mysql');
 
@@ -94,7 +97,7 @@ class BootServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->singleton('database', \App\Services\Database\Database::class);
-        $this->app->singleton('options', \App\Services\Repositories\OptionRepository::class);
+        $this->app->singleton('options',  OptionRepository::class);
+        $this->app->singleton('database', Database::class);
     }
 }
diff --git a/app/Services/Database/Database.php b/app/Services/Database.php
similarity index 99%
rename from app/Services/Database/Database.php
rename to app/Services/Database.php
index e84b0298..b35b0b34 100644
--- a/app/Services/Database/Database.php
+++ b/app/Services/Database.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Database;
+namespace App\Services;
 
 /**
  * Light-weight database helper