kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 02:45:58 +00:00
Code Issues Projects Releases Wiki Activity

Remove references to unused Docker variable

Browse Source
This commit is contained in:
James Cole
2019-10-10 20:36:55 +02:00
parent de19bfe448
commit 22f63fd951
7 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.deploy/heroku/.env.heroku
View File

@@ -176,7 +176,6 @@ PUSHER_SECRET=
PUSHER_ID= PUSHER_ID=
DEMO_USERNAME= DEMO_USERNAME=
DEMO_PASSWORD= DEMO_PASSWORD=
IS_DOCKER=false
IS_SANDSTORM=false IS_SANDSTORM=false
IS_HEROKU=true IS_HEROKU=true
BUNQ_USE_SANDBOX=false BUNQ_USE_SANDBOX=false

1
.deploy/sandstorm/.env.sandstorm
View File

@@ -171,7 +171,6 @@ PUSHER_SECRET=
PUSHER_ID= PUSHER_ID=
DEMO_USERNAME= DEMO_USERNAME=
DEMO_PASSWORD= DEMO_PASSWORD=
IS_DOCKER=false
IS_SANDSTORM=true IS_SANDSTORM=true
IS_HEROKU=false IS_HEROKU=false
BUNQ_USE_SANDBOX=false BUNQ_USE_SANDBOX=false

1
.env.example
View File

@@ -178,7 +178,6 @@ PUSHER_SECRET=
PUSHER_ID= PUSHER_ID=
DEMO_USERNAME= DEMO_USERNAME=
DEMO_PASSWORD= DEMO_PASSWORD=
IS_DOCKER=false
USE_ENCRYPTION=false USE_ENCRYPTION=false
IS_SANDSTORM=false IS_SANDSTORM=false
IS_HEROKU=false IS_HEROKU=false

3
app/Http/Controllers/DebugController.php
View File

@@ -127,7 +127,6 @@ class DebugController extends Controller
$currentDriver = DB::getDriverName(); $currentDriver = DB::getDriverName();
$userAgent = $request->header('user-agent'); $userAgent = $request->header('user-agent');
$isSandstorm = var_export(config('firefly.is_sandstorm'), true); $isSandstorm = var_export(config('firefly.is_sandstorm'), true);
$isDocker = var_export(config('firefly.is_docker'), true);
$toSandbox = var_export(config('firefly.bunq_use_sandbox'), true); $toSandbox = var_export(config('firefly.bunq_use_sandbox'), true);
$trustedProxies = config('firefly.trusted_proxies'); $trustedProxies = config('firefly.trusted_proxies');
$displayErrors = ini_get('display_errors'); $displayErrors = ini_get('display_errors');
@@ -178,7 +177,7 @@ class DebugController extends Controller
'debug', compact( 'debug', compact(
'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'logChannel', 'appLogLevel', 'now', 'drivers', 'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'logChannel', 'appLogLevel', 'now', 'drivers',
'currentDriver', 'loginProvider', 'storageDisks', 'currentDriver', 'loginProvider', 'storageDisks',
'userAgent', 'displayErrors', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'isDocker', 'isSandstorm', 'userAgent', 'displayErrors', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'isSandstorm',
'trustedProxies', 'trustedProxies',
'toSandbox' 'toSandbox'
) )

18
app/Http/Middleware/Range.php
View File

@@ -53,8 +53,6 @@ class Range
// set more view variables: // set more view variables:
$this->configureList(); $this->configureList();
// flash a big fat warning when users use SQLite in Docker
$this->loseItAll($request);
} }
return $next($request); return $next($request);
@@ -104,22 +102,6 @@ class Range
app('view')->share('defaultCurrency', $defaultCurrency); app('view')->share('defaultCurrency', $defaultCurrency);
} }
/**
* Error when sqlite in docker.
*
* @param Request $request
*/
private function loseItAll(Request $request): void
{
if ('sqlite' === config('database.default') && true === config('firefly.is_docker')) {
// @codeCoverageIgnoreStart
$request->session()->flash(
'error', 'You seem to be using SQLite in a Docker container. Don\'t do this. If the container restarts all your data will be gone.'
);
// @codeCoverageIgnoreEnd
}
}
/** /**
* Set the range for the current view. * Set the range for the current view.
*/ */

1
config/firefly.php
View File

@@ -135,7 +135,6 @@ return [
'demo_username' => env('DEMO_USERNAME', ''), 'demo_username' => env('DEMO_USERNAME', ''),
'demo_password' => env('DEMO_PASSWORD', ''), 'demo_password' => env('DEMO_PASSWORD', ''),
'is_sandstorm' => env('IS_SANDSTORM', 'unknown'), 'is_sandstorm' => env('IS_SANDSTORM', 'unknown'),
'is_docker' => env('IS_DOCKER', 'unknown'),
'bunq_use_sandbox' => env('BUNQ_USE_SANDBOX', false), 'bunq_use_sandbox' => env('BUNQ_USE_SANDBOX', false),
'fixer_api_key' => env('FIXER_API_KEY', ''), 'fixer_api_key' => env('FIXER_API_KEY', ''),
'mapbox_api_key' => env('MAPBOX_API_KEY', ''), 'mapbox_api_key' => env('MAPBOX_API_KEY', ''),

1
resources/views/v1/debug.twig
View File

@@ -42,7 +42,6 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
| Using Sandstorm? | {% if SANDSTORM == true %}yes{% else %}no{% endif %} | | Using Sandstorm? | {% if SANDSTORM == true %}yes{% else %}no{% endif %} |
{% if SANDSTORM == true %}| Sandstorm anon? | {% if SANDSTORM_ANON == true %}yes{% else %}no{% endif %} |{% endif %} {% if SANDSTORM == true %}| Sandstorm anon? | {% if SANDSTORM_ANON == true %}yes{% else %}no{% endif %} |{% endif %}
| Is Sandstorm (.env) | {{ isSandstorm }} | | Is Sandstorm (.env) | {{ isSandstorm }} |
| Is Docker (.env) | {{ isDocker }} |
| bunq uses sandbox | {{ toSandbox }} | | bunq uses sandbox | {{ toSandbox }} |
| Trusted proxies (.env) | {{ trustedProxies }} | | Trusted proxies (.env) | {{ trustedProxies }} |
| User agent | {{ userAgent }} | | User agent | {{ userAgent }} |