diff --git a/THANKS.md b/THANKS.md
index 6d853990d6..d18178f45d 100755
--- a/THANKS.md
+++ b/THANKS.md
@@ -4,6 +4,7 @@ Over time, many people have contributed to Firefly III. Their efforts are not al
Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.
## 2024
+- TasneemTantawy
- Antônio Franco
- yparitcher
- Jhon Pedroza
diff --git a/app/Handlers/Observer/AvailableBudgetObserver.php b/app/Handlers/Observer/AvailableBudgetObserver.php
index 530ee8c00e..7d749af5b2 100644
--- a/app/Handlers/Observer/AvailableBudgetObserver.php
+++ b/app/Handlers/Observer/AvailableBudgetObserver.php
@@ -46,7 +46,7 @@ class AvailableBudgetObserver
private function updateNativeAmount(AvailableBudget $availableBudget): void
{
if (!Amount::convertToNative($availableBudget->user)) {
- //Log::debug('Do not update native available amount of the available budget.');
+ // Log::debug('Do not update native available amount of the available budget.');
return;
}
diff --git a/app/Handlers/Observer/BudgetLimitObserver.php b/app/Handlers/Observer/BudgetLimitObserver.php
index a1aba94c24..aaac82cb5d 100644
--- a/app/Handlers/Observer/BudgetLimitObserver.php
+++ b/app/Handlers/Observer/BudgetLimitObserver.php
@@ -46,7 +46,7 @@ class BudgetLimitObserver
private function updateNativeAmount(BudgetLimit $budgetLimit): void
{
if (!Amount::convertToNative($budgetLimit->budget->user)) {
- //Log::debug('Do not update native amount of the budget limit.');
+ // Log::debug('Do not update native amount of the budget limit.');
return;
}
diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php
index 2840229849..badc25693d 100644
--- a/app/Http/Controllers/Account/ShowController.php
+++ b/app/Http/Controllers/Account/ShowController.php
@@ -30,7 +30,6 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Support\Facades\Amount;
use FireflyIII\Support\Facades\Steam;
use FireflyIII\Support\Http\Controllers\PeriodOverview;
use Illuminate\Contracts\View\Factory;
diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php
index a20d2d8306..5bd00fb5f4 100644
--- a/app/Http/Controllers/Json/BoxController.php
+++ b/app/Http/Controllers/Json/BoxController.php
@@ -78,7 +78,8 @@ class BoxController extends Controller
$incomes = [];
$expenses = [];
$sums = [];
- $currency = $this->defaultCurrency;
+ $currency = $this->defaultCurrency;
+
// collect income of user:
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
@@ -124,7 +125,7 @@ class BoxController extends Controller
$expenses[$currencyId] = app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false);
}
if (0 === count($sums)) {
- $currency = $this->defaultCurrency;
+ $currency = $this->defaultCurrency;
$sums[$this->defaultCurrency->id] = app('amount')->formatAnything($this->defaultCurrency, '0', false);
$incomes[$this->defaultCurrency->id] = app('amount')->formatAnything($this->defaultCurrency, '0', false);
$expenses[$this->defaultCurrency->id] = app('amount')->formatAnything($this->defaultCurrency, '0', false);
diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php
index 811da4c325..702eb0bd62 100644
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -260,7 +260,7 @@ class PreferencesController extends Controller
// convert native
$convertToNative = 1 === (int) $request->get('convertToNative');
- if($convertToNative && !$this->convertToNative) {
+ if ($convertToNative && !$this->convertToNative) {
// set to true!
Log::debug('User sets convertToNative to true.');
event(new UserGroupChangedDefaultCurrency(auth()->user()->userGroup));
diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php
index 775d714d26..b7cd58506c 100644
--- a/app/Http/Controllers/Transaction/ConvertController.php
+++ b/app/Http/Controllers/Transaction/ConvertController.php
@@ -216,8 +216,8 @@ class ConvertController extends Controller
private function getLiabilities(): array
{
// make repositories
- $accountList = $this->accountRepository->getActiveAccountsByType([AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]);
- $grouped = [];
+ $accountList = $this->accountRepository->getActiveAccountsByType([AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]);
+ $grouped = [];
// group accounts:
/** @var Account $account */
@@ -238,8 +238,8 @@ class ConvertController extends Controller
private function getAssetAccounts(): array
{
// make repositories
- $accountList = $this->accountRepository->getActiveAccountsByType([AccountType::ASSET]);
- $grouped = [];
+ $accountList = $this->accountRepository->getActiveAccountsByType([AccountType::ASSET]);
+ $grouped = [];
// group accounts:
/** @var Account $account */
diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php
index 5d335435bd..45e2eb91bb 100644
--- a/app/Models/AvailableBudget.php
+++ b/app/Models/AvailableBudget.php
@@ -67,10 +67,10 @@ class AvailableBudget extends Model
$availableBudgetId = (int) $value;
/** @var User $user */
- $user = auth()->user();
+ $user = auth()->user();
/** @var null|AvailableBudget $availableBudget */
- $availableBudget = $user->availableBudgets()->find($availableBudgetId);
+ $availableBudget = $user->availableBudgets()->find($availableBudgetId);
if (null !== $availableBudget) {
return $availableBudget;
}
@@ -92,16 +92,17 @@ class AvailableBudget extends Model
protected function amount(): Attribute
{
return Attribute::make(
- get: static fn($value) => (string) $value,
+ get: static fn ($value) => (string) $value,
);
}
protected function transactionCurrencyId(): Attribute
{
return Attribute::make(
- get: static fn($value) => (int) $value,
+ get: static fn ($value) => (int) $value,
);
}
+
protected function startDate(): Attribute
{
return Attribute::make(
diff --git a/app/Repositories/Budget/AvailableBudgetRepository.php b/app/Repositories/Budget/AvailableBudgetRepository.php
index 753ce16e52..3a990a3b18 100644
--- a/app/Repositories/Budget/AvailableBudgetRepository.php
+++ b/app/Repositories/Budget/AvailableBudgetRepository.php
@@ -64,7 +64,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
*/
public function get(?Carbon $start = null, ?Carbon $end = null): Collection
{
- $query = $this->user->availableBudgets()->with(['transactionCurrency']);
+ $query = $this->user->availableBudgets()->with(['transactionCurrency']);
if (null !== $start && null !== $end) {
$query->where(
static function (Builder $q1) use ($start, $end): void { // @phpstan-ignore-line
@@ -75,6 +75,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
}
$result = $query->get(['available_budgets.*']);
Log::debug(sprintf('Found %d available budgets between %s and %s', $result->count(), $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
+
return $result;
}
diff --git a/app/Support/Report/Summarizer/TransactionSummarizer.php b/app/Support/Report/Summarizer/TransactionSummarizer.php
index e0890270a8..7e74cd09f0 100644
--- a/app/Support/Report/Summarizer/TransactionSummarizer.php
+++ b/app/Support/Report/Summarizer/TransactionSummarizer.php
@@ -97,7 +97,7 @@ class TransactionSummarizer
'currency_decimal_places' => $currencyDecimalPlaces,
];
$array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->{$method}($amount));
- //Log::debug(sprintf('Journal #%d adds amount %s %s', $journal['transaction_journal_id'], $currencyCode, $amount));
+ // Log::debug(sprintf('Journal #%d adds amount %s %s', $journal['transaction_journal_id'], $currencyCode, $amount));
}
Log::debug('End of sumExpenses.', $array);
diff --git a/composer.lock b/composer.lock
index c28f738963..2e5b9f9a3c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -6364,16 +6364,16 @@
},
{
"name": "spatie/laravel-package-tools",
- "version": "1.17.0",
+ "version": "1.18.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-package-tools.git",
- "reference": "9ab30fd24f677e5aa370ea4cf6b41c517d16cf85"
+ "reference": "8332205b90d17164913244f4a8e13ab7e6761d29"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/9ab30fd24f677e5aa370ea4cf6b41c517d16cf85",
- "reference": "9ab30fd24f677e5aa370ea4cf6b41c517d16cf85",
+ "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/8332205b90d17164913244f4a8e13ab7e6761d29",
+ "reference": "8332205b90d17164913244f4a8e13ab7e6761d29",
"shasum": ""
},
"require": {
@@ -6412,7 +6412,7 @@
],
"support": {
"issues": "https://github.com/spatie/laravel-package-tools/issues",
- "source": "https://github.com/spatie/laravel-package-tools/tree/1.17.0"
+ "source": "https://github.com/spatie/laravel-package-tools/tree/1.18.0"
},
"funding": [
{
@@ -6420,7 +6420,7 @@
"type": "github"
}
],
- "time": "2024-12-09T16:29:14+00:00"
+ "time": "2024-12-30T13:13:39+00:00"
},
{
"name": "spatie/period",
@@ -10287,20 +10287,20 @@
},
{
"name": "barryvdh/reflection-docblock",
- "version": "v2.2.0",
+ "version": "v2.3.0",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/ReflectionDocBlock.git",
- "reference": "db125e8df4329bd45f2da405aab007f502f38531"
+ "reference": "818be8de6af4d16ef3ad51ea9234b3d37026ee5f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/db125e8df4329bd45f2da405aab007f502f38531",
- "reference": "db125e8df4329bd45f2da405aab007f502f38531",
+ "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/818be8de6af4d16ef3ad51ea9234b3d37026ee5f",
+ "reference": "818be8de6af4d16ef3ad51ea9234b3d37026ee5f",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"require-dev": {
"phpunit/phpunit": "^8.5.14|^9"
@@ -10312,7 +10312,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2.x-dev"
+ "dev-master": "2.3.x-dev"
}
},
"autoload": {
@@ -10333,9 +10333,9 @@
}
],
"support": {
- "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.2.0"
+ "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.3.0"
},
- "time": "2024-12-28T10:00:03+00:00"
+ "time": "2024-12-30T10:35:04+00:00"
},
{
"name": "cloudcreativity/json-api-testing",
@@ -11147,16 +11147,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -11199,9 +11199,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
diff --git a/resources/assets/v1/src/locales/de.json b/resources/assets/v1/src/locales/de.json
index 46b17f4116..cfb4797d99 100644
--- a/resources/assets/v1/src/locales/de.json
+++ b/resources/assets/v1/src/locales/de.json
@@ -21,7 +21,7 @@
"apply_rules_checkbox": "Regeln anwenden",
"fire_webhooks_checkbox": "Webhooks abfeuern",
"no_budget_pointer": "Sie scheinen noch keine Budgets festgelegt zu haben. Sie sollten einige davon auf der Seite Budgets<\/a> anlegen. Budgets k\u00f6nnen Ihnen dabei helfen, den \u00dcberblick \u00fcber die Ausgaben zu behalten.",
- "no_bill_pointer": "Sie scheinen noch kein Abonnement zu haben. Sie sollten einige auf der Seite Abonnement<\/a> erstellen. Abonnements k\u00f6nnen Ihnen helfen, den \u00dcberblick \u00fcber Ihre Ausgaben zu behalten.",
+ "no_bill_pointer": "You seem to have no subscription yet. You should create some on the subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
"source_account": "Quellkonto",
"hidden_fields_preferences": "Sie k\u00f6nnen weitere Buchungsoptionen in Ihren Einstellungen<\/a> aktivieren.",
"destination_account": "Zielkonto",
@@ -36,7 +36,7 @@
"is_reconciled_fields_dropped": "Da diese Buchung abgeglichen ist, k\u00f6nnen Sie weder die Konten noch den\/die Betrag\/Betr\u00e4ge aktualisieren.",
"tags": "Schlagw\u00f6rter",
"no_budget": "(kein Budget)",
- "no_bill": "(kein Abonnement)",
+ "no_bill": "(no subscription)",
"category": "Kategorie",
"attachments": "Anh\u00e4nge",
"notes": "Notizen",
@@ -52,7 +52,7 @@
"destination_account_reconciliation": "Sie k\u00f6nnen das Zielkonto einer Kontenausgleichsbuchung nicht bearbeiten.",
"source_account_reconciliation": "Sie k\u00f6nnen das Quellkonto einer Kontenausgleichsbuchung nicht bearbeiten.",
"budget": "Budget",
- "bill": "Abonnement",
+ "bill": "Subscription",
"you_create_withdrawal": "Sie haben eine Ausgabe erstellt.",
"you_create_transfer": "Sie erstellen eine Umbuchung.",
"you_create_deposit": "Sie haben eine Einnahme erstellt.",
@@ -130,15 +130,15 @@
"response": "Antwort",
"visit_webhook_url": "Webhook-URL besuchen",
"reset_webhook_secret": "Webhook Secret zur\u00fccksetzen",
- "header_exchange_rates": "Wechselkurse",
- "exchange_rates_intro": "Firefly III unterst\u00fctzt das Herunterladen und Verwenden von Wechselkursen. Lesen Sie mehr dar\u00fcber in der Dokumentation<\/a>.",
- "exchange_rates_from_to": "Zwischen {from} und {to} (und umgekehrt)",
- "exchange_rates_intro_rates": "Firefly III verwendet die folgenden Wechselkurse. Der Kehrwert wird automatisch berechnet, wenn er nicht angegeben wurde. Wenn f\u00fcr das Datum der Transaktion kein Wechselkurs vorhanden ist, sucht Firefly III in der Vergangenheit nach einem Kurs. Wenn keine vorhanden sind, wird der Kurs \u201e1\u201c verwendet.",
- "header_exchange_rates_rates": "Wechselkurse",
- "header_exchange_rates_table": "Tabelle mit Wechselkursen",
- "help_rate_form": "An diesem Tag, wie viele {to} werden Sie f\u00fcr {from} bekommen?",
- "add_new_rate": "Neuen Wechselkurs hinzuf\u00fcgen",
- "save_new_rate": "Neuen Kurs speichern"
+ "header_exchange_rates": "Exchange rates",
+ "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.",
+ "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
+ "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.",
+ "header_exchange_rates_rates": "Exchange rates",
+ "header_exchange_rates_table": "Table with exchange rates",
+ "help_rate_form": "On this day, how many {to} will you get for one {from}?",
+ "add_new_rate": "Add a new exchange rate",
+ "save_new_rate": "Save new rate"
},
"form": {
"url": "URL",
@@ -158,7 +158,7 @@
"webhook_delivery": "Zustellung",
"from_currency_to_currency": "{from} → {to}",
"to_currency_from_currency": "{to} → {from}",
- "rate": "Kurs"
+ "rate": "Rate"
},
"list": {
"active": "Aktiv?",
diff --git a/resources/assets/v1/src/locales/nl.json b/resources/assets/v1/src/locales/nl.json
index ae4088faf6..b4dc805008 100644
--- a/resources/assets/v1/src/locales/nl.json
+++ b/resources/assets/v1/src/locales/nl.json
@@ -21,7 +21,7 @@
"apply_rules_checkbox": "Regels toepassen",
"fire_webhooks_checkbox": "Webhooks starten",
"no_budget_pointer": "Je hebt nog geen budgetten. Maak er een aantal op de budgetten<\/a>-pagina. Met budgetten kan je je uitgaven beter bijhouden.",
- "no_bill_pointer": "Je hebt nog geen abonnementen. Maak er een aantal op de abonnementenpagina<\/a>. Met abonnementen kan je uitgaven bijhouden.",
+ "no_bill_pointer": "You seem to have no subscription yet. You should create some on the subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
"source_account": "Bronrekening",
"hidden_fields_preferences": "Je kan meer transactieopties inschakelen in je instellingen<\/a>.",
"destination_account": "Doelrekening",
@@ -36,7 +36,7 @@
"is_reconciled_fields_dropped": "Omdat deze transactie al is afgestemd, kan je het bedrag noch de rekeningen wijzigen.",
"tags": "Tags",
"no_budget": "(geen budget)",
- "no_bill": "(geen abonnement)",
+ "no_bill": "(no subscription)",
"category": "Categorie",
"attachments": "Bijlagen",
"notes": "Notities",
@@ -52,7 +52,7 @@
"destination_account_reconciliation": "Je kan de doelrekening van een afstemming niet wijzigen.",
"source_account_reconciliation": "Je kan de bronrekening van een afstemming niet wijzigen.",
"budget": "Budget",
- "bill": "Abonnement",
+ "bill": "Subscription",
"you_create_withdrawal": "Je maakt een uitgave.",
"you_create_transfer": "Je maakt een overschrijving.",
"you_create_deposit": "Je maakt inkomsten.",
@@ -130,15 +130,15 @@
"response": "Reactie",
"visit_webhook_url": "Bezoek URL van webhook",
"reset_webhook_secret": "Reset webhook-geheim",
- "header_exchange_rates": "Wisselkoersen",
- "exchange_rates_intro": "Firefly III kan wisselkoersen downloaden en gebruiken. Lees hier meer over in de documentatie<\/a>.",
- "exchange_rates_from_to": "Tussen {from} en {to} (en andersom)",
- "exchange_rates_intro_rates": "Firefly III gebruikt de volgende wisselkoersen. De inverse berekent zichzelf als deze niet is opgegeven. Als er geen wisselkoers bestaat voor de datum van de transactie, gaat Firefly III terug in de tijd om er een te vinden. Als er geen aanwezig is, zal de koers \"1\" gebruikt worden.",
- "header_exchange_rates_rates": "Wisselkoersen",
- "header_exchange_rates_table": "Tabel met wisselkoersen",
- "help_rate_form": "Hoeveel {to} krijg je op deze dag voor \u00e9\u00e9n {from}?",
- "add_new_rate": "Nieuwe wisselkoers toevoegen",
- "save_new_rate": "Nieuwe wisselkoers opslaan"
+ "header_exchange_rates": "Exchange rates",
+ "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.",
+ "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
+ "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.",
+ "header_exchange_rates_rates": "Exchange rates",
+ "header_exchange_rates_table": "Table with exchange rates",
+ "help_rate_form": "On this day, how many {to} will you get for one {from}?",
+ "add_new_rate": "Add a new exchange rate",
+ "save_new_rate": "Save new rate"
},
"form": {
"url": "URL",
@@ -158,7 +158,7 @@
"webhook_delivery": "Bericht",
"from_currency_to_currency": "{from} → {to}",
"to_currency_from_currency": "{to} → {from}",
- "rate": "Wisselkoers"
+ "rate": "Rate"
},
"list": {
"active": "Actief?",
diff --git a/tests/integration/Api/Autocomplete/BillControllerTest.php b/tests/integration/Api/Autocomplete/BillControllerTest.php
index 11a69a1c23..134f3517e4 100644
--- a/tests/integration/Api/Autocomplete/BillControllerTest.php
+++ b/tests/integration/Api/Autocomplete/BillControllerTest.php
@@ -46,16 +46,18 @@ final class BillControllerTest extends TestCase
protected function createAuthenticatedUser(): User
{
- $userGroup = UserGroup::create(['title' => 'Test Group']);
+ $userGroup = UserGroup::create(['title' => 'Test Group']);
- $user= User::create([
+ $user = User::create([
'email' => 'test@email.com',
'password' => 'password',
]);
$user->user_group_id = $userGroup->id;
$user->save();
+
return $user;
}
+
private function createTestBills(int $count, User $user): void
{
for ($i = 1; $i <= $count; ++$i) {
diff --git a/tests/integration/Api/Autocomplete/BudgetControllerTest.php b/tests/integration/Api/Autocomplete/BudgetControllerTest.php
index b69157fe1e..542cc4fc70 100644
--- a/tests/integration/Api/Autocomplete/BudgetControllerTest.php
+++ b/tests/integration/Api/Autocomplete/BudgetControllerTest.php
@@ -46,14 +46,15 @@ final class BudgetControllerTest extends TestCase
protected function createAuthenticatedUser(): User
{
- $userGroup = UserGroup::create(['title' => 'Test Group']);
+ $userGroup = UserGroup::create(['title' => 'Test Group']);
- $user= User::create([
+ $user = User::create([
'email' => 'test@email.com',
'password' => 'password',
]);
$user->user_group_id = $userGroup->id;
$user->save();
+
return $user;
}
diff --git a/tests/integration/Api/Autocomplete/CategoryControllerTest.php b/tests/integration/Api/Autocomplete/CategoryControllerTest.php
index d360bbb000..7cdc632c9d 100644
--- a/tests/integration/Api/Autocomplete/CategoryControllerTest.php
+++ b/tests/integration/Api/Autocomplete/CategoryControllerTest.php
@@ -46,14 +46,15 @@ final class CategoryControllerTest extends TestCase
protected function createAuthenticatedUser(): User
{
- $userGroup = UserGroup::create(['title' => 'Test Group']);
+ $userGroup = UserGroup::create(['title' => 'Test Group']);
- $user= User::create([
+ $user = User::create([
'email' => 'test@email.com',
'password' => 'password',
]);
$user->user_group_id = $userGroup->id;
$user->save();
+
return $user;
}
diff --git a/tests/integration/Api/Autocomplete/CurrencyControllerTest.php b/tests/integration/Api/Autocomplete/CurrencyControllerTest.php
index cc1f64a56a..577dd57ac7 100644
--- a/tests/integration/Api/Autocomplete/CurrencyControllerTest.php
+++ b/tests/integration/Api/Autocomplete/CurrencyControllerTest.php
@@ -30,7 +30,6 @@ use Tests\integration\TestCase;
use FireflyIII\User;
use FireflyIII\Models\UserGroup;
-
/**
* Class CurrencyControllerTest
*
@@ -38,7 +37,8 @@ use FireflyIII\Models\UserGroup;
*
* @coversNothing
*/
-final class CurrencyControllerTest extends TestCase {
+final class CurrencyControllerTest extends TestCase
+{
/**
* @covers \FireflyIII\Api\V1\Controllers\Autocomplete\CurrencyController
*/
@@ -46,15 +46,16 @@ final class CurrencyControllerTest extends TestCase {
protected function createAuthenticatedUser(): User
{
- $userGroup = UserGroup::create(['title' => 'Test Group']);
+ $userGroup = UserGroup::create(['title' => 'Test Group']);
- $user= User::create([
+ $user = User::create([
'email' => 'test@email.com',
'password' => 'password',
]);
$user->user_group_id = $userGroup->id;
$user->save();
+
return $user;
}
@@ -62,11 +63,11 @@ final class CurrencyControllerTest extends TestCase {
{
for ($i = 1; $i <= $count; ++$i) {
$currency = TransactionCurrency::create([
- 'name' => 'Currency '.$i,
- 'code' => 'CUR'.$i,
- 'symbol' => 'C'.$i,
+ 'name' => 'Currency '.$i,
+ 'code' => 'CUR'.$i,
+ 'symbol' => 'C'.$i,
'decimal_places' => $i,
- 'enabled' => $enabled
+ 'enabled' => $enabled,
]);
}
}
@@ -162,13 +163,11 @@ final class CurrencyControllerTest extends TestCase {
$response->assertJsonCount(1);
-}
-
-
+ }
public function testGivenAuthenticatedRequestWhenCallingTheCurrenciesEndpointWithQueryThenReturnsCurrenciesThatMatchQuery(): void
{
- $user = $this->createAuthenticatedUser();
+ $user = $this->createAuthenticatedUser();
$this->actingAs($user);
$this->createTestCurrencies(20, true);
@@ -178,9 +177,7 @@ final class CurrencyControllerTest extends TestCase {
]), ['Accept' => 'application/json']);
$response->assertStatus(200);
$response->assertHeader('Content-Type', 'application/json');
- // Currency 1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 (11)
+ // Currency 1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 (11)
$response->assertJsonCount(11);
}
-
-
-}
\ No newline at end of file
+}
diff --git a/tests/integration/Api/Autocomplete/ObjectGroupControllerTest.php b/tests/integration/Api/Autocomplete/ObjectGroupControllerTest.php
index b68912450e..189290e319 100644
--- a/tests/integration/Api/Autocomplete/ObjectGroupControllerTest.php
+++ b/tests/integration/Api/Autocomplete/ObjectGroupControllerTest.php
@@ -37,26 +37,28 @@ use FireflyIII\Models\UserGroup;
*
* @coversNothing
*/
-final class ObjectGroupControllerTest extends TestCase {
+final class ObjectGroupControllerTest extends TestCase
+{
/**
* @covers \FireflyIII\Api\V1\Controllers\Autocomplete\ObjectGroupController
*/
use RefreshDatabase;
+
protected function createAuthenticatedUser(): User
{
- $userGroup = UserGroup::create(['title' => 'Test Group']);
+ $userGroup = UserGroup::create(['title' => 'Test Group']);
- $user= User::create([
+ $user = User::create([
'email' => 'test@email.com',
'password' => 'password',
]);
$user->user_group_id = $userGroup->id;
$user->save();
+
return $user;
}
-
private function createTestObjectGroups(int $count, User $user): void
{
for ($i = 1; $i <= $count; ++$i) {
@@ -89,7 +91,6 @@ final class ObjectGroupControllerTest extends TestCase {
$response->assertHeader('Content-Type', 'application/json');
}
-
public function testGivenAuthenticatedRequestWhenCallingTheObjectGroupsEndpointThenReturnsObjectGroups(): void
{
$user = $this->createAuthenticatedUser();
@@ -105,7 +106,7 @@ final class ObjectGroupControllerTest extends TestCase {
'*' => [
'id',
'name',
- 'title'
+ 'title',
],
]);
}
@@ -152,6 +153,4 @@ final class ObjectGroupControllerTest extends TestCase {
$response->assertJsonCount(11);
$response->assertJsonMissing(['name' => 'Object Group 2']);
}
-
-
-}
\ No newline at end of file
+}