From d773c729707e1619a249b15d48ec9f21d62e188d Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 25 Mar 2015 21:56:31 +0200
Subject: [PATCH] Working on setup page

---
 .env.example                              |  17 +-
 app/Http/Controllers/AppController.php    |  94 ++-----
 app/Models/Currency.php                   |   2 +
 app/Models/DateFormat.php                 |   2 +
 app/Models/DatetimeFormat.php             |   2 +
 app/Models/Frequency.php                  |   2 +
 app/Models/Gateway.php                    |   2 +
 app/Models/Industry.php                   |   2 +
 app/Models/InvoiceStatus.php              |   2 +
 app/Models/PaymentLibrary.php             |   2 +
 app/Models/PaymentTerm.php                |   2 +
 app/Models/PaymentType.php                |   2 +
 app/Models/Size.php                       |   2 +
 app/Models/Theme.php                      |   2 +
 app/Models/Timezone.php                   |   2 +
 composer.lock                             | 308 ++++++++++++----------
 config/database.php                       |   2 +-
 config/mail.php                           |   4 +-
 database/seeds/ConstantsSeeder.php        |  15 ++
 database/seeds/PaymentLibrariesSeeder.php |   2 +
 resources/views/setup.blade.php           |   5 +
 storage/.gitignore                        |   0
 storage/app/.gitignore                    |   0
 storage/debugbar/.gitignore               |   0
 storage/framework/.gitignore              |   0
 storage/framework/cache/.gitignore        |   0
 storage/framework/sessions/.gitignore     |   0
 storage/framework/views/.gitignore        |   0
 storage/logs/.gitignore                   |   0
 29 files changed, 265 insertions(+), 208 deletions(-)
 mode change 100644 => 100755 storage/.gitignore
 mode change 100644 => 100755 storage/app/.gitignore
 mode change 100644 => 100755 storage/debugbar/.gitignore
 mode change 100644 => 100755 storage/framework/.gitignore
 mode change 100644 => 100755 storage/framework/cache/.gitignore
 mode change 100644 => 100755 storage/framework/sessions/.gitignore
 mode change 100644 => 100755 storage/framework/views/.gitignore
 mode change 100644 => 100755 storage/logs/.gitignore

diff --git a/.env.example b/.env.example
index 2fd3302bc5..09cb7524e5 100644
--- a/.env.example
+++ b/.env.example
@@ -1,2 +1,17 @@
 APP_ENV=development
-APP_DEBUG=true
\ No newline at end of file
+APP_DEBUG=true
+APP_KEY=
+
+DB_TYPE=mysql
+DB_HOST=localhost
+DB_DATABASE=ninja
+DB_USERNAME=
+DB_PASSWORD=
+
+MAIL_DRIVER=smtp
+MAIL_PORT=587
+MAIL_ENCRYPTION=tls
+MAIL_HOST=
+MAIL_USERNAME=
+MAIL_FROM_NAME=
+MAIL_PASSWORD=
\ No newline at end of file
diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php
index 11fabece50..1a55b92c0e 100644
--- a/app/Http/Controllers/AppController.php
+++ b/app/Http/Controllers/AppController.php
@@ -45,13 +45,10 @@ class AppController extends BaseController
 
         $app = Input::get('app');
         $app['key'] = str_random(RANDOM_KEY_LENGTH);
-        $app['debug'] = 'false';
 
         $database = Input::get('database');
-        $dbType = $database['driver'];
-        
-        $test_database = $database;
-        $test_database['connections'] = [$dbType => $test_database];        
+        $dbType = $database['default'];
+        $database['connections'] = [$dbType => $database['type']];
 
         $mail = Input::get('mail');
         $email = $mail['username'];
@@ -61,77 +58,39 @@ class AppController extends BaseController
             return self::testMail($mail);
         }
 
-        $valid = self::testDatabase($test_database);
+        $valid = self::testDatabase($database);
 
         if ($test == 'db') {
             return $valid === true ? 'Success' : $valid;
         } elseif (!$valid) {
             return Redirect::to('/setup')->withInput();
         }
-
-        /*$content = "<?php return 'production';";
-        $fp = fopen(base_path()."/bootstrap/environment.php", 'w');
-        fwrite($fp, $content);
-        fclose($fp);*/
-
-        /*$configDir = base_path().'/config/production';
-        if (!file_exists($configDir)) {
-            mkdir($configDir);
-        }*/
-
-        // TODO: GET THIS WORKING PROPERLY!!!!
         
         // == ENV Settings (Production) == //
+        $config = "APP_ENV=development\n".
+                    "APP_DEBUG=true\n".
+                    "APP_KEY={$app['key']}\n\n".
+                    "DB_TYPE={$dbType}\n".
+                    "DB_HOST={$database['type']['host']}\n".
+                    "DB_DATABASE={$database['type']['database']}\n".
+                    "DB_USERNAME={$database['type']['username']}\n".
+                    "DB_PASSWORD={$database['type']['password']}\n\n".
+                    "MAIL_DRIVER={$mail['driver']}\n".
+                    "MAIL_PORT={$mail['port']}\n".
+                    "MAIL_ENCRYPTION={$mail['encryption']}\n".
+                    "MAIL_HOST={$mail['host']}\n".
+                    "MAIL_USERNAME={$mail['username']}\n".
+                    "MAIL_FROM_NAME={$mail['from']['name']}\n".
+                    "MAIL_PASSWORD={$mail['password']}\n";
 
-        $env_config = '';
-        $settings = ['app' => $app, 'database' => $database, 'mail' => $mail];
-
-        // Save each config area to $env varible
-        foreach ($settings as $key => $config) {
-
-            // Write a nice Comment to lay out each config area
-            $env_config .= "# " . $key . " Settings \n";
-
-
-            // For Each config varible : Write to env
-            foreach ($config as $name => $value) {
-                if(is_array($value)){
-                    continue; // BREAKS ON THE MAIL ARRAY
-                    dd($value);
-                }
-                $env_config .= strtoupper($name) . '=' . $value . "\n";
-            }
-        }
-
-        // Check Config Settings !empty
-        if(empty($env_config)){
-            dd('ERROR: No Config settings saved to content var');
-        }
-        
         // Write Config Settings
-        // $fp = fopen(base_path()."/.env", 'w');
-        // fwrite($fp, $env_config);
-        // fclose($fp);
-
-        // == END ENV Settings == //
-
+        $fp = fopen(base_path()."/.env", 'w');
+        fwrite($fp, $config);
+        fclose($fp);
 
         // == DB Migrate & Seed == //
-
-        /* Laravel 5 thows an error when performing these calls
-         * See: https://laracasts.com/discuss/channels/general-discussion/l5-artisancall-issue
-        
-        Artisan::call('migrate');
-        Artisan::call('db:seed');
-
-         */
-        
-        // I Really don't want to do it this way but its the best I've found so far.
-        $process = new \Symfony\Component\Process\Process('cd ' . base_path() . ' && php artisan migrate --seed');
-        $process->run();
-
-        // == END DB Migrate & Seed == //
-
+        Artisan::call('migrate', array('--force' => true));
+        Artisan::call('db:seed', array('--force' => true));
 
         $account = $this->accountRepo->create();
         $user = $account->users()->first();
@@ -146,18 +105,17 @@ class AppController extends BaseController
         $user->save();
 
         //Auth::login($user, true);
-        $this->accountRepo->registerUser($user);
+        //$this->accountRepo->registerUser($user);
 
         return Redirect::to('/invoices/create');
     }
 
     private function testDatabase($database)
     {
-        // dd($database);
-        $dbType = $database['driver'];
+        $dbType = $database['default'];
 
         Config::set('database.default', $dbType);
-
+        
         foreach ($database['connections'][$dbType] as $key => $val) {
             Config::set("database.connections.{$dbType}.{$key}", $val);
         }
diff --git a/app/Models/Currency.php b/app/Models/Currency.php
index b75184a59e..8308c7c4f9 100644
--- a/app/Models/Currency.php
+++ b/app/Models/Currency.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class Currency extends Eloquent
 {
     public $timestamps = false;
diff --git a/app/Models/DateFormat.php b/app/Models/DateFormat.php
index 2bcc2a7abf..77e1f692d8 100644
--- a/app/Models/DateFormat.php
+++ b/app/Models/DateFormat.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class DateFormat extends Eloquent
 {
     public $timestamps = false;
diff --git a/app/Models/DatetimeFormat.php b/app/Models/DatetimeFormat.php
index 9e8d4e37df..80974f9d0a 100644
--- a/app/Models/DatetimeFormat.php
+++ b/app/Models/DatetimeFormat.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class DatetimeFormat extends Eloquent
 {
     public $timestamps = false;
diff --git a/app/Models/Frequency.php b/app/Models/Frequency.php
index 58024d31b5..f232894d8d 100644
--- a/app/Models/Frequency.php
+++ b/app/Models/Frequency.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class Frequency extends Eloquent
 {
     public $timestamps = false;
diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php
index 4578f6020c..b20e65fff4 100644
--- a/app/Models/Gateway.php
+++ b/app/Models/Gateway.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class Gateway extends Eloquent
 {
     public $timestamps = true;
diff --git a/app/Models/Industry.php b/app/Models/Industry.php
index ab2dc27686..1ad7c12a31 100644
--- a/app/Models/Industry.php
+++ b/app/Models/Industry.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class Industry extends Eloquent
 {
     public $timestamps = false;
diff --git a/app/Models/InvoiceStatus.php b/app/Models/InvoiceStatus.php
index 14e8609e9c..1a18b92605 100644
--- a/app/Models/InvoiceStatus.php
+++ b/app/Models/InvoiceStatus.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class InvoiceStatus extends Eloquent
 {
     public $timestamps = false;
diff --git a/app/Models/PaymentLibrary.php b/app/Models/PaymentLibrary.php
index 941d0cf3e0..be6e601afe 100644
--- a/app/Models/PaymentLibrary.php
+++ b/app/Models/PaymentLibrary.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class PaymentLibrary extends Eloquent
 {
     protected $table = 'payment_libraries';
diff --git a/app/Models/PaymentTerm.php b/app/Models/PaymentTerm.php
index 8a9a9777ab..4cbe50bfa3 100644
--- a/app/Models/PaymentTerm.php
+++ b/app/Models/PaymentTerm.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class PaymentTerm extends Eloquent
 {
     public $timestamps = false;
diff --git a/app/Models/PaymentType.php b/app/Models/PaymentType.php
index d8209f2df0..4572a41a4b 100644
--- a/app/Models/PaymentType.php
+++ b/app/Models/PaymentType.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class PaymentType extends Eloquent
 {
     public $timestamps = false;
diff --git a/app/Models/Size.php b/app/Models/Size.php
index da88ee9804..ae49e15540 100644
--- a/app/Models/Size.php
+++ b/app/Models/Size.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class Size extends Eloquent
 {
     public $timestamps = false;
diff --git a/app/Models/Theme.php b/app/Models/Theme.php
index ed55b82f3c..4216847425 100644
--- a/app/Models/Theme.php
+++ b/app/Models/Theme.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class Theme extends Eloquent
 {
     public $timestamps = false;
diff --git a/app/Models/Timezone.php b/app/Models/Timezone.php
index fc4412c915..4b90b7d3fa 100644
--- a/app/Models/Timezone.php
+++ b/app/Models/Timezone.php
@@ -1,5 +1,7 @@
 <?php namespace App\Models;
 
+use Eloquent;
+
 class Timezone extends Eloquent
 {
     public $timestamps = false;
diff --git a/composer.lock b/composer.lock
index 08952bebc9..0120225329 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "1411d18a1a61e0241540bd59173b3c1b",
+    "hash": "016ceb374b7f3029826cdcf32ce6b1bf",
     "packages": [
         {
             "name": "alfaproject/omnipay-neteller",
@@ -214,16 +214,16 @@
         },
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v2.0.2",
+            "version": "v2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "7bdf8acf3b955f4fcf922e74abdfdec370369196"
+                "reference": "77be5170f3777e2e899ec98105ce5686cd4aa63b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/7bdf8acf3b955f4fcf922e74abdfdec370369196",
-                "reference": "7bdf8acf3b955f4fcf922e74abdfdec370369196",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/77be5170f3777e2e899ec98105ce5686cd4aa63b",
+                "reference": "77be5170f3777e2e899ec98105ce5686cd4aa63b",
                 "shasum": ""
             },
             "require": {
@@ -264,20 +264,20 @@
                 "profiler",
                 "webprofiler"
             ],
-            "time": "2015-02-19 10:26:39"
+            "time": "2015-03-07 15:15:23"
         },
         {
             "name": "barryvdh/laravel-ide-helper",
-            "version": "v2.0.1",
+            "version": "v2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "81b7febfc64168ea1af57261aa4dfc9acefd5429"
+                "reference": "d8d5517f2cc55d534a7fc8f50ff62cb55115e1aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/81b7febfc64168ea1af57261aa4dfc9acefd5429",
-                "reference": "81b7febfc64168ea1af57261aa4dfc9acefd5429",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/d8d5517f2cc55d534a7fc8f50ff62cb55115e1aa",
+                "reference": "d8d5517f2cc55d534a7fc8f50ff62cb55115e1aa",
                 "shasum": ""
             },
             "require": {
@@ -327,7 +327,7 @@
                 "phpstorm",
                 "sublime"
             ],
-            "time": "2015-02-23 15:55:54"
+            "time": "2015-03-17 08:00:28"
         },
         {
             "name": "calvinfroedge/PHP-Payments",
@@ -1491,18 +1491,29 @@
             ],
             "time": "2015-01-01 16:31:18"
         },
+        {
+            "name": "impleri/confide",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/impleri/confide",
+                "reference": "origin/master"
+            },
+            "type": "library",
+            "time": "2015-03-18 03:04:38"
+        },
         {
             "name": "intervention/image",
             "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "e58192bb1efd7dc26c2bac9ab8ab49b0cbb4552a"
+                "reference": "8f3761154b4c1f5128365dfc32cbf757f27d97b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/e58192bb1efd7dc26c2bac9ab8ab49b0cbb4552a",
-                "reference": "e58192bb1efd7dc26c2bac9ab8ab49b0cbb4552a",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/8f3761154b4c1f5128365dfc32cbf757f27d97b6",
+                "reference": "8f3761154b4c1f5128365dfc32cbf757f27d97b6",
                 "shasum": ""
             },
             "require": {
@@ -1545,7 +1556,7 @@
                 "thumbnail",
                 "watermark"
             ],
-            "time": "2015-03-11 22:03:31"
+            "time": "2015-03-18 17:41:04"
         },
         {
             "name": "ircmaxell/password-compat",
@@ -1775,16 +1786,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.0.15",
+            "version": "v5.0.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "ec3a166c504acedffd8ed878b08481f9cb1497fb"
+                "reference": "419d3f485ce7946cace4325ef19a30e1d5543951"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/ec3a166c504acedffd8ed878b08481f9cb1497fb",
-                "reference": "ec3a166c504acedffd8ed878b08481f9cb1497fb",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/419d3f485ce7946cace4325ef19a30e1d5543951",
+                "reference": "419d3f485ce7946cace4325ef19a30e1d5543951",
                 "shasum": ""
             },
             "require": {
@@ -1897,7 +1908,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2015-03-12 14:09:40"
+            "time": "2015-03-24 13:36:37"
         },
         {
             "name": "league/flysystem",
@@ -1988,12 +1999,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/lokielse/omnipay-alipay.git",
-                "reference": "d7ed96d785b980ddf159709431fe3c25e4503612"
+                "reference": "6000ac36e23f529a780bacf52aaf04f1352791c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lokielse/omnipay-alipay/zipball/d7ed96d785b980ddf159709431fe3c25e4503612",
-                "reference": "d7ed96d785b980ddf159709431fe3c25e4503612",
+                "url": "https://api.github.com/repos/lokielse/omnipay-alipay/zipball/6000ac36e23f529a780bacf52aaf04f1352791c5",
+                "reference": "6000ac36e23f529a780bacf52aaf04f1352791c5",
                 "shasum": ""
             },
             "require": {
@@ -2029,7 +2040,7 @@
                 "payment",
                 "purchase"
             ],
-            "time": "2015-02-03 05:58:34"
+            "time": "2015-03-19 05:33:28"
         },
         {
             "name": "maximebf/debugbar",
@@ -2307,16 +2318,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v1.1.0",
+            "version": "v1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "ac05ef6f95bf8361549604b6031c115f92f39528"
+                "reference": "dba7524b3724f25b947cd26a580787c55c8a6f9b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ac05ef6f95bf8361549604b6031c115f92f39528",
-                "reference": "ac05ef6f95bf8361549604b6031c115f92f39528",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dba7524b3724f25b947cd26a580787c55c8a6f9b",
+                "reference": "dba7524b3724f25b947cd26a580787c55c8a6f9b",
                 "shasum": ""
             },
             "require": {
@@ -2326,7 +2337,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -2348,7 +2359,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2015-01-18 11:29:59"
+            "time": "2015-03-24 19:10:28"
         },
         {
             "name": "omnipay/2checkout",
@@ -2411,16 +2422,16 @@
         },
         {
             "name": "omnipay/authorizenet",
-            "version": "v2.1.2",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/omnipay-authorizenet.git",
-                "reference": "233b9c6378e3c65833e972e67b8e699208c04803"
+                "reference": "7b5166975757bdf951ce39bf9e116b069d9acc5f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/omnipay-authorizenet/zipball/233b9c6378e3c65833e972e67b8e699208c04803",
-                "reference": "233b9c6378e3c65833e972e67b8e699208c04803",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-authorizenet/zipball/7b5166975757bdf951ce39bf9e116b069d9acc5f",
+                "reference": "7b5166975757bdf951ce39bf9e116b069d9acc5f",
                 "shasum": ""
             },
             "require": {
@@ -2466,7 +2477,7 @@
                 "pay",
                 "payment"
             ],
-            "time": "2014-10-24 17:32:06"
+            "time": "2015-01-19 19:06:04"
         },
         {
             "name": "omnipay/buckaroo",
@@ -3852,16 +3863,16 @@
         },
         {
             "name": "omnipay/stripe",
-            "version": "v2.1.2",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/omnipay-stripe.git",
-                "reference": "23a5f77ed5345356c458355419395cbbf0106049"
+                "reference": "b3ed1028bb72837905012311fa74259d9ed8ba3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/23a5f77ed5345356c458355419395cbbf0106049",
-                "reference": "23a5f77ed5345356c458355419395cbbf0106049",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/b3ed1028bb72837905012311fa74259d9ed8ba3c",
+                "reference": "b3ed1028bb72837905012311fa74259d9ed8ba3c",
                 "shasum": ""
             },
             "require": {
@@ -3905,7 +3916,7 @@
                 "payment",
                 "stripe"
             ],
-            "time": "2015-01-27 17:58:03"
+            "time": "2015-03-16 19:24:07"
         },
         {
             "name": "omnipay/targetpay",
@@ -4169,16 +4180,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.4.1",
+            "version": "v0.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "3787f3436f4fd898e0ac1eb6f5abd2ab6b24085b"
+                "reference": "b5dd7660c0ef38e96cd8cd8fa924b6be0e53906a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/3787f3436f4fd898e0ac1eb6f5abd2ab6b24085b",
-                "reference": "3787f3436f4fd898e0ac1eb6f5abd2ab6b24085b",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/b5dd7660c0ef38e96cd8cd8fa924b6be0e53906a",
+                "reference": "b5dd7660c0ef38e96cd8cd8fa924b6be0e53906a",
                 "shasum": ""
             },
             "require": {
@@ -4189,10 +4200,10 @@
                 "symfony/console": "~2.3.10|~2.4.2|~2.5"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "~1.3",
+                "fabpot/php-cs-fixer": "~1.5",
                 "phpunit/phpunit": "~3.7|~4.0",
                 "squizlabs/php_codesniffer": "~2.0",
-                "symfony/finder": "~2.1"
+                "symfony/finder": "~2.1|~3.0"
             },
             "suggest": {
                 "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
@@ -4206,7 +4217,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-develop": "0.3.x-dev"
+                    "dev-develop": "0.4.x-dev"
                 }
             },
             "autoload": {
@@ -4236,20 +4247,20 @@
                 "interactive",
                 "shell"
             ],
-            "time": "2015-02-25 20:35:54"
+            "time": "2015-03-17 15:17:33"
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v5.3.1",
+            "version": "v5.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "c5f963e7f9d6f6438fda4f22d5cc2db296ec621a"
+                "reference": "31454f258f10329ae7c48763eb898a75c39e0a9f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/c5f963e7f9d6f6438fda4f22d5cc2db296ec621a",
-                "reference": "c5f963e7f9d6f6438fda4f22d5cc2db296ec621a",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/31454f258f10329ae7c48763eb898a75c39e0a9f",
+                "reference": "31454f258f10329ae7c48763eb898a75c39e0a9f",
                 "shasum": ""
             },
             "require": {
@@ -4261,7 +4272,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.3-dev"
+                    "dev-master": "5.4-dev"
                 }
             },
             "autoload": {
@@ -4288,28 +4299,29 @@
                 "mail",
                 "mailer"
             ],
-            "time": "2014-12-05 14:17:14"
+            "time": "2015-03-14 06:06:39"
         },
         {
             "name": "symfony/class-loader",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "target-dir": "Symfony/Component/ClassLoader",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/ClassLoader.git",
-                "reference": "deac802f76910708ab50d039806cfd1866895b52"
+                "reference": "56bf6fe551ca013471541d866f73a6cc70ece9c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/deac802f76910708ab50d039806cfd1866895b52",
-                "reference": "deac802f76910708ab50d039806cfd1866895b52",
+                "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/56bf6fe551ca013471541d866f73a6cc70ece9c5",
+                "reference": "56bf6fe551ca013471541d866f73a6cc70ece9c5",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "symfony/finder": "~2.0,>=2.0.5"
+                "symfony/finder": "~2.0,>=2.0.5",
+                "symfony/phpunit-bridge": "~2.7"
             },
             "type": "library",
             "extra": {
@@ -4338,21 +4350,21 @@
             ],
             "description": "Symfony ClassLoader Component",
             "homepage": "http://symfony.com",
-            "time": "2015-01-05 14:28:40"
+            "time": "2015-03-13 17:37:22"
         },
         {
             "name": "symfony/console",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "target-dir": "Symfony/Component/Console",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Console.git",
-                "reference": "e44154bfe3e41e8267d7a3794cd9da9a51cfac34"
+                "reference": "53f86497ccd01677e22435cfb7262599450a90d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/e44154bfe3e41e8267d7a3794cd9da9a51cfac34",
-                "reference": "e44154bfe3e41e8267d7a3794cd9da9a51cfac34",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/53f86497ccd01677e22435cfb7262599450a90d1",
+                "reference": "53f86497ccd01677e22435cfb7262599450a90d1",
                 "shasum": ""
             },
             "require": {
@@ -4361,6 +4373,7 @@
             "require-dev": {
                 "psr/log": "~1.0",
                 "symfony/event-dispatcher": "~2.1",
+                "symfony/phpunit-bridge": "~2.7",
                 "symfony/process": "~2.1"
             },
             "suggest": {
@@ -4395,21 +4408,21 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "http://symfony.com",
-            "time": "2015-01-25 04:39:26"
+            "time": "2015-03-13 17:37:22"
         },
         {
             "name": "symfony/debug",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "target-dir": "Symfony/Component/Debug",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Debug.git",
-                "reference": "150c80059c3ccf68f96a4fceb513eb6b41f23300"
+                "reference": "5c1570dea188ade0c6c5e874c2f0a6570587aa1c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Debug/zipball/150c80059c3ccf68f96a4fceb513eb6b41f23300",
-                "reference": "150c80059c3ccf68f96a4fceb513eb6b41f23300",
+                "url": "https://api.github.com/repos/symfony/Debug/zipball/5c1570dea188ade0c6c5e874c2f0a6570587aa1c",
+                "reference": "5c1570dea188ade0c6c5e874c2f0a6570587aa1c",
                 "shasum": ""
             },
             "require": {
@@ -4422,7 +4435,8 @@
             "require-dev": {
                 "symfony/class-loader": "~2.2",
                 "symfony/http-foundation": "~2.1",
-                "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2"
+                "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2",
+                "symfony/phpunit-bridge": "~2.7"
             },
             "suggest": {
                 "symfony/http-foundation": "",
@@ -4455,21 +4469,21 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "http://symfony.com",
-            "time": "2015-01-21 20:57:55"
+            "time": "2015-03-13 17:37:22"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "target-dir": "Symfony/Component/EventDispatcher",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "f75989f3ab2743a82fe0b03ded2598a2b1546813"
+                "reference": "70f7c8478739ad21e3deef0d977b38c77f1fb284"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/f75989f3ab2743a82fe0b03ded2598a2b1546813",
-                "reference": "f75989f3ab2743a82fe0b03ded2598a2b1546813",
+                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/70f7c8478739ad21e3deef0d977b38c77f1fb284",
+                "reference": "70f7c8478739ad21e3deef0d977b38c77f1fb284",
                 "shasum": ""
             },
             "require": {
@@ -4480,6 +4494,7 @@
                 "symfony/config": "~2.0,>=2.0.5",
                 "symfony/dependency-injection": "~2.6",
                 "symfony/expression-language": "~2.6",
+                "symfony/phpunit-bridge": "~2.7",
                 "symfony/stopwatch": "~2.3"
             },
             "suggest": {
@@ -4513,26 +4528,29 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "http://symfony.com",
-            "time": "2015-02-01 16:10:57"
+            "time": "2015-03-13 17:37:22"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "target-dir": "Symfony/Component/Filesystem",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7"
+                "reference": "fdc5f151bc2db066b51870d5bea3773d915ced0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a1f566d1f92e142fa1593f4555d6d89e3044a9b7",
-                "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7",
+                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/fdc5f151bc2db066b51870d5bea3773d915ced0b",
+                "reference": "fdc5f151bc2db066b51870d5bea3773d915ced0b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -4560,26 +4578,29 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "http://symfony.com",
-            "time": "2015-01-03 21:13:09"
+            "time": "2015-03-12 10:28:44"
         },
         {
             "name": "symfony/finder",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "target-dir": "Symfony/Component/Finder",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Finder.git",
-                "reference": "16513333bca64186c01609961a2bb1b95b5e1355"
+                "reference": "bebc7479c566fa4f14b9bcef9e32e719eabec74e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Finder/zipball/16513333bca64186c01609961a2bb1b95b5e1355",
-                "reference": "16513333bca64186c01609961a2bb1b95b5e1355",
+                "url": "https://api.github.com/repos/symfony/Finder/zipball/bebc7479c566fa4f14b9bcef9e32e719eabec74e",
+                "reference": "bebc7479c566fa4f14b9bcef9e32e719eabec74e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -4607,28 +4628,29 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "http://symfony.com",
-            "time": "2015-01-03 08:01:59"
+            "time": "2015-03-12 10:28:44"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "target-dir": "Symfony/Component/HttpFoundation",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpFoundation.git",
-                "reference": "8fa63d614d56ccfe033e30411d90913cfc483ff6"
+                "reference": "d527885e37b55ec0e3dc6f4b70566d0f9b2f2388"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/8fa63d614d56ccfe033e30411d90913cfc483ff6",
-                "reference": "8fa63d614d56ccfe033e30411d90913cfc483ff6",
+                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/d527885e37b55ec0e3dc6f4b70566d0f9b2f2388",
+                "reference": "d527885e37b55ec0e3dc6f4b70566d0f9b2f2388",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "symfony/expression-language": "~2.4"
+                "symfony/expression-language": "~2.4",
+                "symfony/phpunit-bridge": "~2.7"
             },
             "type": "library",
             "extra": {
@@ -4660,21 +4682,21 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "http://symfony.com",
-            "time": "2015-02-01 16:10:57"
+            "time": "2015-03-13 17:37:22"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "target-dir": "Symfony/Component/HttpKernel",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpKernel.git",
-                "reference": "27abf3106d8bd08562070dd4e2438c279792c434"
+                "reference": "6f7b2d3ba8bf02cf77edb399696e85ef24a888a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/27abf3106d8bd08562070dd4e2438c279792c434",
-                "reference": "27abf3106d8bd08562070dd4e2438c279792c434",
+                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/6f7b2d3ba8bf02cf77edb399696e85ef24a888a4",
+                "reference": "6f7b2d3ba8bf02cf77edb399696e85ef24a888a4",
                 "shasum": ""
             },
             "require": {
@@ -4694,6 +4716,7 @@
                 "symfony/dom-crawler": "~2.0,>=2.0.5",
                 "symfony/expression-language": "~2.4",
                 "symfony/finder": "~2.0,>=2.0.5",
+                "symfony/phpunit-bridge": "~2.7",
                 "symfony/process": "~2.0,>=2.0.5",
                 "symfony/routing": "~2.2",
                 "symfony/stopwatch": "~2.3",
@@ -4737,26 +4760,29 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "http://symfony.com",
-            "time": "2015-02-02 18:02:30"
+            "time": "2015-03-17 14:58:46"
         },
         {
             "name": "symfony/process",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "target-dir": "Symfony/Component/Process",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Process.git",
-                "reference": "ecfc23e89d9967999fa5f60a1e9af7384396e9ae"
+                "reference": "4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Process/zipball/ecfc23e89d9967999fa5f60a1e9af7384396e9ae",
-                "reference": "ecfc23e89d9967999fa5f60a1e9af7384396e9ae",
+                "url": "https://api.github.com/repos/symfony/Process/zipball/4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc",
+                "reference": "4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -4784,21 +4810,21 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "http://symfony.com",
-            "time": "2015-01-25 04:39:26"
+            "time": "2015-03-12 10:28:44"
         },
         {
             "name": "symfony/routing",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "target-dir": "Symfony/Component/Routing",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Routing.git",
-                "reference": "bda1c3c67f2a33bbeabb1d321feaf626a0ca5698"
+                "reference": "a7f3eb540e5c553c3c95993c6fc2e7edb2f3b9d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Routing/zipball/bda1c3c67f2a33bbeabb1d321feaf626a0ca5698",
-                "reference": "bda1c3c67f2a33bbeabb1d321feaf626a0ca5698",
+                "url": "https://api.github.com/repos/symfony/Routing/zipball/a7f3eb540e5c553c3c95993c6fc2e7edb2f3b9d2",
+                "reference": "a7f3eb540e5c553c3c95993c6fc2e7edb2f3b9d2",
                 "shasum": ""
             },
             "require": {
@@ -4811,6 +4837,7 @@
                 "symfony/config": "~2.2",
                 "symfony/expression-language": "~2.4",
                 "symfony/http-foundation": "~2.3",
+                "symfony/phpunit-bridge": "~2.7",
                 "symfony/yaml": "~2.0,>=2.0.5"
             },
             "suggest": {
@@ -4852,21 +4879,21 @@
                 "uri",
                 "url"
             ],
-            "time": "2015-01-15 12:15:12"
+            "time": "2015-03-13 17:37:22"
         },
         {
             "name": "symfony/security-core",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "target-dir": "Symfony/Component/Security/Core",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/security-core.git",
-                "reference": "4603bcc66e20e23f018c67f7f9f3f8146a100c11"
+                "reference": "889290a5c00d3f174cc73ce13a11a0a6406939e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/security-core/zipball/4603bcc66e20e23f018c67f7f9f3f8146a100c11",
-                "reference": "4603bcc66e20e23f018c67f7f9f3f8146a100c11",
+                "url": "https://api.github.com/repos/symfony/security-core/zipball/889290a5c00d3f174cc73ce13a11a0a6406939e9",
+                "reference": "889290a5c00d3f174cc73ce13a11a0a6406939e9",
                 "shasum": ""
             },
             "require": {
@@ -4878,6 +4905,7 @@
                 "symfony/event-dispatcher": "~2.1",
                 "symfony/expression-language": "~2.6",
                 "symfony/http-foundation": "~2.4",
+                "symfony/phpunit-bridge": "~2.7",
                 "symfony/translation": "~2.0,>=2.0.5",
                 "symfony/validator": "~2.5,>=2.5.5"
             },
@@ -4915,21 +4943,21 @@
             ],
             "description": "Symfony Security Component - Core Library",
             "homepage": "http://symfony.com",
-            "time": "2015-01-25 04:39:26"
+            "time": "2015-03-13 17:37:22"
         },
         {
             "name": "symfony/translation",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "target-dir": "Symfony/Component/Translation",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Translation.git",
-                "reference": "f289cdf8179d32058c1e1cbac723106a5ff6fa39"
+                "reference": "043db5f1eef9598d1bc1d75b93304984c003d7d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Translation/zipball/f289cdf8179d32058c1e1cbac723106a5ff6fa39",
-                "reference": "f289cdf8179d32058c1e1cbac723106a5ff6fa39",
+                "url": "https://api.github.com/repos/symfony/Translation/zipball/043db5f1eef9598d1bc1d75b93304984c003d7d9",
+                "reference": "043db5f1eef9598d1bc1d75b93304984c003d7d9",
                 "shasum": ""
             },
             "require": {
@@ -4939,6 +4967,7 @@
                 "psr/log": "~1.0",
                 "symfony/config": "~2.3,>=2.3.12",
                 "symfony/intl": "~2.3",
+                "symfony/phpunit-bridge": "~2.7",
                 "symfony/yaml": "~2.2"
             },
             "suggest": {
@@ -4973,26 +5002,29 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "http://symfony.com",
-            "time": "2015-01-03 15:33:07"
+            "time": "2015-03-14 11:42:25"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "target-dir": "Symfony/Component/VarDumper",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "c3d5a36c3e3298bd8b070488fba5537174647353"
+                "reference": "61ee6c848fd2c623e13f59df48833f8b8bad7fda"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c3d5a36c3e3298bd8b070488fba5537174647353",
-                "reference": "c3d5a36c3e3298bd8b070488fba5537174647353",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/61ee6c848fd2c623e13f59df48833f8b8bad7fda",
+                "reference": "61ee6c848fd2c623e13f59df48833f8b8bad7fda",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
             "suggest": {
                 "ext-symfony_debug": ""
             },
@@ -5030,20 +5062,20 @@
                 "debug",
                 "dump"
             ],
-            "time": "2015-02-02 16:32:08"
+            "time": "2015-03-06 16:45:31"
         },
         {
             "name": "twbs/bootstrap",
-            "version": "v3.3.2",
+            "version": "v3.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twbs/bootstrap.git",
-                "reference": "bcf7dd38b5ab180256e2e4fb5da0369551b3f082"
+                "reference": "a10eb60bc0b07b747fa0c4ebd8821eb7307bd07f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/bcf7dd38b5ab180256e2e4fb5da0369551b3f082",
-                "reference": "bcf7dd38b5ab180256e2e4fb5da0369551b3f082",
+                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/a10eb60bc0b07b747fa0c4ebd8821eb7307bd07f",
+                "reference": "a10eb60bc0b07b747fa0c4ebd8821eb7307bd07f",
                 "shasum": ""
             },
             "replace": {
@@ -5081,7 +5113,7 @@
                 "responsive",
                 "web"
             ],
-            "time": "2015-01-19 17:03:09"
+            "time": "2015-03-16 15:44:41"
         },
         {
             "name": "vlucas/phpdotenv",
@@ -5140,12 +5172,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/webpatser/laravel-countries.git",
-                "reference": "5714176d7acb008f4b6ac3a1ac9e139243c921fc"
+                "reference": "0b5bf74d85470430af7296e9f316d6f4ad9a5fa4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webpatser/laravel-countries/zipball/5714176d7acb008f4b6ac3a1ac9e139243c921fc",
-                "reference": "5714176d7acb008f4b6ac3a1ac9e139243c921fc",
+                "url": "https://api.github.com/repos/webpatser/laravel-countries/zipball/0b5bf74d85470430af7296e9f316d6f4ad9a5fa4",
+                "reference": "0b5bf74d85470430af7296e9f316d6f4ad9a5fa4",
                 "shasum": ""
             },
             "require": {
@@ -5184,7 +5216,7 @@
                 "iso_3166_3",
                 "laravel"
             ],
-            "time": "2014-12-12 12:17:07"
+            "time": "2015-03-25 08:28:59"
         }
     ],
     "packages-dev": [
@@ -6155,22 +6187,25 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "target-dir": "Symfony/Component/Yaml",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Yaml.git",
-                "reference": "60ed7751671113cf1ee7d7778e691642c2e9acd8"
+                "reference": "0cd8e72071e46e15fc072270ae39ea1b66b10a9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/60ed7751671113cf1ee7d7778e691642c2e9acd8",
-                "reference": "60ed7751671113cf1ee7d7778e691642c2e9acd8",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/0cd8e72071e46e15fc072270ae39ea1b66b10a9d",
+                "reference": "0cd8e72071e46e15fc072270ae39ea1b66b10a9d",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -6198,12 +6233,13 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "http://symfony.com",
-            "time": "2015-01-25 04:39:26"
+            "time": "2015-03-12 10:28:44"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
+        "impleri/confide": 20,
         "anahkiasen/former": 20,
         "chumper/datatable": 20,
         "intervention/image": 20,
diff --git a/config/database.php b/config/database.php
index 54c6db0fcc..d6b202f23b 100644
--- a/config/database.php
+++ b/config/database.php
@@ -26,7 +26,7 @@ return [
 	|
 	*/
 
-	'default' => 'mysql',
+	'default' => env('DB_TYPE', 'mysql'),
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/config/mail.php b/config/mail.php
index d41f93a95b..0d5473eb37 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -54,7 +54,7 @@ return [
 	|
 	*/
 
-	'from' => ['address' => 'contact@invoiceninja.com', 'name' => 'Invoice Ninja'],
+	'from' => ['address' => env('MAIL_USERNAME'), 'name' => env('MAIL_FROM_NAME')],
 
 	/*
 	|--------------------------------------------------------------------------
@@ -67,7 +67,7 @@ return [
 	|
 	*/
 
-	'encryption' => 'tls',
+	'encryption' => env('MAIL_ENCRYPTION', 'tls'),
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/database/seeds/ConstantsSeeder.php b/database/seeds/ConstantsSeeder.php
index 53e3a26cf6..85b7d18ca9 100644
--- a/database/seeds/ConstantsSeeder.php
+++ b/database/seeds/ConstantsSeeder.php
@@ -1,5 +1,20 @@
 <?php
 
+use App\Models\PaymentType;
+use App\Models\Theme;
+use App\Models\InvoiceStatus;
+use App\Models\Frequency;
+use App\Models\Industry;
+use App\Models\Size;
+use App\Models\PaymentTerm;
+use App\Models\Currency;
+use App\Models\DatetimeFormat;
+use App\Models\DateFormat;
+use App\Models\PaymentLibrary;
+use App\Models\Gateway;
+use App\Models\Timezone;
+
+
 class ConstantsSeeder extends Seeder
 {
 
diff --git a/database/seeds/PaymentLibrariesSeeder.php b/database/seeds/PaymentLibrariesSeeder.php
index 186b656f76..d676ea9705 100644
--- a/database/seeds/PaymentLibrariesSeeder.php
+++ b/database/seeds/PaymentLibrariesSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+use App\Models\Gateway;
+
 class PaymentLibrariesSeeder extends Seeder
 {
 
diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php
index fdd19f7d18..29a3b3f639 100644
--- a/resources/views/setup.blade.php
+++ b/resources/views/setup.blade.php
@@ -23,6 +23,11 @@
         @if (!extension_loaded('fileinfo'))
             <div class="alert alert-warning">Warning: The <a href="http://php.net/manual/en/book.fileinfo.php" target="_blank">fileinfo</a> extension needs to be installed and enabled.</div>
         @endif
+        @if (!@fopen(base_path()."/.env", 'w'))
+            <div class="alert alert-warning">Warning: Permission denied to write config file
+                <pre>sudo chown yourname:www-data /path/to/ninja</pre>
+            </div>
+        @endif
         If you need help you can either post to our <a href="https://groups.google.com/forum/#!forum/invoiceninja" target="_blank">Google Group</a> 
         or email us at <a href="mailto:contact@invoiceninja.com" target="_blank">contact@invoiceninja.com</a>.
         <p>
diff --git a/storage/.gitignore b/storage/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/app/.gitignore b/storage/app/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore
old mode 100644
new mode 100755