From d1a761711a5d913d64c18edf6ed83bd294f1ec73 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Wed, 13 Dec 2017 22:42:45 -0600
Subject: [PATCH] Cleanup Installer module scaffolding

---
 .idea/inspectionProfiles/Project_Default.xml  |  2 +-
 composer.json                                 |  5 +++
 modules/Installer/Http/Routes/install.php     |  3 ++
 modules/Installer/Http/Routes/update.php      |  3 ++
 modules/Installer/Http/routes.php             |  7 ----
 .../Providers/EventServiceProvider.php        | 23 -------------
 .../Providers/InstallerServiceProvider.php    | 32 +++++++------------
 modules/Installer/composer.json               | 13 +++++---
 modules/Installer/module.json                 |  3 +-
 9 files changed, 32 insertions(+), 59 deletions(-)
 create mode 100644 modules/Installer/Http/Routes/install.php
 create mode 100644 modules/Installer/Http/Routes/update.php
 delete mode 100644 modules/Installer/Http/routes.php
 delete mode 100644 modules/Installer/Providers/EventServiceProvider.php

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index d7fd1ca3..dc2d6941 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -30,7 +30,7 @@
     <inspection_tool class="PhpExpressionResultUnusedInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpIncludeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpSignatureMismatchDuringInheritanceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SecurityAdvisoriesInspection" enabled="true" level="WARNING" enabled_by_default="true">
+    <inspection_tool class="SecurityAdvisoriesInspection" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="optionConfiguration">
         <list>
           <option value="behat/behat" />
diff --git a/composer.json b/composer.json
index e777a9bf..48fb7e1d 100755
--- a/composer.json
+++ b/composer.json
@@ -76,6 +76,11 @@
         "classmap": [
             "tests/TestCase.php"
         ]
+    },
+     "extra": {
+         "installer-paths": {
+             "modules/{$name}/": ["type:laravel-library"]
+         }
     },
     "scripts": {
         "post-root-package-install": [
diff --git a/modules/Installer/Http/Routes/install.php b/modules/Installer/Http/Routes/install.php
new file mode 100644
index 00000000..5cc3acb5
--- /dev/null
+++ b/modules/Installer/Http/Routes/install.php
@@ -0,0 +1,3 @@
+<?php
+
+Route::get('/', 'InstallerController@index');
diff --git a/modules/Installer/Http/Routes/update.php b/modules/Installer/Http/Routes/update.php
new file mode 100644
index 00000000..5556acaf
--- /dev/null
+++ b/modules/Installer/Http/Routes/update.php
@@ -0,0 +1,3 @@
+<?php
+
+Route::get('/update', 'InstallerController@index');
diff --git a/modules/Installer/Http/routes.php b/modules/Installer/Http/routes.php
deleted file mode 100644
index 472dc343..00000000
--- a/modules/Installer/Http/routes.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-Route::group(['middleware' => []], function() {
-
-    Route::get('/', 'InstallerController@index');
-
-});
diff --git a/modules/Installer/Providers/EventServiceProvider.php b/modules/Installer/Providers/EventServiceProvider.php
deleted file mode 100644
index 889b8ddd..00000000
--- a/modules/Installer/Providers/EventServiceProvider.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Modules\Installer\Providers;
-
-use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-
-class EventServiceProvider extends ServiceProvider
-{
-    /**
-     * The event listener mappings for the application.
-     */
-    protected $listen = [
-
-    ];
-
-    /**
-     * Register any events for your application.
-     */
-    public function boot()
-    {
-        parent::boot();
-    }
-}
diff --git a/modules/Installer/Providers/InstallerServiceProvider.php b/modules/Installer/Providers/InstallerServiceProvider.php
index a2b13e0a..2193c0ba 100644
--- a/modules/Installer/Providers/InstallerServiceProvider.php
+++ b/modules/Installer/Providers/InstallerServiceProvider.php
@@ -24,28 +24,10 @@ class InstallerServiceProvider extends ServiceProvider
         $this->registerConfig();
         $this->registerViews();
 
-        $this->registerLinks();
-
         $this->registerFactories();
         $this->loadMigrationsFrom(__DIR__ . '/../Database/migrations');
     }
 
-    /**
-     * Register the service provider.
-     */
-    public function register()
-    {
-        //
-    }
-
-    /**
-     * Add module links here
-     */
-    public function registerLinks()
-    {
-
-    }
-
     /**
      * Register the routes
      */
@@ -53,12 +35,20 @@ class InstallerServiceProvider extends ServiceProvider
     {
         Route::group([
             'as' => 'installer.',
-            'prefix' => 'installer',
-            // If you want a RESTful module, change this to 'api'
+            'prefix' => 'install',
             'middleware' => ['web'],
             'namespace' => 'Modules\Installer\Http\Controllers'
         ], function() {
-            $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php');
+            $this->loadRoutesFrom(__DIR__ . '/../Http/Routes/install.php');
+        });
+
+        Route::group([
+             'as' => 'installer.',
+             'prefix' => 'install',
+             'middleware' => ['web'],
+             'namespace' => 'Modules\Installer\Http\Controllers'
+         ], function () {
+            $this->loadRoutesFrom(__DIR__ . '/../Http/Routes/update.php');
         });
     }
 
diff --git a/modules/Installer/composer.json b/modules/Installer/composer.json
index f66a32a5..77e32abe 100644
--- a/modules/Installer/composer.json
+++ b/modules/Installer/composer.json
@@ -1,17 +1,20 @@
 {
-    "name": "/installer",
-    "description": "",
+    "name": "phpvms/installer",
+    "type": "laravel-library",
+    "description": "The installer module for phpVMS",
     "authors": [
         {
-            "name": "",
+            "name": "Nabeel Shahzad",
             "email": ""
         }
     ],
+    "require": {
+        "composer/installers": "~1.0"
+    },
     "extra": {
         "laravel": {
             "providers": [
-                "Modules\\Installer\\Providers\\InstallerServiceProvider",
-                "Modules\\Installer\\Providers\\EventServiceProvider"
+                "Modules\\Installer\\Providers\\InstallerServiceProvider"
             ],
             "aliases": {
 
diff --git a/modules/Installer/module.json b/modules/Installer/module.json
index 3391d457..f43d81a7 100644
--- a/modules/Installer/module.json
+++ b/modules/Installer/module.json
@@ -6,8 +6,7 @@
     "active": 1,
     "order": 0,
     "providers": [
-        "Modules\\Installer\\Providers\\InstallerServiceProvider",
-        "Modules\\Installer\\Providers\\EventServiceProvider"
+        "Modules\\Installer\\Providers\\InstallerServiceProvider"
     ],
     "aliases": {},
     "files": [],