Some fixes to the installer

.env.bak

@@ -0,0 +1,14 @@
+APP_ENV=dev
+APP_KEY=base64:ve66Z5Kt/zTN3p++0zOPu854PHfZkwJE5VuoFAlzHtI=
+APP_DEBUG=true
+APP_LOCALE=en
+APP_URL=http://localhost
+
+APP_LOG=daily
+APP_LOG_LEVEL=debug
+APP_LOG_MAX_FILES=7
+
+DB_CONNECTION=sqlite
+
+CACHE_DRIVER=array
+CACHE_PREFIX=

.gitignore

@@ -18,6 +18,7 @@ storage/*.sqlite
 .env.php
 .env
 .env.php
+.env.*
 .env.generated
 .vagrant
 #Homestead.yaml

Makefile

@@ -70,6 +70,13 @@ schema:
 deploy-package:
 	./.travis/deploy_script.sh
 
+.PHONY: reset-installer
+reset-installer:
+	@cp .env.dev.example .env
+	@make clean
+	mysql -uroot -e "DROP DATABASE IF EXISTS phpvms"
+	mysql -uroot -e "CREATE DATABASE phpvms"
+
 .PHONY: docker
 docker:
 	@mkdir -p $(CURR_PATH)/tmp/mysql

Procfile

@@ -1,3 +1,4 @@
 dnsmasq: /usr/local/sbin/dnsmasq --keep-in-foreground
 php-fpm: /usr/local/sbin/php-fpm --nodaemonize
 nginx: /usr/local/bin/nginx
+mysql: /usr/local/bin/mysqld

modules/Installer/Config/config.php

@@ -8,7 +8,8 @@ return [
     ],
 
     # TODO: Remove eventually
-    'env_postfix' => '.generated',
+//    'env_postfix' => '.generated',
+    'env_postfix' => '',
 
     'extensions' => [
         'openssl',

modules/Installer/Http/Routes/install.php

@@ -2,6 +2,7 @@
 
 Route::get('/', 'InstallerController@index')->name('index');
 Route::get('/step1', 'InstallerController@step1')->name('step1');
+Route::post('/step1', 'InstallerController@step1')->name('step1');
 Route::get('/step2', 'InstallerController@step2')->name('step2');
 Route::get('/step3', 'InstallerController@step3')->name('step3');
 

modules/Installer/Resources/views/stubs/env.blade.php

@@ -3,11 +3,11 @@
 # and APP_DEBUG to false
 #
 
-APP_ENV=dev
+APP_ENV={!! $APP_ENV !!}
-APP_URL=http://localhost
+APP_URL="http://localhost"
 APP_SKIN=default
-VACENTRAL_API_KEY=
+VACENTRAL_API_KEY=""
-APP_KEY=base64:{!! $APP_KEY !!}
+APP_KEY="base64:{!! $APP_KEY !!}"
 APP_DEBUG=true
 APP_LOCALE=en
 
@@ -15,28 +15,28 @@ APP_LOG=daily
 APP_LOG_LEVEL=debug
 APP_LOG_MAX_FILES=3
 
-DB_CONNECTION={!! $DB_CONN !!}
+DB_CONNECTION="{!! $DB_CONN !!}"
-DB_HOST={!! $DB_HOST !!}
+DB_HOST="{!! $DB_HOST !!}"
-DB_PORT={!! $DB_PORT !!}
+DB_PORT="{!! $DB_PORT !!}"
-DB_DATABASE={!! $DB_NAME !!}
+DB_DATABASE="{!! $DB_NAME !!}"
-DB_USERNAME={!! $DB_USER !!}
+DB_USERNAME="{!! $DB_USER !!}"
-DB_PASSWORD={!! $DB_PASS !!}
+DB_PASSWORD="{!! $DB_PASS !!}"
-DB_PREFIX=
+DB_PREFIX=""
 
 MAIL_DRIVER=smtp
-MAIL_FROM_ADDRESS=no-reply@phpvms.net
+MAIL_FROM_ADDRESS="no-reply@phpvms.net"
-MAIL_FROM_NAME=phpVMS Admin
+MAIL_FROM_NAME="phpVMS Admin"
-MAIL_HOST=smtp.mailgun.org
+MAIL_HOST="smtp.mailgun.org"
 MAIL_PORT=587
-MAIL_ENCRYPTION=tls
+MAIL_ENCRYPTION="tls"
-MAIL_USERNAME=
+MAIL_USERNAME=""
-MAIL_PASSWORD=
+MAIL_PASSWORD=""
 
-CACHE_DRIVER={!! $CACHE_DRIVER !!}
+CACHE_DRIVER="{!! $CACHE_DRIVER !!}"
-CACHE_PREFIX=phpvms
+CACHE_PREFIX="phpvms"
 
-REDIS_HOST=localhost
+REDIS_HOST="localhost"
-REDIS_PASSWORD=
+REDIS_PASSWORD=""
 REDIS_PORT=6379
 REDIS_DATABASE=1
 

modules/Installer/Services/DatabaseService.php

@@ -17,7 +17,7 @@ class DatabaseService {
         Log::info('Testing Connection: '.$type.'::'.$user.':'.$pass.'@'.$host.':'.$port.';'.$name);
 
         if($type === 'mysql') {
-            $dsn = "mysql:host=$host;port=$port;dbname=$name";
+            $dsn = "mysql:host=$host;port=$port;";
             Log::info('Connection string: '. $dsn);
             try {
                 $conn = new PDO($dsn, $user, $pass);

modules/Installer/Services/EnvironmentService.php

@@ -14,6 +14,7 @@ class EnvironmentService
     public function createEnvFile($type, $host, $port, $name, $user, $pass)
     {
         $opts = [
+            'APP_ENV' => 'dev',
             'APP_KEY' => $this->createAppKey(),
             'DB_CONN' => $type,
             'DB_HOST' => $host,
@@ -50,7 +51,7 @@ class EnvironmentService
         if(\extension_loaded('apc')) {
             $opts['CACHE_DRIVER'] = 'apc';
         } else {
-            $opts['CACHE_DRIVER'] = 'filesystem';
+            $opts['CACHE_DRIVER'] = 'file';
         }
 
         return $opts;
@@ -81,8 +82,7 @@ class EnvironmentService
      */
     protected function writeEnvFile($opts)
     {
-        $app = app();
+        $env_file = \App::environmentFilePath();
-        $env_file = $app->environmentFilePath();
         $env_file .= config('installer.env_postfix');
 
         # render it within Blade and log the contents

phpvms.iml

@@ -304,21 +304,6 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="PHARS">
-        <CLASSES>
-          <root url="phar://$MODULE_DIR$/vendor/phar-io/manifest/tests/_fixture/test.phar/" />
-          <root url="phar://$MODULE_DIR$/composer.phar/" />
-          <root url="phar://$MODULE_DIR$/vendor/phpunit/phpunit/tests/_files/phpunit-example-extension/tools/phpunit.d/phpunit-example-extension-1.0.1.phar/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="phar://$MODULE_DIR$/vendor/phar-io/manifest/tests/_fixture/test.phar/" />
-          <root url="phar://$MODULE_DIR$/composer.phar/" />
-          <root url="phar://$MODULE_DIR$/vendor/phpunit/phpunit/tests/_files/phpunit-example-extension/tools/phpunit.d/phpunit-example-extension-1.0.1.phar/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
   </component>
   <component name="TemplatesService">
     <option name="TEMPLATE_FOLDERS">