kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 07:34:43 +00:00
Code Issues Projects Releases Wiki Activity

Ignore db version in scripts.

Browse Source
This commit is contained in:
James Cole
2025-10-02 06:55:09 +02:00
parent 3b85f87502
commit 62b9f2785f
6 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/System/SetsLatestVersion.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\System; namespace FireflyIII\Console\Commands\System;
use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Console\Commands\ShowsFriendlyMessages;
use FireflyIII\Support\Facades\FireflyConfig;
use Illuminate\Console\Command; use Illuminate\Console\Command;
class SetsLatestVersion extends Command class SetsLatestVersion extends Command
@@ -45,8 +46,7 @@ class SetsLatestVersion extends Command
return 0; return 0;
} }
app('fireflyconfig')->set('db_version', config('firefly.db_version')); FireflyConfig::set('ff3_version', config('firefly.version'));
app('fireflyconfig')->set('ff3_version', config('firefly.version'));
$this->friendlyInfo('Updated version.'); $this->friendlyInfo('Updated version.');
return 0; return 0;

5
app/Console/Commands/Upgrade/UpgradesDatabase.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Console\Commands\Upgrade; namespace FireflyIII\Console\Commands\Upgrade;
use FireflyIII\Support\Facades\FireflyConfig;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use Safe\Exceptions\InfoException; use Safe\Exceptions\InfoException;
@@ -86,10 +87,8 @@ class UpgradesDatabase extends Command
$this->friendlyLine(sprintf('Now executing %s', $command)); $this->friendlyLine(sprintf('Now executing %s', $command));
$this->call($command, $args); $this->call($command, $args);
} }
// set new DB version.
app('fireflyconfig')->set('db_version', (int) config('firefly.db_version'));
// index will set FF3 version. // index will set FF3 version.
app('fireflyconfig')->set('ff3_version', (string) config('firefly.version')); FireflyConfig::set('ff3_version', (string) config('firefly.version'));
return 0; return 0;
} }

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

@@ -184,7 +184,6 @@ class DebugController extends Controller
$currentDriver = DB::getDriverName(); $currentDriver = DB::getDriverName();
return [ return [
'db_version' => app('fireflyconfig')->get('db_version', 1)->data,
'php_version' => PHP_VERSION, 'php_version' => PHP_VERSION,
'php_os' => PHP_OS, 'php_os' => PHP_OS,
'uname' => php_uname('m'), 'uname' => php_uname('m'),

6
app/Http/Controllers/System/InstallController.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\System; namespace FireflyIII\Http\Controllers\System;
use FireflyIII\Support\Facades\FireflyConfig;
use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use Exception; use Exception;
@@ -81,10 +82,7 @@ class InstallController extends Controller
{ {
app('view')->share('FF_VERSION', config('firefly.version')); app('view')->share('FF_VERSION', config('firefly.version'));
// index will set FF3 version. // index will set FF3 version.
app('fireflyconfig')->set('ff3_version', (string) config('firefly.version')); FireflyConfig::set('ff3_version', (string) config('firefly.version'));
// set new DB version.
app('fireflyconfig')->set('db_version', (int) config('firefly.db_version'));
return view('install.index'); return view('install.index');
} }

2
config/firefly.php
View File

@@ -81,7 +81,7 @@ return [
'version' => 'develop/2025-09-29', 'version' => 'develop/2025-09-29',
'build_time' => 1759116036, 'build_time' => 1759116036,
'api_version' => '2.1.0', // field is no longer used. 'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, 'db_version' => 28, // field is no longer used.
// generic settings // generic settings
'maxUploadSize' => 1073741824, // 1 GB 'maxUploadSize' => 1073741824, // 1 GB

3
resources/views/partials/debug-table.twig
View File

@@ -12,8 +12,7 @@
{# Firefly III version #} {# Firefly III version #}
<tr> <tr>
<td>Firefly III</td> <td>Firefly III</td>
<td>{% if FF_IS_DEVELOP %}<!-- .Z9JBCmw64Zkx1pQw -->{% endif %}{% if not FF_IS_DEVELOP %}v{% endif %}{{ FF_VERSION }} / <span>#</span>{{ system.db_version }} (expects <span>#</span>{{ config('firefly.db_version') }}) <td>{% if FF_IS_DEVELOP %}<!-- .Z9JBCmw64Zkx1pQw -->{% endif %}{% if not FF_IS_DEVELOP %}v{% endif %}{{ FF_VERSION }}</td>
</td>
</tr> </tr>
{# PHP version + settings #} {# PHP version + settings #}
<tr> <tr>