diff --git a/config/firefly.php b/config/firefly.php index c32836dba7..0ea3fc97e3 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -117,7 +117,7 @@ return [ 'expression_engine' => false, // see cer.php for exchange rates feature flag. ], - 'version' => 'develop/2024-05-25', + 'version' => 'develop/2024-05-27', 'api_version' => '2.1.0', 'db_version' => 24, diff --git a/database/seeders/AccountTypeSeeder.php b/database/seeders/AccountTypeSeeder.php index 8dd3ce2289..c142b1b615 100644 --- a/database/seeders/AccountTypeSeeder.php +++ b/database/seeders/AccountTypeSeeder.php @@ -49,7 +49,7 @@ class AccountTypeSeeder extends Seeder AccountType::LIABILITY_CREDIT, ]; foreach ($types as $type) { - if(null === AccountType::where('type', $type)->first()) { + if (null === AccountType::where('type', $type)->first()) { try { AccountType::create(['type' => $type]); } catch (\PDOException $e) { diff --git a/database/seeders/ConfigSeeder.php b/database/seeders/ConfigSeeder.php index 842b8cc069..31e15b3b3b 100644 --- a/database/seeders/ConfigSeeder.php +++ b/database/seeders/ConfigSeeder.php @@ -36,7 +36,7 @@ class ConfigSeeder extends Seeder */ public function run(): void { - $entry = Configuration::where('name', 'db_version')->first(); + $entry = Configuration::where('name', 'db_version')->first(); if (null === $entry) { Configuration::create( [ @@ -44,6 +44,7 @@ class ConfigSeeder extends Seeder 'data' => 1, ] ); + return; } $version = (int) config('firefly.db_version'); diff --git a/database/seeders/PermissionSeeder.php b/database/seeders/PermissionSeeder.php index d94e35e1b3..7e3234af11 100644 --- a/database/seeders/PermissionSeeder.php +++ b/database/seeders/PermissionSeeder.php @@ -53,7 +53,6 @@ class PermissionSeeder extends Seeder // @ignoreException } } - } } } diff --git a/database/seeders/TransactionCurrencySeeder.php b/database/seeders/TransactionCurrencySeeder.php index 22f0f82dcd..5656089637 100644 --- a/database/seeders/TransactionCurrencySeeder.php +++ b/database/seeders/TransactionCurrencySeeder.php @@ -71,7 +71,7 @@ class TransactionCurrencySeeder extends Seeder $currencies[] = ['code' => 'HRK', 'name' => 'Croatian kuna', 'symbol' => 'kn', 'decimal_places' => 2]; foreach ($currencies as $currency) { - if(null === TransactionCurrency::where('code', $currency['code'])->first()) { + if (null === TransactionCurrency::where('code', $currency['code'])->first()) { try { TransactionCurrency::create($currency); } catch (\PDOException $e) { diff --git a/database/seeders/TransactionTypeSeeder.php b/database/seeders/TransactionTypeSeeder.php index 5241ee49dc..94ae9f1b3d 100644 --- a/database/seeders/TransactionTypeSeeder.php +++ b/database/seeders/TransactionTypeSeeder.php @@ -44,7 +44,7 @@ class TransactionTypeSeeder extends Seeder ]; foreach ($types as $type) { - if(null === TransactionType::where('type', $type)->first()) { + if (null === TransactionType::where('type', $type)->first()) { try { TransactionType::create(['type' => $type]); } catch (\PDOException $e) { diff --git a/database/seeders/UserRoleSeeder.php b/database/seeders/UserRoleSeeder.php index 9b94e9f6fb..bc117c9e19 100644 --- a/database/seeders/UserRoleSeeder.php +++ b/database/seeders/UserRoleSeeder.php @@ -45,7 +45,7 @@ class UserRoleSeeder extends Seeder /** @var string $role */ foreach ($roles as $role) { - if(null === UserRole::where('title', $role)->first()) { + if (null === UserRole::where('title', $role)->first()) { try { UserRole::create(['title' => $role]); } catch (\PDOException $e) { diff --git a/package-lock.json b/package-lock.json index 90ce234ccf..3d926a4845 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3341,9 +3341,9 @@ } }, "node_modules/ajv-formats/node_modules/ajv": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", - "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.14.0.tgz", + "integrity": "sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.3", @@ -5840,6 +5840,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -8972,6 +8973,7 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, "dependencies": { "glob": "^7.1.3" @@ -10447,9 +10449,9 @@ } }, "node_modules/webpack-dev-middleware/node_modules/ajv": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", - "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.14.0.tgz", + "integrity": "sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.3", @@ -10559,9 +10561,9 @@ } }, "node_modules/webpack-dev-server/node_modules/ajv": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", - "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.14.0.tgz", + "integrity": "sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.3", @@ -10613,6 +10615,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, "dependencies": { "glob": "^7.1.3"