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

Code cleanup

Browse Source
This commit is contained in:
James Cole
2019-08-17 10:47:51 +02:00
parent c2296c3ad5
commit 342985d52a
22 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
database/factories/AccountFactory.php
View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
use Carbon\Carbon; use Carbon\Carbon;
$factory->define( $factory->define(
FireflyIII\Models\Account::class, FireflyIII\Models\Account::class,
function (Faker\Generator $faker) { function (Faker\Generator $faker) {

3
database/factories/ModelFactory.php
View File

@@ -21,6 +21,7 @@
declare(strict_types=1); declare(strict_types=1);
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Models\TransactionJournal;
$factory->define( $factory->define(
@@ -29,7 +30,7 @@ $factory->define(
return [ return [
'user_id' => 1, 'user_id' => 1,
'attachable_id' => 1, 'attachable_id' => 1,
'attachable_type' => \FireflyIII\Models\TransactionJournal::class, 'attachable_type' => TransactionJournal::class,
'md5' => md5($faker->words(6, true)), 'md5' => md5($faker->words(6, true)),
'mime' => 'text/plain', 'mime' => 'text/plain',
'size' => 1, 'size' => 1,

1
database/factories/UserFactory.php
View File

@@ -21,6 +21,7 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
/** /**
* UserFactory.php * UserFactory.php
* Copyright (c) 2018 thegrumpydictator@gmail.com * Copyright (c) 2018 thegrumpydictator@gmail.com

11
database/migrations/2016_12_28_203205_changes_for_v431.php
View File

@@ -75,13 +75,14 @@ class ChangesForV431 extends Migration
* Run the migrations. * Run the migrations.
* *
* @SuppressWarnings(PHPMD.ShortMethodName) * @SuppressWarnings(PHPMD.ShortMethodName)
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/ */
public function up(): void public function up(): void
{ {
// add decimal places to "transaction currencies". // add decimal places to "transaction currencies".
Schema::table( Schema::table(
'transaction_currencies', 'transaction_currencies',
function (Blueprint $table) { static function (Blueprint $table) {
$table->smallInteger('decimal_places', false, true)->default(2); $table->smallInteger('decimal_places', false, true)->default(2);
} }
); );
@@ -89,7 +90,7 @@ class ChangesForV431 extends Migration
// change field "startdate" to "start_date" // change field "startdate" to "start_date"
Schema::table( Schema::table(
'budget_limits', 'budget_limits',
function (Blueprint $table) { static function (Blueprint $table) {
$table->renameColumn('startdate', 'start_date'); $table->renameColumn('startdate', 'start_date');
} }
); );
@@ -97,7 +98,7 @@ class ChangesForV431 extends Migration
// add date field "end_date" after "start_date" // add date field "end_date" after "start_date"
Schema::table( Schema::table(
'budget_limits', 'budget_limits',
function (Blueprint $table) { static function (Blueprint $table) {
$table->date('end_date')->nullable()->after('start_date'); $table->date('end_date')->nullable()->after('start_date');
} }
); );
@@ -105,13 +106,13 @@ class ChangesForV431 extends Migration
// drop "repeats" and "repeat_freq". // drop "repeats" and "repeat_freq".
Schema::table( Schema::table(
'budget_limits', 'budget_limits',
function (Blueprint $table) { static function (Blueprint $table) {
$table->dropColumn('repeats'); $table->dropColumn('repeats');
} }
); );
Schema::table( Schema::table(
'budget_limits', 'budget_limits',
function (Blueprint $table) { static function (Blueprint $table) {
$table->dropColumn('repeat_freq'); $table->dropColumn('repeat_freq');
} }
); );

1
database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php
View File

@@ -41,6 +41,7 @@ class CreateOauthAuthCodesTable extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
*/ */
public function up(): void public function up(): void
{ {

1
database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php
View File

@@ -41,6 +41,7 @@ class CreateOauthAccessTokensTable extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
*/ */
public function up(): void public function up(): void
{ {

1
database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php
View File

@@ -41,6 +41,7 @@ class CreateOauthRefreshTokensTable extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
*/ */
public function up(): void public function up(): void
{ {

1
database/migrations/2018_01_01_000004_create_oauth_clients_table.php
View File

@@ -41,6 +41,7 @@ class CreateOauthClientsTable extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
*/ */
public function up(): void public function up(): void
{ {

1
database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php
View File

@@ -42,6 +42,7 @@ class CreateOauthPersonalAccessClientsTable extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
*/ */
public function up(): void public function up(): void
{ {

1
database/migrations/2018_03_19_141348_changes_for_v472.php
View File

@@ -53,6 +53,7 @@ class ChangesForV472 extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
* *
* @return void * @return void
*/ */

1
database/migrations/2018_04_07_210913_changes_for_v473.php
View File

@@ -61,6 +61,7 @@ class ChangesForV473 extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
* *
* @return void * @return void
*/ */

2
database/migrations/2018_04_29_174524_changes_for_v474.php
View File

@@ -32,6 +32,7 @@ class ChangesForV474 extends Migration
{ {
/** /**
* Reverse the migrations. * Reverse the migrations.
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
* *
* @return void * @return void
*/ */
@@ -92,6 +93,7 @@ class ChangesForV474 extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
* *
* @return void * @return void
*/ */

2
database/migrations/2018_06_08_200526_changes_for_v475.php
View File

@@ -47,6 +47,8 @@ class ChangesForV475 extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
* *
* @return void * @return void
*/ */

3
database/migrations/2018_09_05_195147_changes_for_v477.php
View File

@@ -41,7 +41,7 @@ class ChangesForV477 extends Migration
Schema::table( Schema::table(
'budget_limits', function (Blueprint $table) { 'budget_limits', function (Blueprint $table) {
// cannot drop foreign keys in SQLite: // cannot drop foreign keys in SQLite:
if ('sqlite' !== config('database.default')) { if ('sqlite' !== config('database.default')) {
$table->dropForeign('budget_limits_transaction_currency_id_foreign'); $table->dropForeign('budget_limits_transaction_currency_id_foreign');
} }
@@ -53,6 +53,7 @@ class ChangesForV477 extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
* *
* @return void * @return void
*/ */

2
database/migrations/2018_11_06_172532_changes_for_v479.php
View File

@@ -21,6 +21,7 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
@@ -45,6 +46,7 @@ class ChangesForV479 extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
* *
* @return void * @return void
*/ */

3
database/migrations/2019_01_28_193833_changes_for_v4710.php
View File

@@ -41,6 +41,7 @@ class ChangesForV4710 extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
* *
* @return void * @return void
*/ */
@@ -73,7 +74,7 @@ class ChangesForV4710 extends Migration
$table->foreign('transaction_journal_id')->references('id')->on('transaction_journals')->onDelete('cascade'); $table->foreign('transaction_journal_id')->references('id')->on('transaction_journals')->onDelete('cascade');
// unique combi: // unique combi:
$table->unique(['transaction_group_id', 'transaction_journal_id'],'unique_in_group'); $table->unique(['transaction_group_id', 'transaction_journal_id'], 'unique_in_group');
} }
); );
} }

4
database/migrations/2019_02_05_055516_changes_for_v4711.php
View File

@@ -40,6 +40,7 @@ class ChangesForV4711 extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
* *
* @return void * @return void
*/ */
@@ -59,7 +60,8 @@ class ChangesForV4711 extends Migration
} }
); );
Schema::table('preferences', function (Blueprint $table) { Schema::table(
'preferences', function (Blueprint $table) {
$table->text('data')->nullable()->change(); $table->text('data')->nullable()->change();
} }
); );

1
database/migrations/2019_02_11_170529_changes_for_v4712.php
View File

@@ -42,6 +42,7 @@ class ChangesForV4712 extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
* *
* @return void * @return void
*/ */

1
database/migrations/2019_03_11_223700_fix_ldap_configuration.php
View File

@@ -46,6 +46,7 @@ class FixLdapConfiguration extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
* *
* @return void * @return void
*/ */

13
database/migrations/2019_03_22_183214_changes_for_v480.php
View File

@@ -47,9 +47,11 @@ class ChangesForV480 extends Migration
$table->dropColumn('transaction_group_id'); $table->dropColumn('transaction_group_id');
} }
); );
Schema::table('rule_groups', static function (Blueprint $table) { Schema::table(
'rule_groups', static function (Blueprint $table) {
$table->dropColumn('stop_processing'); $table->dropColumn('stop_processing');
}); }
);
Schema::table( Schema::table(
'users', static function (Blueprint $table) { 'users', static function (Blueprint $table) {
@@ -60,6 +62,7 @@ class ChangesForV480 extends Migration
/** /**
* Run the migrations. * Run the migrations.
* @SuppressWarnings(PHPMD.ShortMethodName)
* *
* @return void * @return void
*/ */
@@ -80,9 +83,11 @@ class ChangesForV480 extends Migration
$table->foreign('transaction_group_id')->references('id')->on('transaction_groups')->onDelete('cascade'); $table->foreign('transaction_group_id')->references('id')->on('transaction_groups')->onDelete('cascade');
} }
); );
Schema::table('rule_groups', static function (Blueprint $table) { Schema::table(
'rule_groups', static function (Blueprint $table) {
$table->boolean('stop_processing')->default(false); $table->boolean('stop_processing')->default(false);
}); }
);
Schema::table( Schema::table(
'users', static function (Blueprint $table) { 'users', static function (Blueprint $table) {
$table->string('mfa_secret', 50)->nullable(); $table->string('mfa_secret', 50)->nullable();

2
database/seeds/AccountTypeSeeder.php
View File

@@ -42,7 +42,7 @@ class AccountTypeSeeder extends Seeder
AccountType::LOAN, AccountType::LOAN,
AccountType::RECONCILIATION, AccountType::RECONCILIATION,
AccountType::DEBT, AccountType::DEBT,
AccountType::MORTGAGE AccountType::MORTGAGE,
]; ];
foreach ($types as $type) { foreach ($types as $type) {
try { try {

6
database/seeds/TransactionCurrencySeeder.php
View File

@@ -28,11 +28,15 @@ use Illuminate\Database\Seeder;
*/ */
class TransactionCurrencySeeder extends Seeder class TransactionCurrencySeeder extends Seeder
{ {
/**
* @SuppressWarnings(PHPMD.ShortMethodName)
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function run() public function run()
{ {
$currencies = []; $currencies = [];
// european currencies // european currencies
$currencies[] = ['code' => 'EUR', 'name' => 'Euro', 'symbol' => '€', 'decimal_places' => 2,'enabled' => 1]; $currencies[] = ['code' => 'EUR', 'name' => 'Euro', 'symbol' => '€', 'decimal_places' => 2, 'enabled' => 1];
$currencies[] = ['code' => 'HUF', 'name' => 'Hungarian forint', 'symbol' => 'Ft', 'decimal_places' => 2]; $currencies[] = ['code' => 'HUF', 'name' => 'Hungarian forint', 'symbol' => 'Ft', 'decimal_places' => 2];
$currencies[] = ['code' => 'GBP', 'name' => 'British Pound', 'symbol' => '£', 'decimal_places' => 2]; $currencies[] = ['code' => 'GBP', 'name' => 'British Pound', 'symbol' => '£', 'decimal_places' => 2];
$currencies[] = ['code' => 'UAH', 'name' => 'Ukrainian hryvnia', 'symbol' => '₴', 'decimal_places' => 2]; $currencies[] = ['code' => 'UAH', 'name' => 'Ukrainian hryvnia', 'symbol' => '₴', 'decimal_places' => 2];