Merge pull request #470 from dbarzin/dev

add force_https environment variable

Author: dbarzin

.env.ci

@@ -1,6 +1,7 @@
 APP_NAME=Laravel
-APP_ENV=local
+APP_ENV=production
 APP_KEY=
+APP_FORCE_HTTPS=false
 APP_DEBUG=true
 APP_URL=http://localhost
 

.env.example

@@ -1,6 +1,7 @@
 APP_NAME=Deming
-APP_ENV=local
+APP_ENV=production
 APP_KEY=
+APP_FORCE_HTTPS=false
 APP_DEBUG=true
 APP_URL=http://deming.yourdomain.com
 APP_TIMEZONE='Europe/Paris'

app/Providers/AppServiceProvider.php

@@ -28,11 +28,16 @@ public function register()
      */
     public function boot()
     {
-        if (App::environment('production')) {
+        if (
+            (App::environment('production')  && (config('app.force_https')===null))
+            ||
+            Config::get('app.force_https')
+            )
+        {
             URL::forceScheme('https');
         }
 
-        if (env('APP_DEBUG')) {
+        if (config('app.debug')) {
             DB::listen(function ($query) {
                 Log::info(
                     $query->sql,

config/app.php

@@ -28,6 +28,17 @@
 
     'env' => env('APP_ENV', 'production'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Application Force HTTPS
+    |--------------------------------------------------------------------------
+    |
+    | This ariable force the use of HTTPS in the applucation URL
+    |
+    */
+
+    'force_https' => env('APP_FORCE_HTTPS', null),
+
     /*
     |--------------------------------------------------------------------------
     | Application Debug Mode