diff --git a/app/Console/Commands/CreateImport.php b/app/Console/Commands/CreateImport.php
index 851b6ee98e..b29d83e291 100644
--- a/app/Console/Commands/CreateImport.php
+++ b/app/Console/Commands/CreateImport.php
@@ -25,7 +25,6 @@ namespace FireflyIII\Console\Commands;
use Artisan;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Import\Logging\CommandHandler;
-use FireflyIII\Import\Routine\ImportRoutine;
use FireflyIII\Import\Routine\RoutineInterface;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
@@ -75,6 +74,7 @@ class CreateImport extends Command
*
* @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped
* @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five exactly.
+ *
* @throws FireflyException
*/
public function handle()
@@ -133,7 +133,7 @@ class CreateImport extends Command
$monolog->pushHandler($handler);
// start the actual routine:
- $type = $job->file_type === 'csv' ? 'file' : $job->file_type;
+ $type = 'csv' === $job->file_type ? 'file' : $job->file_type;
$key = sprintf('import.routine.%s', $type);
$className = config($key);
if (null === $className || !class_exists($className)) {
diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php
index e3ff9dbc60..5f156c3e1f 100644
--- a/app/Console/Commands/Import.php
+++ b/app/Console/Commands/Import.php
@@ -24,7 +24,6 @@ namespace FireflyIII\Console\Commands;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Import\Logging\CommandHandler;
-use FireflyIII\Import\Routine\ImportRoutine;
use FireflyIII\Import\Routine\RoutineInterface;
use FireflyIII\Models\ImportJob;
use Illuminate\Console\Command;
@@ -60,6 +59,8 @@ class Import extends Command
/**
* Run the import routine.
+ *
+ * @throws FireflyException
*/
public function handle()
{
@@ -84,7 +85,7 @@ class Import extends Command
$monolog->pushHandler($handler);
// actually start job:
- $type = $job->file_type === 'csv' ? 'file' : $job->file_type;
+ $type = 'csv' === $job->file_type ? 'file' : $job->file_type;
$key = sprintf('import.routine.%s', $type);
$className = config($key);
if (null === $className || !class_exists($className)) {
diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php
index 93b7c11517..3e29848440 100644
--- a/app/Console/Commands/UpgradeDatabase.php
+++ b/app/Console/Commands/UpgradeDatabase.php
@@ -26,8 +26,6 @@ use DB;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountMeta;
use FireflyIII\Models\AccountType;
-
-use FireflyIII\Models\LimitRepetition;
use FireflyIII\Models\Note;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionCurrency;
diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php
index a4d79f3f7a..e11b69159e 100644
--- a/app/Console/Commands/VerifyDatabase.php
+++ b/app/Console/Commands/VerifyDatabase.php
@@ -111,10 +111,10 @@ class VerifyDatabase extends Command
$token = $user->generateAccessToken();
Preferences::setForUser($user, 'access_token', $token);
$this->line(sprintf('Generated access token for user %s', $user->email));
- $count++;
+ ++$count;
}
}
- if ($count === 0) {
+ if (0 === $count) {
$this->info('All access tokens OK!');
}
}
@@ -138,12 +138,12 @@ class VerifyDatabase extends Command
$link->name = $name;
$link->outward = $values[0];
$link->inward = $values[1];
- $count++;
+ ++$count;
}
$link->editable = false;
$link->save();
}
- if ($count === 0) {
+ if (0 === $count) {
$this->info('All link types OK!');
}
}
@@ -158,7 +158,7 @@ class VerifyDatabase extends Command
->get(['transaction_journal_id', DB::raw('SUM(amount) AS the_sum')]);
/** @var stdClass $entry */
foreach ($journals as $entry) {
- if (bccomp(strval($entry->the_sum), '0') !== 0) {
+ if (0 !== bccomp(strval($entry->the_sum), '0')) {
$errored[] = $entry->transaction_journal_id;
}
}
@@ -167,14 +167,14 @@ class VerifyDatabase extends Command
$res = Transaction::whereNull('deleted_at')->where('transaction_journal_id', $journalId)->groupBy('amount')->get([DB::raw('MIN(id) as first_id')]);
$ids = $res->pluck('first_id')->toArray();
DB::table('transactions')->whereIn('id', $ids)->update(['amount' => DB::raw('amount * -1')]);
- $count++;
+ ++$count;
// report about it
/** @var TransactionJournal $journal */
$journal = TransactionJournal::find($journalId);
if (is_null($journal)) {
continue;
}
- if ($journal->transactionType->type === TransactionType::OPENING_BALANCE) {
+ if (TransactionType::OPENING_BALANCE === $journal->transactionType->type) {
$this->error(
sprintf(
'Transaction #%d was stored incorrectly. One of your asset accounts may show the wrong balance. Please visit /transactions/show/%d to verify the opening balance.',
@@ -182,7 +182,7 @@ class VerifyDatabase extends Command
)
);
}
- if ($journal->transactionType->type !== TransactionType::OPENING_BALANCE) {
+ if (TransactionType::OPENING_BALANCE !== $journal->transactionType->type) {
$this->error(
sprintf(
'Transaction #%d was stored incorrectly. Could be that the transaction shows the wrong amount. Please visit /transactions/show/%d to verify the opening balance.',
@@ -191,7 +191,7 @@ class VerifyDatabase extends Command
);
}
}
- if ($count === 0) {
+ if (0 === $count) {
$this->info('Amount integrity OK!');
}
@@ -371,9 +371,9 @@ class VerifyDatabase extends Command
'Error: Transaction #' . $entry->transaction_id . ' should have been deleted, but has not.' .
' Find it in the table called "transactions" and change the "deleted_at" field to: "' . $entry->journal_deleted . '"'
);
- $count++;
+ ++$count;
}
- if ($count === 0) {
+ if (0 === $count) {
$this->info('No orphaned transactions!');
}
}
@@ -393,9 +393,9 @@ class VerifyDatabase extends Command
$this->error(
'Error: Journal #' . $entry->id . ' has zero transactions. Open table "transaction_journals" and delete the entry with id #' . $entry->id
);
- $count++;
+ ++$count;
}
- if ($count === 0) {
+ if (0 === $count) {
$this->info('No orphaned journals!');
}
}
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index bc8d1de2ed..f5e1097fb7 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -81,6 +81,7 @@ class Handler extends ExceptionHandler
* @param \Exception $exception
*
* @return mixed|void
+ *
* @throws Exception
*/
public function report(Exception $exception)
diff --git a/app/Export/Exporter/CsvExporter.php b/app/Export/Exporter/CsvExporter.php
index ce16d38886..c45fe3e605 100644
--- a/app/Export/Exporter/CsvExporter.php
+++ b/app/Export/Exporter/CsvExporter.php
@@ -52,6 +52,7 @@ class CsvExporter extends BasicExporter implements ExporterInterface
/**
* @return bool
+ *
* @throws \TypeError
*/
public function run(): bool
diff --git a/app/Generator/Report/Account/MonthReportGenerator.php b/app/Generator/Report/Account/MonthReportGenerator.php
index 2d925895ef..76ff55629b 100644
--- a/app/Generator/Report/Account/MonthReportGenerator.php
+++ b/app/Generator/Report/Account/MonthReportGenerator.php
@@ -31,7 +31,6 @@ use Illuminate\Support\Collection;
*/
class MonthReportGenerator implements ReportGeneratorInterface
{
-
/** @var Collection */
private $accounts;
/** @var Carbon */
@@ -43,6 +42,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
/**
* @return string
+ *
* @throws \Throwable
*/
public function generate(): string
diff --git a/app/Generator/Report/Account/MultiYearReportGenerator.php b/app/Generator/Report/Account/MultiYearReportGenerator.php
index cae81a2055..690891b8e1 100644
--- a/app/Generator/Report/Account/MultiYearReportGenerator.php
+++ b/app/Generator/Report/Account/MultiYearReportGenerator.php
@@ -32,7 +32,8 @@ class MultiYearReportGenerator extends MonthReportGenerator
/**
* @return string
*/
- protected function preferredPeriod(): string {
+ protected function preferredPeriod(): string
+ {
return 'year';
}
}
diff --git a/app/Generator/Report/Account/YearReportGenerator.php b/app/Generator/Report/Account/YearReportGenerator.php
index 16197dfd07..f5031da9e2 100644
--- a/app/Generator/Report/Account/YearReportGenerator.php
+++ b/app/Generator/Report/Account/YearReportGenerator.php
@@ -32,7 +32,8 @@ class YearReportGenerator extends MonthReportGenerator
/**
* @return string
*/
- protected function preferredPeriod(): string {
+ protected function preferredPeriod(): string
+ {
return 'month';
}
}
diff --git a/app/Generator/Report/Standard/MonthReportGenerator.php b/app/Generator/Report/Standard/MonthReportGenerator.php
index 7cb7d8e0e3..c8f14e8923 100644
--- a/app/Generator/Report/Standard/MonthReportGenerator.php
+++ b/app/Generator/Report/Standard/MonthReportGenerator.php
@@ -41,6 +41,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
/**
* @return string
+ *
* @throws \Throwable
*/
public function generate(): string
diff --git a/app/Generator/Report/Standard/MultiYearReportGenerator.php b/app/Generator/Report/Standard/MultiYearReportGenerator.php
index 7071239b0e..7ddff3dfa5 100644
--- a/app/Generator/Report/Standard/MultiYearReportGenerator.php
+++ b/app/Generator/Report/Standard/MultiYearReportGenerator.php
@@ -40,6 +40,7 @@ class MultiYearReportGenerator implements ReportGeneratorInterface
/**
* @return string
+ *
* @throws \Throwable
*/
public function generate(): string
diff --git a/app/Generator/Report/Standard/YearReportGenerator.php b/app/Generator/Report/Standard/YearReportGenerator.php
index 0c99339a84..258478c44a 100644
--- a/app/Generator/Report/Standard/YearReportGenerator.php
+++ b/app/Generator/Report/Standard/YearReportGenerator.php
@@ -40,6 +40,7 @@ class YearReportGenerator implements ReportGeneratorInterface
/**
* @return string
+ *
* @throws \Throwable
*/
public function generate(): string
diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php
index 031f831f35..6fcb3428eb 100644
--- a/app/Handlers/Events/UserEventHandler.php
+++ b/app/Handlers/Events/UserEventHandler.php
@@ -86,7 +86,7 @@ class UserEventHandler
return true;
}
// user is only user but has admin role
- if ($count === 1 && $user->hasRole('owner')) {
+ if (1 === $count && $user->hasRole('owner')) {
Log::debug(sprintf('User #%d is only user but has role owner so all is well.', $user->id));
return true;
diff --git a/app/Helpers/Collection/BillLine.php b/app/Helpers/Collection/BillLine.php
index 8da26845e6..180aefa3be 100644
--- a/app/Helpers/Collection/BillLine.php
+++ b/app/Helpers/Collection/BillLine.php
@@ -41,40 +41,14 @@ class BillLine
/** @var string */
protected $min;
/** @var Carbon */
+ private $endOfPayDate;
+ /** @var Carbon */
private $lastHitDate;
/** @var Carbon */
private $payDate;
- /** @var Carbon */
- private $endOfPayDate;
/** @var int */
private $transactionJournalId;
- /**
- * @return Carbon
- */
- public function getPayDate(): Carbon
- {
- return $this->payDate;
- }
-
- /**
- * @return Carbon
- */
- public function getEndOfPayDate(): Carbon
- {
- return $this->endOfPayDate;
- }
-
- /**
- * @param Carbon $endOfPayDate
- */
- public function setEndOfPayDate(Carbon $endOfPayDate): void
- {
- $this->endOfPayDate = $endOfPayDate;
- }
-
-
-
/**
* BillLine constructor.
*/
@@ -115,6 +89,22 @@ class BillLine
$this->bill = $bill;
}
+ /**
+ * @return Carbon
+ */
+ public function getEndOfPayDate(): Carbon
+ {
+ return $this->endOfPayDate;
+ }
+
+ /**
+ * @param Carbon $endOfPayDate
+ */
+ public function setEndOfPayDate(Carbon $endOfPayDate): void
+ {
+ $this->endOfPayDate = $endOfPayDate;
+ }
+
/**
* @return Carbon
*/
@@ -163,6 +153,22 @@ class BillLine
$this->min = $min;
}
+ /**
+ * @return Carbon
+ */
+ public function getPayDate(): Carbon
+ {
+ return $this->payDate;
+ }
+
+ /**
+ * @param Carbon $payDate
+ */
+ public function setPayDate(Carbon $payDate): void
+ {
+ $this->payDate = $payDate;
+ }
+
/**
* @return int
*/
@@ -202,12 +208,4 @@ class BillLine
{
$this->hit = $hit;
}
-
- /**
- * @param Carbon $payDate
- */
- public function setPayDate(Carbon $payDate): void
- {
- $this->payDate = $payDate;
- }
}
diff --git a/app/Helpers/Collector/JournalCollectorInterface.php b/app/Helpers/Collector/JournalCollectorInterface.php
index f1d122d688..ce0def29a7 100644
--- a/app/Helpers/Collector/JournalCollectorInterface.php
+++ b/app/Helpers/Collector/JournalCollectorInterface.php
@@ -85,13 +85,6 @@ interface JournalCollectorInterface
*/
public function removeFilter(string $filter): JournalCollectorInterface;
- /**
- * @param Collection $accounts
- *
- * @return JournalCollectorInterface
- */
- public function setOpposingAccounts(Collection $accounts): JournalCollectorInterface;
-
/**
* @param Collection $accounts
*
@@ -167,6 +160,13 @@ interface JournalCollectorInterface
*/
public function setOffset(int $offset): JournalCollectorInterface;
+ /**
+ * @param Collection $accounts
+ *
+ * @return JournalCollectorInterface
+ */
+ public function setOpposingAccounts(Collection $accounts): JournalCollectorInterface;
+
/**
* @param int $page
*
diff --git a/app/Helpers/Filter/FilterInterface.php b/app/Helpers/Filter/FilterInterface.php
index 4155bcde8d..e1ed2ed163 100644
--- a/app/Helpers/Filter/FilterInterface.php
+++ b/app/Helpers/Filter/FilterInterface.php
@@ -26,8 +26,6 @@ use Illuminate\Support\Collection;
/**
* Interface FilterInterface
- *
- * @package FireflyIII\Helpers\Filter
*/
interface FilterInterface
{
diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php
index 40297dc69f..210e4683d4 100644
--- a/app/Helpers/Report/ReportHelper.php
+++ b/app/Helpers/Report/ReportHelper.php
@@ -79,12 +79,12 @@ class ReportHelper implements ReportHelperInterface
/** @var Bill $bill */
foreach ($bills as $bill) {
$expectedDates = $repository->getPayDatesInRange($bill, $start, $end);
- foreach($expectedDates as $payDate) {
+ foreach ($expectedDates as $payDate) {
$endOfPayPeriod = app('navigation')->endOfX($payDate, $bill->repeat_freq, null);
- $collector = app(JournalCollectorInterface::class);
+ $collector = app(JournalCollectorInterface::class);
$collector->setAccounts($accounts)->setRange($payDate, $endOfPayPeriod)->setBills($bills);
- $journals = $collector->getJournals();
+ $journals = $collector->getJournals();
$billLine = new BillLine;
$billLine->setBill($bill);
diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php
index 897e4b9dee..9c810fc77a 100644
--- a/app/Http/Controllers/Account/ReconcileController.php
+++ b/app/Http/Controllers/Account/ReconcileController.php
@@ -43,6 +43,7 @@ use Session;
/**
* Class ReconcileController.
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class ReconcileController extends Controller
@@ -72,7 +73,7 @@ class ReconcileController extends Controller
*/
public function edit(TransactionJournal $journal)
{
- if ($journal->transactionType->type !== TransactionType::RECONCILIATION) {
+ if (TransactionType::RECONCILIATION !== $journal->transactionType->type) {
return redirect(route('transactions.edit', [$journal->id]));
}
// view related code
@@ -99,7 +100,6 @@ class ReconcileController extends Controller
'accounts.reconcile.edit',
compact('journal', 'subTitle')
)->with('data', $preFilled);
-
}
/**
@@ -166,6 +166,7 @@ class ReconcileController extends Controller
* @param Carbon|null $end
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
+ *
* @throws FireflyException
*/
public function reconcile(Account $account, Carbon $start = null, Carbon $end = null)
@@ -226,7 +227,7 @@ class ReconcileController extends Controller
*/
public function show(JournalRepositoryInterface $repository, TransactionJournal $journal)
{
- if ($journal->transactionType->type !== TransactionType::RECONCILIATION) {
+ if (TransactionType::RECONCILIATION !== $journal->transactionType->type) {
return redirect(route('transactions.show', [$journal->id]));
}
$subTitle = trans('firefly.reconciliation') . ' "' . $journal->description . '"';
@@ -235,7 +236,6 @@ class ReconcileController extends Controller
$transaction = $repository->getAssetTransaction($journal);
$account = $transaction->account;
-
return view('accounts.reconcile.show', compact('journal', 'subTitle', 'transaction', 'account'));
}
@@ -297,6 +297,7 @@ class ReconcileController extends Controller
* @param Carbon $end
*
* @return mixed
+ *
* @throws \Throwable
* @throws FireflyException
*/
@@ -346,10 +347,10 @@ class ReconcileController extends Controller
*/
public function update(ReconciliationFormRequest $request, AccountRepositoryInterface $repository, TransactionJournal $journal)
{
- if ($journal->transactionType->type !== TransactionType::RECONCILIATION) {
+ if (TransactionType::RECONCILIATION !== $journal->transactionType->type) {
return redirect(route('transactions.show', [$journal->id]));
}
- if (bccomp('0', $request->get('amount')) === 0) {
+ if (0 === bccomp('0', $request->get('amount'))) {
Session::flash('error', trans('firefly.amount_cannot_be_zero'));
return redirect(route('accounts.reconcile.edit', [$journal->id]))->withInput();
@@ -368,10 +369,8 @@ class ReconcileController extends Controller
// redirect to previous URL.
return redirect($this->getPreviousUri('reconcile.edit.uri'));
-
}
-
/**
* @param Account $account
*
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index e098741689..8ef77b6326 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -152,6 +152,7 @@ class AccountController extends Controller
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*
* @return View
+ *
* @throws FireflyException
* @throws FireflyException
* @throws FireflyException
@@ -229,9 +230,9 @@ class AccountController extends Controller
$types = config('firefly.accountTypesByIdentifier.' . $what);
$collection = $repository->getAccountsByType($types);
$total = $collection->count();
- $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
+ $page = 0 === intval($request->get('page')) ? 1 : intval($request->get('page'));
$pageSize = intval(Preferences::get('listPageSize', 50)->data);
- $accounts = $collection->slice(($page-1) * $pageSize, $pageSize);
+ $accounts = $collection->slice(($page - 1) * $pageSize, $pageSize);
unset($collection);
/** @var Carbon $start */
$start = clone session('start', Carbon::now()->startOfMonth());
@@ -272,6 +273,7 @@ class AccountController extends Controller
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity) // long and complex but not that excessively so.
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ *
* @throws FireflyException
*/
public function show(Request $request, JournalRepositoryInterface $repository, Account $account, string $moment = '')
diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php
index 55a5265475..fd4832b7fa 100644
--- a/app/Http/Controllers/Admin/HomeController.php
+++ b/app/Http/Controllers/Admin/HomeController.php
@@ -45,7 +45,6 @@ class HomeController extends Controller
$this->middleware(IsSandStormUser::class)->except(['index']);
}
-
/**
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php
index 032cfd88cb..0955f00521 100644
--- a/app/Http/Controllers/Admin/LinkController.php
+++ b/app/Http/Controllers/Admin/LinkController.php
@@ -24,7 +24,6 @@ namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsDemoUser;
-use FireflyIII\Http\Middleware\IsSandStormUser;
use FireflyIII\Http\Requests\LinkTypeFormRequest;
use FireflyIII\Models\LinkType;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php
index cb914191eb..6407760e55 100644
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Http/Controllers/AttachmentController.php
@@ -149,6 +149,7 @@ class AttachmentController extends Controller
* @param Attachment $attachment
*
* @return \Illuminate\Http\Response
+ *
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function preview(Attachment $attachment)
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 45f273a65d..46f24a243f 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -65,6 +65,7 @@ class LoginController extends Controller
* @param Request $request
*
* @return \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response|void
+ *
* @throws \Illuminate\Validation\ValidationException
*/
public function login(Request $request)
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 39dff86f73..f2ebccb86e 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -41,7 +41,6 @@ use Session;
*/
class RegisterController extends Controller
{
-
use RegistersUsers;
/**
diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php
index cf1f122d0f..d6b984b756 100644
--- a/app/Http/Controllers/Auth/TwoFactorController.php
+++ b/app/Http/Controllers/Auth/TwoFactorController.php
@@ -69,7 +69,6 @@ class TwoFactorController extends Controller
/**
* @return mixed
- *
*/
public function lostTwoFactor()
{
diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php
index 7286a09551..3c6b01cb5e 100644
--- a/app/Http/Controllers/BillController.php
+++ b/app/Http/Controllers/BillController.php
@@ -246,7 +246,6 @@ class BillController extends Controller
$transactions = $collector->getPaginatedJournals();
$transactions->setPath(route('bills.show', [$bill->id]));
-
$bill->paidDates = $repository->getPaidDatesInRange($bill, $date, $end);
$bill->payDates = $repository->getPayDatesInRange($bill, $date, $end);
$lastPaidDate = $this->lastPaidDate($repository->getPaidDatesInRange($bill, $date, $end), $date);
@@ -274,7 +273,6 @@ class BillController extends Controller
$request->session()->flash('success', strval(trans('firefly.stored_new_bill', ['name' => $bill->name])));
Preferences::mark();
-
/** @var array $files */
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
$this->attachments->saveAttachmentsForModel($bill, $files);
@@ -341,7 +339,7 @@ class BillController extends Controller
*/
private function lastPaidDate(Collection $dates, Carbon $default): Carbon
{
- if ($dates->count() === 0) {
+ if (0 === $dates->count()) {
return $default; // @codeCoverageIgnore
}
$latest = $dates->first();
@@ -353,6 +351,5 @@ class BillController extends Controller
}
return $latest;
-
}
}
diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index 9d6b36ef78..3b2bdafec1 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -85,7 +85,7 @@ class BudgetController extends Controller
$start = Carbon::createFromFormat('Y-m-d', $request->get('start'));
$end = Carbon::createFromFormat('Y-m-d', $request->get('end'));
$budgetLimit = $this->repository->updateLimitAmount($budget, $start, $end, $amount);
- if (bccomp($amount, '0') === 0) {
+ if (0 === bccomp($amount, '0')) {
$budgetLimit = null;
}
@@ -302,7 +302,7 @@ class BudgetController extends Controller
$currentStart = app('navigation')->addPeriod($currentStart, $range, 0);
++$count;
}
- if ($count === 0) {
+ if (0 === $count) {
$count = 1; // @codeCoverageIgnore
}
$result['available'] = bcdiv($total, strval($count));
diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php
index 17b5d4d608..81402b25d9 100644
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
-use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
@@ -341,7 +340,6 @@ class AccountController extends Controller
* @param Carbon $start
*
* @return \Illuminate\Http\JsonResponse
- *
*/
public function period(Account $account, Carbon $start)
{
diff --git a/app/Http/Controllers/Chart/ExpenseReportController.php b/app/Http/Controllers/Chart/ExpenseReportController.php
index 59e9b9150c..ed9e3f98ac 100644
--- a/app/Http/Controllers/Chart/ExpenseReportController.php
+++ b/app/Http/Controllers/Chart/ExpenseReportController.php
@@ -63,7 +63,6 @@ class ExpenseReportController extends Controller
);
}
-
/**
* @param Collection $accounts
* @param Collection $expense
@@ -74,7 +73,6 @@ class ExpenseReportController extends Controller
*/
public function mainChart(Collection $accounts, Collection $expense, Carbon $start, Carbon $end)
{
-
$cache = new CacheProperties;
$cache->addProperty('chart.expense.report.main');
$cache->addProperty($accounts);
@@ -82,7 +80,7 @@ class ExpenseReportController extends Controller
$cache->addProperty($start);
$cache->addProperty($end);
if ($cache->has()) {
- return Response::json($cache->get()); // @codeCoverageIgnore
+ return Response::json($cache->get()); // @codeCoverageIgnore
}
$format = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index a5025bde2c..59cac90dc8 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -104,7 +104,7 @@ class HomeController extends Controller
*/
public function displayDebug(Request $request)
{
- $phpVersion = str_replace('~','\~',PHP_VERSION);
+ $phpVersion = str_replace('~', '\~', PHP_VERSION);
$phpOs = php_uname();
$interface = PHP_SAPI;
$now = Carbon::create()->format('Y-m-d H:i:s e');
diff --git a/app/Http/Controllers/Import/ConfigurationController.php b/app/Http/Controllers/Import/ConfigurationController.php
index a296234261..08798efaad 100644
--- a/app/Http/Controllers/Import/ConfigurationController.php
+++ b/app/Http/Controllers/Import/ConfigurationController.php
@@ -18,12 +18,10 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Import;
-
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsDemoUser;
@@ -66,6 +64,7 @@ class ConfigurationController extends Controller
* @param ImportJob $job
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
+ *
* @throws FireflyException
*/
public function index(ImportJob $job)
@@ -95,6 +94,7 @@ class ConfigurationController extends Controller
* @param ImportJob $job
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+ *
* @throws FireflyException
*/
public function post(Request $request, ImportJob $job)
@@ -141,4 +141,4 @@ class ConfigurationController extends Controller
return $configurator;
}
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/Import/IndexController.php b/app/Http/Controllers/Import/IndexController.php
index 26bcb6a38a..730f533ba0 100644
--- a/app/Http/Controllers/Import/IndexController.php
+++ b/app/Http/Controllers/Import/IndexController.php
@@ -18,16 +18,13 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
-
namespace FireflyIII\Http\Controllers\Import;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsDemoUser;
-use FireflyIII\Import\Routine\ImportRoutine;
use FireflyIII\Import\Routine\RoutineInterface;
use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
@@ -61,7 +58,7 @@ class IndexController extends Controller
}
);
- $this->middleware(IsDemoUser::class)->except(['create','index']);
+ $this->middleware(IsDemoUser::class)->except(['create', 'index']);
}
/**
@@ -70,11 +67,12 @@ class IndexController extends Controller
* @param string $bank
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+ *
* @throws FireflyException
*/
public function create(string $bank)
{
- if (!(config(sprintf('import.enabled.%s', $bank))) === true) {
+ if (true === !(config(sprintf('import.enabled.%s', $bank)))) {
throw new FireflyException(sprintf('Cannot import from "%s" at this time.', $bank));
}
@@ -82,7 +80,6 @@ class IndexController extends Controller
// from here, always go to configure step.
return redirect(route('import.configure', [$importJob->key]));
-
}
/**
@@ -139,11 +136,11 @@ class IndexController extends Controller
* @param ImportJob $job
*
* @return \Illuminate\Http\JsonResponse
+ *
* @throws FireflyException
*/
public function start(ImportJob $job)
{
-
$type = $job->file_type;
$key = sprintf('import.routine.%s', $type);
$className = config($key);
@@ -162,5 +159,4 @@ class IndexController extends Controller
throw new FireflyException('Job did not complete successfully. Please review the log files.');
}
-
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/Import/PrerequisitesController.php b/app/Http/Controllers/Import/PrerequisitesController.php
index e7b46c4f7d..4d8ef3e5f3 100644
--- a/app/Http/Controllers/Import/PrerequisitesController.php
+++ b/app/Http/Controllers/Import/PrerequisitesController.php
@@ -18,12 +18,10 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Import;
-
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Import\Prerequisites\PrerequisitesInterface;
@@ -43,11 +41,12 @@ class PrerequisitesController extends Controller
* @param string $bank
*
* @return \Illuminate\Http\RedirectResponse|null
+ *
* @throws FireflyException
*/
public function index(string $bank)
{
- if (!(config(sprintf('import.enabled.%s', $bank))) === true) {
+ if (true === !(config(sprintf('import.enabled.%s', $bank)))) {
throw new FireflyException(sprintf('Cannot import from "%s" at this time.', $bank));
}
$class = strval(config(sprintf('import.prerequisites.%s', $bank)));
@@ -83,6 +82,7 @@ class PrerequisitesController extends Controller
* @param string $bank
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+ *
* @throws FireflyException
*/
public function post(Request $request, string $bank)
@@ -112,6 +112,4 @@ class PrerequisitesController extends Controller
return redirect(route('import.create-job', [$bank]));
}
-
-
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/Import/StatusController.php b/app/Http/Controllers/Import/StatusController.php
index 93fe690316..728f3fe976 100644
--- a/app/Http/Controllers/Import/StatusController.php
+++ b/app/Http/Controllers/Import/StatusController.php
@@ -18,12 +18,10 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Import;
-
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
@@ -34,7 +32,6 @@ use Response;
*/
class StatusController extends Controller
{
-
/**
*
*/
@@ -115,5 +112,4 @@ class StatusController extends Controller
return Response::json($result);
}
-
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php
index e6d900bad7..afdbd59db9 100644
--- a/app/Http/Controllers/JavascriptController.php
+++ b/app/Http/Controllers/JavascriptController.php
@@ -88,7 +88,6 @@ class JavascriptController extends Controller
/**
* @param Request $request
- *
* @param AccountRepositoryInterface $repository
* @param CurrencyRepositoryInterface $currencyRepository
*
@@ -141,7 +140,7 @@ class JavascriptController extends Controller
$end = session('end');
$first = session('first');
$title = sprintf('%s - %s', $start->formatLocalized($this->monthAndDayFormat), $end->formatLocalized($this->monthAndDayFormat));
- $isCustom = session('is_custom_range', false) === true;
+ $isCustom = true === session('is_custom_range', false);
$today = new Carbon;
$ranges = [
// first range is the current range:
@@ -182,7 +181,6 @@ class JavascriptController extends Controller
$index = strval(trans('firefly.everything'));
$ranges[$index] = [$first, new Carbon];
-
$return = [
'title' => $title,
'configuration' => [
diff --git a/app/Http/Controllers/Json/FrontpageController.php b/app/Http/Controllers/Json/FrontpageController.php
index fa95776484..f2d549bf6d 100644
--- a/app/Http/Controllers/Json/FrontpageController.php
+++ b/app/Http/Controllers/Json/FrontpageController.php
@@ -36,6 +36,7 @@ class FrontpageController extends Controller
* @param PiggyBankRepositoryInterface $repository
*
* @return \Illuminate\Http\JsonResponse
+ *
* @throws \Throwable
*/
public function piggyBanks(PiggyBankRepositoryInterface $repository)
diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php
index 8ade385a4f..98f5ca62b4 100644
--- a/app/Http/Controllers/JsonController.php
+++ b/app/Http/Controllers/JsonController.php
@@ -46,6 +46,7 @@ class JsonController extends Controller
* @param Request $request
*
* @return \Illuminate\Http\JsonResponse
+ *
* @throws \Throwable
*/
public function action(Request $request)
@@ -121,6 +122,7 @@ class JsonController extends Controller
* @param Request $request
*
* @return \Illuminate\Http\JsonResponse
+ *
* @throws \Throwable
*/
public function trigger(Request $request)
diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php
index 95190c7373..66cce45402 100644
--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -395,7 +395,6 @@ class PiggyBankController extends Controller
}
$piggyBank = $repository->store($data);
-
Session::flash('success', strval(trans('firefly.stored_piggy_bank', ['name' => $piggyBank->name])));
Preferences::mark();
diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php
index 62daa28097..0ea735d098 100644
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -71,6 +71,7 @@ class PreferencesController extends Controller
/**
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+ *
* @throws \Exception
* @throws \Exception
*/
@@ -91,19 +92,19 @@ class PreferencesController extends Controller
*/
public function index(AccountRepositoryInterface $repository)
{
- $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
- $viewRangePref = Preferences::get('viewRange', '1M');
- $viewRange = $viewRangePref->data;
- $frontPageAccounts = Preferences::get('frontPageAccounts', []);
- $language = Preferences::get('language', config('firefly.default_language', 'en_US'))->data;
- $listPageSize = Preferences::get('listPageSize', 50)->data;
- $customFiscalYear = Preferences::get('customFiscalYear', 0)->data;
- $showDeps = Preferences::get('showDepositsFrontpage', false)->data;
- $fiscalYearStartStr = Preferences::get('fiscalYearStart', '01-01')->data;
- $fiscalYearStart = date('Y') . '-' . $fiscalYearStartStr;
- $tjOptionalFields = Preferences::get('transaction_journal_optional_fields', [])->data;
- $is2faEnabled = Preferences::get('twoFactorAuthEnabled', 0)->data; // twoFactorAuthEnabled
- $has2faSecret = null !== Preferences::get('twoFactorAuthSecret'); // hasTwoFactorAuthSecret
+ $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+ $viewRangePref = Preferences::get('viewRange', '1M');
+ $viewRange = $viewRangePref->data;
+ $frontPageAccounts = Preferences::get('frontPageAccounts', []);
+ $language = Preferences::get('language', config('firefly.default_language', 'en_US'))->data;
+ $listPageSize = Preferences::get('listPageSize', 50)->data;
+ $customFiscalYear = Preferences::get('customFiscalYear', 0)->data;
+ $showDeps = Preferences::get('showDepositsFrontpage', false)->data;
+ $fiscalYearStartStr = Preferences::get('fiscalYearStart', '01-01')->data;
+ $fiscalYearStart = date('Y') . '-' . $fiscalYearStartStr;
+ $tjOptionalFields = Preferences::get('transaction_journal_optional_fields', [])->data;
+ $is2faEnabled = Preferences::get('twoFactorAuthEnabled', 0)->data; // twoFactorAuthEnabled
+ $has2faSecret = null !== Preferences::get('twoFactorAuthSecret'); // hasTwoFactorAuthSecret
return view(
'preferences.index',
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index dd122e1344..ceb9ad16ae 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -97,6 +97,7 @@ class ProfileController extends Controller
* @param string $token
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+ *
* @throws FireflyException
*/
public function confirmEmailChange(UserRepositoryInterface $repository, string $token)
@@ -286,7 +287,7 @@ class ProfileController extends Controller
// found user.
// which email address to return to?
- $set = Preferences::beginsWith($user, 'previous_email_');
+ $set = Preferences::beginsWith($user, 'previous_email_');
/** @var string $match */
$match = null;
foreach ($set as $entry) {
diff --git a/app/Http/Controllers/Report/AccountController.php b/app/Http/Controllers/Report/AccountController.php
index 67bd8d2230..c7c8ff447f 100644
--- a/app/Http/Controllers/Report/AccountController.php
+++ b/app/Http/Controllers/Report/AccountController.php
@@ -39,6 +39,7 @@ class AccountController extends Controller
* @param Carbon $end
*
* @return mixed|string
+ *
* @throws \Throwable
*/
public function general(Collection $accounts, Carbon $start, Carbon $end)
diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.php
index 3b31be87de..77aec1cc00 100644
--- a/app/Http/Controllers/Report/BalanceController.php
+++ b/app/Http/Controllers/Report/BalanceController.php
@@ -40,6 +40,7 @@ class BalanceController extends Controller
* @param Carbon $end
*
* @return mixed|string
+ *
* @throws \Throwable
*/
public function general(BalanceReportHelperInterface $helper, Collection $accounts, Carbon $start, Carbon $end)
diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php
index 7a129f3fa7..09b42e0a5a 100644
--- a/app/Http/Controllers/Report/BudgetController.php
+++ b/app/Http/Controllers/Report/BudgetController.php
@@ -41,6 +41,7 @@ class BudgetController extends Controller
* @param Carbon $end
*
* @return mixed|string
+ *
* @throws \Throwable
*/
public function general(BudgetReportHelperInterface $helper, Collection $accounts, Carbon $start, Carbon $end)
@@ -69,6 +70,7 @@ class BudgetController extends Controller
* @param Carbon $end
*
* @return mixed|string
+ *
* @throws \Throwable
*/
public function period(Collection $accounts, Carbon $start, Carbon $end)
diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php
index 037e631e9b..de3f0f57dc 100644
--- a/app/Http/Controllers/Report/CategoryController.php
+++ b/app/Http/Controllers/Report/CategoryController.php
@@ -40,6 +40,7 @@ class CategoryController extends Controller
* @param Carbon $end
*
* @return mixed|string
+ *
* @throws \Throwable
*/
public function expenses(Collection $accounts, Carbon $start, Carbon $end)
@@ -72,6 +73,7 @@ class CategoryController extends Controller
* @param Collection $accounts
*
* @return string
+ *
* @throws \Throwable
*/
public function income(Collection $accounts, Carbon $start, Carbon $end)
@@ -106,6 +108,7 @@ class CategoryController extends Controller
* @return mixed|string
*
* @internal param ReportHelperInterface $helper
+ *
* @throws \Throwable
*/
public function operations(Collection $accounts, Carbon $start, Carbon $end)
diff --git a/app/Http/Controllers/Report/ExpenseController.php b/app/Http/Controllers/Report/ExpenseController.php
index 3ca2699b53..eea0e638b6 100644
--- a/app/Http/Controllers/Report/ExpenseController.php
+++ b/app/Http/Controllers/Report/ExpenseController.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Report;
@@ -34,7 +33,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;
-
/**
* Class ExpenseController
*/
@@ -69,6 +67,7 @@ class ExpenseController extends Controller
* @param Carbon $end
*
* @return string
+ *
* @throws \Throwable
*/
public function budget(Collection $accounts, Collection $expense, Carbon $start, Carbon $end)
@@ -116,6 +115,7 @@ class ExpenseController extends Controller
* @param Carbon $end
*
* @return string
+ *
* @throws \Throwable
*/
public function category(Collection $accounts, Collection $expense, Carbon $start, Carbon $end)
@@ -173,6 +173,7 @@ class ExpenseController extends Controller
* @param Carbon $end
*
* @return array|mixed|string
+ *
* @throws \Throwable
*/
public function spent(Collection $accounts, Collection $expense, Carbon $start, Carbon $end)
@@ -193,7 +194,7 @@ class ExpenseController extends Controller
foreach ($combined as $name => $combi) {
/**
- * @var string $name
+ * @var string
* @var Collection $combi
*/
$spent = $this->spentInPeriod($accounts, $combi, $start, $end);
@@ -208,7 +209,6 @@ class ExpenseController extends Controller
return $result;
// for period, get spent and earned for each account (by name)
-
}
/**
@@ -218,6 +218,7 @@ class ExpenseController extends Controller
* @param Carbon $end
*
* @return string
+ *
* @throws \Throwable
*/
public function topExpense(Collection $accounts, Collection $expense, Carbon $start, Carbon $end)
@@ -254,7 +255,6 @@ class ExpenseController extends Controller
return $result;
}
-
/**
* @param Collection $accounts
* @param Collection $expense
@@ -262,6 +262,7 @@ class ExpenseController extends Controller
* @param Carbon $end
*
* @return mixed|string
+ *
* @throws \Throwable
*/
public function topIncome(Collection $accounts, Collection $expense, Carbon $start, Carbon $end)
@@ -343,17 +344,16 @@ class ExpenseController extends Controller
$categoryName = $transaction->transaction_category_name;
$categoryId = intval($transaction->transaction_category_id);
// if null, grab from journal:
- if ($categoryId === 0) {
+ if (0 === $categoryId) {
$categoryName = $transaction->transaction_journal_category_name;
$categoryId = intval($transaction->transaction_journal_category_id);
}
- if ($categoryId !== 0) {
+ if (0 !== $categoryId) {
$categoryName = app('steam')->tryDecrypt($categoryName);
}
// if not set, set to zero:
if (!isset($sum[$categoryId][$currencyId])) {
-
$sum[$categoryId] = [
'grand_total' => '0',
'name' => $categoryName,
@@ -371,7 +371,6 @@ class ExpenseController extends Controller
],
],
];
-
}
// add amount
@@ -448,17 +447,16 @@ class ExpenseController extends Controller
$budgetName = $transaction->transaction_budget_name;
$budgetId = intval($transaction->transaction_budget_id);
// if null, grab from journal:
- if ($budgetId === 0) {
+ if (0 === $budgetId) {
$budgetName = $transaction->transaction_journal_budget_name;
$budgetId = intval($transaction->transaction_journal_budget_id);
}
- if ($budgetId !== 0) {
+ if (0 !== $budgetId) {
$budgetName = app('steam')->tryDecrypt($budgetName);
}
// if not set, set to zero:
if (!isset($sum[$budgetId][$currencyId])) {
-
$sum[$budgetId] = [
'grand_total' => '0',
'name' => $budgetName,
@@ -510,17 +508,16 @@ class ExpenseController extends Controller
$categoryName = $transaction->transaction_category_name;
$categoryId = intval($transaction->transaction_category_id);
// if null, grab from journal:
- if ($categoryId === 0) {
+ if (0 === $categoryId) {
$categoryName = $transaction->transaction_journal_category_name;
$categoryId = intval($transaction->transaction_journal_category_id);
}
- if ($categoryId !== 0) {
+ if (0 !== $categoryId) {
$categoryName = app('steam')->tryDecrypt($categoryName);
}
// if not set, set to zero:
if (!isset($sum[$categoryId][$currencyId])) {
-
$sum[$categoryId] = [
'grand_total' => '0',
'name' => $categoryName,
@@ -591,5 +588,4 @@ class ExpenseController extends Controller
return $sum;
}
-
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php
index 2164c57749..c86d3c07d2 100644
--- a/app/Http/Controllers/Report/OperationsController.php
+++ b/app/Http/Controllers/Report/OperationsController.php
@@ -40,6 +40,7 @@ class OperationsController extends Controller
* @param Carbon $end
*
* @return mixed|string
+ *
* @throws \Throwable
*/
public function expenses(AccountTaskerInterface $tasker, Collection $accounts, Carbon $start, Carbon $end)
@@ -68,6 +69,7 @@ class OperationsController extends Controller
* @param Carbon $end
*
* @return string
+ *
* @throws \Throwable
*/
public function income(AccountTaskerInterface $tasker, Collection $accounts, Carbon $start, Carbon $end)
@@ -97,6 +99,7 @@ class OperationsController extends Controller
* @param Carbon $end
*
* @return mixed|string
+ *
* @throws \Throwable
*/
public function operations(AccountTaskerInterface $tasker, Collection $accounts, Carbon $start, Carbon $end)
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index bfb0d656e9..64b44369de 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -75,12 +75,13 @@ class ReportController extends Controller
* @param Carbon $end
*
* @return string
+ *
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function accountReport(Collection $accounts, Collection $expense, Carbon $start, Carbon $end)
{
if ($end < $start) {
- return view('error')->with('message', trans('firefly.end_after_start_date'));// @codeCoverageIgnore
+ return view('error')->with('message', trans('firefly.end_after_start_date')); // @codeCoverageIgnore
}
if ($start < session('first')) {
@@ -90,7 +91,7 @@ class ReportController extends Controller
View::share(
'subTitle', trans(
'firefly.report_default',
- ['start' => $start->formatLocalized($this->monthFormat), 'end' => $end->formatLocalized($this->monthFormat),]
+ ['start' => $start->formatLocalized($this->monthFormat), 'end' => $end->formatLocalized($this->monthFormat)]
)
);
@@ -108,6 +109,7 @@ class ReportController extends Controller
* @param Carbon $end
*
* @return string
+ *
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function auditReport(Collection $accounts, Carbon $start, Carbon $end)
@@ -144,6 +146,7 @@ class ReportController extends Controller
* @param Carbon $end
*
* @return string
+ *
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function budgetReport(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end)
@@ -181,6 +184,7 @@ class ReportController extends Controller
* @param Carbon $end
*
* @return string
+ *
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function categoryReport(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
@@ -217,6 +221,7 @@ class ReportController extends Controller
* @param Carbon $end
*
* @return string
+ *
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function defaultReport(Collection $accounts, Carbon $start, Carbon $end)
@@ -268,6 +273,7 @@ class ReportController extends Controller
* @param string $reportType
*
* @return mixed
+ *
* @throws \Throwable
*/
public function options(string $reportType)
@@ -297,6 +303,7 @@ class ReportController extends Controller
* @param ReportFormRequest $request
*
* @return RedirectResponse|\Illuminate\Routing\Redirector
+ *
* @throws \FireflyIII\Exceptions\FireflyException
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
@@ -373,6 +380,7 @@ class ReportController extends Controller
* @param Carbon $end
*
* @return string
+ *
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function tagReport(Collection $accounts, Collection $tags, Carbon $start, Carbon $end)
@@ -405,6 +413,7 @@ class ReportController extends Controller
/**
* @return string
+ *
* @throws \Throwable
*/
private function accountReportOptions(): string
@@ -428,6 +437,7 @@ class ReportController extends Controller
/**
* @return string
+ *
* @throws \Throwable
*/
private function budgetReportOptions(): string
@@ -442,6 +452,7 @@ class ReportController extends Controller
/**
* @return string
+ *
* @throws \Throwable
*/
private function categoryReportOptions(): string
@@ -456,6 +467,7 @@ class ReportController extends Controller
/**
* @return string
+ *
* @throws \Throwable
*/
private function noReportOptions(): string
@@ -465,6 +477,7 @@ class ReportController extends Controller
/**
* @return string
+ *
* @throws \Throwable
*/
private function tagReportOptions(): string
diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php
index 2744d77fd4..77cd0cc883 100644
--- a/app/Http/Controllers/RuleController.php
+++ b/app/Http/Controllers/RuleController.php
@@ -72,6 +72,7 @@ class RuleController extends Controller
* @param RuleGroup $ruleGroup
*
* @return View
+ *
* @throws \Throwable
* @throws \Throwable
*/
@@ -166,6 +167,7 @@ class RuleController extends Controller
* @param Rule $rule
*
* @return View
+ *
* @throws \Throwable
* @throws \Throwable
* @throws \Throwable
@@ -362,6 +364,7 @@ class RuleController extends Controller
* @param TestRuleFormRequest $request
*
* @return \Illuminate\Http\JsonResponse
+ *
* @throws \Throwable
*/
public function testTriggers(TestRuleFormRequest $request)
@@ -410,6 +413,7 @@ class RuleController extends Controller
* @param Rule $rule
*
* @return \Illuminate\Http\JsonResponse
+ *
* @throws \Throwable
*/
public function testTriggersByRule(Rule $rule)
@@ -535,6 +539,7 @@ class RuleController extends Controller
* @param Rule $rule
*
* @return array
+ *
* @throws \Throwable
*/
private function getCurrentActions(Rule $rule)
@@ -564,6 +569,7 @@ class RuleController extends Controller
* @param Rule $rule
*
* @return array
+ *
* @throws \Throwable
*/
private function getCurrentTriggers(Rule $rule)
@@ -595,6 +601,7 @@ class RuleController extends Controller
* @param Request $request
*
* @return array
+ *
* @throws \Throwable
*/
private function getPreviousActions(Request $request)
@@ -625,6 +632,7 @@ class RuleController extends Controller
* @param Request $request
*
* @return array
+ *
* @throws \Throwable
*/
private function getPreviousTriggers(Request $request)
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 73e34ea78a..a2f2663c2e 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -74,6 +74,7 @@ class SearchController extends Controller
* @param SearchInterface $searcher
*
* @return \Illuminate\Http\JsonResponse
+ *
* @throws \Throwable
*/
public function search(Request $request, SearchInterface $searcher)
diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php
index 19a773e5c6..323334c9fc 100644
--- a/app/Http/Controllers/Transaction/ConvertController.php
+++ b/app/Http/Controllers/Transaction/ConvertController.php
@@ -128,6 +128,7 @@ class ConvertController extends Controller
* @param TransactionJournal $journal
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+ *
* @throws FireflyException
* @throws FireflyException
*/
diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php
index 8b086df806..81af686ba3 100644
--- a/app/Http/Controllers/Transaction/SingleController.php
+++ b/app/Http/Controllers/Transaction/SingleController.php
@@ -257,7 +257,7 @@ class SingleController extends Controller
$assetAccounts = $this->groupedAccountList();
$budgetList = ExpandedForm::makeSelectListWithEmpty($this->budgets->getBudgets());
- if ($journal->transactionType->type === TransactionType::RECONCILIATION) {
+ if (TransactionType::RECONCILIATION === $journal->transactionType->type) {
return redirect(route('accounts.reconcile.edit', [$journal->id]));
}
diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php
index 4f3df74dae..28f0eb040e 100644
--- a/app/Http/Controllers/Transaction/SplitController.php
+++ b/app/Http/Controllers/Transaction/SplitController.php
@@ -116,7 +116,6 @@ class SplitController extends Controller
$accountArray[$account->id]['currency_id'] = intval($account->getMeta('currency_id'));
}
-
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('transactions.edit-split.fromUpdate')) {
$this->rememberPreviousUri('transactions.edit-split.uri');
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 7c144dbab2..b271a9f4ad 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -69,6 +69,7 @@ class TransactionController extends Controller
* @param string $moment
*
* @return View
+ *
* @throws FireflyException
*/
public function index(Request $request, JournalRepositoryInterface $repository, string $what, string $moment = '')
@@ -142,7 +143,8 @@ class TransactionController extends Controller
$repository->reconcile($transaction);
}
- return Response::json(['ok'=>'reconciled']);
+
+ return Response::json(['ok' => 'reconciled']);
}
/**
@@ -183,7 +185,7 @@ class TransactionController extends Controller
if ($this->isOpeningBalance($journal)) {
return $this->redirectToAccount($journal);
}
- if ($journal->transactionType->type === TransactionType::RECONCILIATION) {
+ if (TransactionType::RECONCILIATION === $journal->transactionType->type) {
return redirect(route('accounts.reconcile.show', [$journal->id])); // @codeCoverageIgnore
}
$linkTypes = $linkTypeRepository->get();
@@ -200,7 +202,6 @@ class TransactionController extends Controller
* @param string $what
*
* @return Collection
- *
*/
private function getPeriodOverview(string $what): Collection
{
diff --git a/app/Http/Middleware/IsDemoUser.php b/app/Http/Middleware/IsDemoUser.php
index 1f924b7dce..fe5e7f86c1 100644
--- a/app/Http/Middleware/IsDemoUser.php
+++ b/app/Http/Middleware/IsDemoUser.php
@@ -45,9 +45,9 @@ class IsDemoUser
public function handle(Request $request, Closure $next, $guard = null)
{
if (Auth::guard($guard)->guest()) {
- // don't care when not logged in, usual stuff applies:
- return $next($request);
- }
+ // don't care when not logged in, usual stuff applies:
+ return $next($request);
+ }
/** @var User $user */
$user = auth()->user();
if ($user->hasRole('demo')) {
diff --git a/app/Http/Middleware/IsSandStormUser.php b/app/Http/Middleware/IsSandStormUser.php
index 81032bded6..aba1be7020 100644
--- a/app/Http/Middleware/IsSandStormUser.php
+++ b/app/Http/Middleware/IsSandStormUser.php
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Middleware;
use Closure;
-use FireflyIII\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Session;
diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php
index 8b587670fc..10396f5e50 100644
--- a/app/Http/Requests/JournalFormRequest.php
+++ b/app/Http/Requests/JournalFormRequest.php
@@ -84,6 +84,7 @@ class JournalFormRequest extends Request
/**
* @return array
+ *
* @throws FireflyException
*/
public function rules()
diff --git a/app/Http/Requests/ReconciliationFormRequest.php b/app/Http/Requests/ReconciliationFormRequest.php
index b491282cae..a915420310 100644
--- a/app/Http/Requests/ReconciliationFormRequest.php
+++ b/app/Http/Requests/ReconciliationFormRequest.php
@@ -64,5 +64,4 @@ class ReconciliationFormRequest extends Request
return $rules;
}
-
}
diff --git a/app/Import/Configuration/SpectreConfigurator.php b/app/Import/Configuration/SpectreConfigurator.php
index 30c2f80e3f..a2875487a5 100644
--- a/app/Import/Configuration/SpectreConfigurator.php
+++ b/app/Import/Configuration/SpectreConfigurator.php
@@ -171,6 +171,7 @@ class SpectreConfigurator implements ConfiguratorInterface
break;
case !$this->job->configuration['has-input-mandatory']:
$class = InputMandatory::class;
+ // no break
default:
break;
}
diff --git a/app/Import/Converter/Amount.php b/app/Import/Converter/Amount.php
index 4421a23ec1..a72065ea49 100644
--- a/app/Import/Converter/Amount.php
+++ b/app/Import/Converter/Amount.php
@@ -70,7 +70,7 @@ class Amount implements ConverterInterface
if (is_null($decimal)) {
Log::debug('Decimal is still NULL, probably number with >2 decimals. Search for a dot.');
$res = strrpos($value, '.');
- if (!($res === false)) {
+ if (!(false === $res)) {
// blandly assume this is the one.
Log::debug(sprintf('Searched from the left for "." in amount "%s", assume this is the decimal sign.', $value));
$decimal = '.';
diff --git a/app/Import/FileProcessor/CsvProcessor.php b/app/Import/FileProcessor/CsvProcessor.php
index f08f1a1c41..1608c4e7bf 100644
--- a/app/Import/FileProcessor/CsvProcessor.php
+++ b/app/Import/FileProcessor/CsvProcessor.php
@@ -70,6 +70,7 @@ class CsvProcessor implements FileProcessorInterface
* Does the actual job.
*
* @return bool
+ *
* @throws \League\Csv\Exception
*/
public function run(): bool
@@ -160,6 +161,7 @@ class CsvProcessor implements FileProcessorInterface
/**
* @return Iterator
+ *
* @throws \League\Csv\Exception
* @throws \League\Csv\Exception
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
@@ -174,7 +176,7 @@ class CsvProcessor implements FileProcessorInterface
$delimiter = "\t";
}
$reader->setDelimiter($delimiter);
- if($config['has-headers']) {
+ if ($config['has-headers']) {
$reader->setHeaderOffset(0);
}
$results = $reader->getRecords();
@@ -279,6 +281,7 @@ class CsvProcessor implements FileProcessorInterface
* @param array $array
*
* @return bool
+ *
* @throws FireflyException
*/
private function rowAlreadyImported(array $array): bool
diff --git a/app/Import/Prerequisites/BunqPrerequisites.php b/app/Import/Prerequisites/BunqPrerequisites.php
index e4525f9e70..a82345c8db 100644
--- a/app/Import/Prerequisites/BunqPrerequisites.php
+++ b/app/Import/Prerequisites/BunqPrerequisites.php
@@ -337,4 +337,4 @@ class BunqPrerequisites implements PrerequisitesInterface
return $deviceServerId;
}
-}
\ No newline at end of file
+}
diff --git a/app/Import/Prerequisites/FilePrerequisites.php b/app/Import/Prerequisites/FilePrerequisites.php
index 1c2a27a755..4f3fc873ab 100644
--- a/app/Import/Prerequisites/FilePrerequisites.php
+++ b/app/Import/Prerequisites/FilePrerequisites.php
@@ -92,5 +92,4 @@ class FilePrerequisites implements PrerequisitesInterface
{
return new MessageBag;
}
-
}
diff --git a/app/Import/Prerequisites/PrerequisitesInterface.php b/app/Import/Prerequisites/PrerequisitesInterface.php
index 305a01f284..699ea43b31 100644
--- a/app/Import/Prerequisites/PrerequisitesInterface.php
+++ b/app/Import/Prerequisites/PrerequisitesInterface.php
@@ -28,8 +28,6 @@ use Illuminate\Support\MessageBag;
/**
* Interface PrerequisitesInterface
- *
- * @package FireflyIII\Import\Prerequisites
*/
interface PrerequisitesInterface
{
diff --git a/app/Import/Routine/RoutineInterface.php b/app/Import/Routine/RoutineInterface.php
index 91d17d1c93..ef2d25515b 100644
--- a/app/Import/Routine/RoutineInterface.php
+++ b/app/Import/Routine/RoutineInterface.php
@@ -27,8 +27,6 @@ use Illuminate\Support\Collection;
/**
* Interface RoutineInterface
- *
- * @package FireflyIII\Import\Routine
*/
interface RoutineInterface
{
@@ -58,6 +56,4 @@ interface RoutineInterface
* @return mixed
*/
public function setJob(ImportJob $job);
-
-
}
diff --git a/app/Import/Routine/SpectreRoutine.php b/app/Import/Routine/SpectreRoutine.php
index 5306237cc3..bfd6af5438 100644
--- a/app/Import/Routine/SpectreRoutine.php
+++ b/app/Import/Routine/SpectreRoutine.php
@@ -25,9 +25,9 @@ namespace FireflyIII\Import\Routine;
use FireflyIII\Models\ImportJob;
use FireflyIII\Services\Spectre\Object\Customer;
use FireflyIII\Services\Spectre\Request\NewCustomerRequest;
-use Preferences;
use Illuminate\Support\Collection;
use Log;
+use Preferences;
/**
* Class FileRoutine
@@ -91,7 +91,6 @@ class SpectreRoutine implements RoutineInterface
// create customer if user does not have one:
$customer = $this->getCustomer();
-
return true;
}
@@ -113,7 +112,6 @@ class SpectreRoutine implements RoutineInterface
echo '';
print_r($newCustomerRequest->getCustomer());
exit;
-
}
/**
@@ -128,6 +126,4 @@ class SpectreRoutine implements RoutineInterface
var_dump($preference->data);
exit;
}
-
-
}
diff --git a/app/Import/Specifics/IngDescription.php b/app/Import/Specifics/IngDescription.php
index 4f8555b870..6839fa76ba 100644
--- a/app/Import/Specifics/IngDescription.php
+++ b/app/Import/Specifics/IngDescription.php
@@ -127,7 +127,7 @@ class IngDescription implements SpecificInterface
private function copyDescriptionToOpposite(): void
{
$search = ['Naar Oranje Spaarrekening ', 'Afschrijvingen'];
- if (strlen($this->row[3]) === 0) {
+ if (0 === strlen($this->row[3])) {
$this->row[3] = trim(str_ireplace($search, '', $this->row[8]));
}
}
diff --git a/app/Import/Specifics/SnsDescription.php b/app/Import/Specifics/SnsDescription.php
index 5da017100b..3ef766e81a 100644
--- a/app/Import/Specifics/SnsDescription.php
+++ b/app/Import/Specifics/SnsDescription.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\Import\Specifics;
diff --git a/app/Import/Storage/ImportStorage.php b/app/Import/Storage/ImportStorage.php
index 0488a0782c..4b0823fbba 100644
--- a/app/Import/Storage/ImportStorage.php
+++ b/app/Import/Storage/ImportStorage.php
@@ -45,11 +45,11 @@ class ImportStorage
public $errors;
/** @var Collection */
public $journals;
- /** @var BillRepositoryInterface */
+ /** @var BillRepositoryInterface */
protected $billRepository; // yes, hard coded
/** @var Collection */
protected $bills;
-/** @var int */
+ /** @var int */
protected $defaultCurrencyId = 1;
/** @var ImportJob */
protected $job;
@@ -96,11 +96,11 @@ class ImportStorage
$config = $job->configuration;
$this->applyRules = $config['apply_rules'] ?? false;
$this->matchBills = $config['match_bills'] ?? false;
- if ($this->applyRules === true) {
+ if (true === $this->applyRules) {
Log::debug('applyRules seems to be true, get the rules.');
$this->rules = $this->getRules();
}
- if ($this->matchBills === true) {
+ if (true === $this->matchBills) {
Log::debug('matchBills seems to be true, get the bills');
$this->bills = $this->getBills();
$this->billRepository = app(BillRepositoryInterface::class);
@@ -226,22 +226,22 @@ class ImportStorage
$this->job->addStepsDone(1);
// run rules if config calls for it:
- if ($this->applyRules === true) {
+ if (true === $this->applyRules) {
Log::info('Will apply rules to this journal.');
$this->applyRules($journal);
}
- if (!($this->applyRules === true)) {
+ if (!(true === $this->applyRules)) {
Log::info('Will NOT apply rules to this journal.');
}
// match bills if config calls for it.
- if ($this->matchBills === true) {
+ if (true === $this->matchBills) {
//$this->/applyRules($journal);
Log::info('Cannot match bills (yet).');
$this->matchBills($journal);
}
- if (!($this->matchBills === true)) {
+ if (!(true === $this->matchBills)) {
Log::info('Cannot match bills (yet), but do not have to.');
}
diff --git a/app/Import/Storage/ImportSupport.php b/app/Import/Storage/ImportSupport.php
index f0689a430e..94fe0d0188 100644
--- a/app/Import/Storage/ImportSupport.php
+++ b/app/Import/Storage/ImportSupport.php
@@ -93,8 +93,9 @@ trait ImportSupport
*/
protected function matchBills(TransactionJournal $journal): bool
{
- if(!is_null($journal->bill_id)) {
+ if (!is_null($journal->bill_id)) {
Log::debug('Journal is already linked to a bill, will not scan.');
+
return true;
}
if ($this->bills->count() > 0) {
@@ -264,6 +265,7 @@ trait ImportSupport
*
* @return string
*x
+ *
* @throws FireflyException
*
* @see ImportSupport::getOpposingAccount()
@@ -412,6 +414,7 @@ trait ImportSupport
* @param array $parameters
*
* @return TransactionJournal
+ *
* @throws FireflyException
*/
private function storeJournal(array $parameters): TransactionJournal
diff --git a/app/Jobs/ExecuteRuleOnExistingTransactions.php b/app/Jobs/ExecuteRuleOnExistingTransactions.php
index 1dc76a29ef..fafa74a5b9 100644
--- a/app/Jobs/ExecuteRuleOnExistingTransactions.php
+++ b/app/Jobs/ExecuteRuleOnExistingTransactions.php
@@ -93,6 +93,14 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue
$this->endDate = $date;
}
+ /**
+ * @return Rule
+ */
+ public function getRule(): Rule
+ {
+ return $this->rule;
+ }
+
/**
* @return \Carbon\Carbon
*/
@@ -117,15 +125,6 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue
return $this->user;
}
- /**
- * @return Rule
- */
- public function getRule(): Rule
- {
- return $this->rule;
- }
-
-
/**
* @param User $user
*/
diff --git a/app/Jobs/GetSpectreProviders.php b/app/Jobs/GetSpectreProviders.php
index 3d410acd0e..d29da378fd 100644
--- a/app/Jobs/GetSpectreProviders.php
+++ b/app/Jobs/GetSpectreProviders.php
@@ -1,4 +1,6 @@
code = $provider['code'];
$dbProvider->mode = $provider['mode'];
$dbProvider->status = $provider['status'];
- $dbProvider->interactive = $provider['interactive'] === 1;
- $dbProvider->automatic_fetch = $provider['automatic_fetch'] === 1;
+ $dbProvider->interactive = 1 === $provider['interactive'];
+ $dbProvider->automatic_fetch = 1 === $provider['automatic_fetch'];
$dbProvider->country_code = $provider['country_code'];
$dbProvider->data = $provider;
$dbProvider->save();
diff --git a/app/Mail/AdminTestMail.php b/app/Mail/AdminTestMail.php
index 02042be108..dc2ea460e8 100644
--- a/app/Mail/AdminTestMail.php
+++ b/app/Mail/AdminTestMail.php
@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
-
namespace FireflyIII\Mail;
use Illuminate\Bus\Queueable;
diff --git a/app/Mail/ConfirmEmailChangeMail.php b/app/Mail/ConfirmEmailChangeMail.php
index 9774e60892..4a0e5dd1cd 100644
--- a/app/Mail/ConfirmEmailChangeMail.php
+++ b/app/Mail/ConfirmEmailChangeMail.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\Mail;
diff --git a/app/Mail/UndoEmailChangeMail.php b/app/Mail/UndoEmailChangeMail.php
index 350dd778a9..94a6b5b5ab 100644
--- a/app/Mail/UndoEmailChangeMail.php
+++ b/app/Mail/UndoEmailChangeMail.php
@@ -18,11 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
-
-
namespace FireflyIII\Mail;
use Illuminate\Bus\Queueable;
@@ -36,7 +33,7 @@ class UndoEmailChangeMail extends Mailable
{
use Queueable, SerializesModels;
- /** @var string IP address of user*/
+ /** @var string IP address of user */
public $ipAddress;
/** @var string New email address */
public $newEmail;
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 2a5a9e877c..058303dd5c 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -63,7 +63,7 @@ class Account extends Model
* @var array
*/
protected $rules
- = [
+ = [
'user_id' => 'required|exists:users,id',
'account_type_id' => 'required|exists:account_types,id',
'name' => 'required|between:1,200',
@@ -118,7 +118,7 @@ class Account extends Model
*
* @return Account
*/
- public static function routeBinder(Account $value)
+ public static function routeBinder(self $value)
{
if (auth()->check()) {
if (intval($value->user_id) === auth()->user()->id) {
@@ -218,7 +218,6 @@ class Account extends Model
* Returns the opening balance.
*
* @return TransactionJournal
- *
*/
public function getOpeningBalance(): TransactionJournal
{
@@ -268,7 +267,6 @@ class Account extends Model
* Returns the date of the opening balance for this account. If no date, will return 01-01-1900.
*
* @return Carbon
- *
*/
public function getOpeningBalanceDate(): Carbon
{
diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php
index 902373a146..2ff849a5de 100644
--- a/app/Models/AccountType.php
+++ b/app/Models/AccountType.php
@@ -30,7 +30,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
*/
class AccountType extends Model
{
- const DEFAULT = 'Default account';
+ const DEFAULT = 'Default account';
/**
*
*/
diff --git a/app/Models/Bill.php b/app/Models/Bill.php
index 37dc9fecad..43802baafe 100644
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@@ -42,7 +42,7 @@ class Bill extends Model
* @var array
*/
protected $casts
- = [
+ = [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -57,8 +57,8 @@ class Bill extends Model
* @var array
*/
protected $fillable
- = ['name', 'match', 'amount_min', 'match_encrypted', 'name_encrypted', 'user_id', 'amount_max', 'date', 'repeat_freq', 'skip',
- 'automatch', 'active',];
+ = ['name', 'match', 'amount_min', 'match_encrypted', 'name_encrypted', 'user_id', 'amount_max', 'date', 'repeat_freq', 'skip',
+ 'automatch', 'active',];
/**
* @var array
*/
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 7b661298e8..64521a63d9 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -38,7 +38,7 @@ class Configuration extends Model
* @var array
*/
protected $casts
- = [
+ = [
'created_at' => 'datetime',
'updated_at' => 'datetime',
];
diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php
index 21c4adcaa8..9cea534117 100644
--- a/app/Models/ImportJob.php
+++ b/app/Models/ImportJob.php
@@ -179,6 +179,7 @@ class ImportJob extends Model
/**
* @return string
+ *
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function uploadFileContents(): string
diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php
index 2e6c8ec490..e44a45233b 100644
--- a/app/Models/PiggyBankEvent.php
+++ b/app/Models/PiggyBankEvent.php
@@ -41,7 +41,7 @@ class PiggyBankEvent extends Model
'date' => 'datetime',
];
/** @var array */
- protected $dates = ['date'];
+ protected $dates = ['date'];
/**
* @var array
*/
diff --git a/app/Models/SpectreProvider.php b/app/Models/SpectreProvider.php
index b7123d3d98..a1d056f93c 100644
--- a/app/Models/SpectreProvider.php
+++ b/app/Models/SpectreProvider.php
@@ -18,12 +18,10 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\Models;
-
use Illuminate\Database\Eloquent\Model;
/**
@@ -51,5 +49,4 @@ class SpectreProvider extends Model
* @var array
*/
protected $fillable = ['spectre_id', 'code', 'mode', 'name', 'status', 'interactive', 'automatic_fetch', 'country_code', 'data'];
-
-}
\ No newline at end of file
+}
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index 3ea86a67ca..5a50dfe1a0 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -105,6 +105,7 @@ class Tag extends Model
* @param Tag $tag
*
* @return string
+ *
* @throws \FireflyIII\Exceptions\FireflyException
*/
public static function tagSum(self $tag): string
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index 89c0a6a174..ce2cad1762 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -75,7 +75,7 @@ class Transaction extends Model
* @var array
*/
protected $casts
- = [
+ = [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
@@ -88,8 +88,8 @@ class Transaction extends Model
* @var array
*/
protected $fillable
- = ['account_id', 'transaction_journal_id', 'description', 'amount', 'identifier', 'transaction_currency_id', 'foreign_currency_id',
- 'foreign_amount',];
+ = ['account_id', 'transaction_journal_id', 'description', 'amount', 'identifier', 'transaction_currency_id', 'foreign_currency_id',
+ 'foreign_amount',];
/**
* @var array
*/
@@ -98,7 +98,7 @@ class Transaction extends Model
* @var array
*/
protected $rules
- = [
+ = [
'account_id' => 'required|exists:accounts,id',
'transaction_journal_id' => 'required|exists:transaction_journals,id',
'transaction_currency_id' => 'required|exists:transaction_currencies,id',
diff --git a/app/Providers/ExportJobServiceProvider.php b/app/Providers/ExportJobServiceProvider.php
index 27f4a32e26..994570f7b2 100644
--- a/app/Providers/ExportJobServiceProvider.php
+++ b/app/Providers/ExportJobServiceProvider.php
@@ -51,7 +51,7 @@ class ExportJobServiceProvider extends ServiceProvider
}
/**
- *
+ * Register export job.
*/
private function exportJob()
{
@@ -69,6 +69,9 @@ class ExportJobServiceProvider extends ServiceProvider
);
}
+ /**
+ * Register import job.
+ */
private function importJob()
{
$this->app->bind(
diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php
index 187fb732a5..651f7a4766 100644
--- a/app/Providers/FireflyServiceProvider.php
+++ b/app/Providers/FireflyServiceProvider.php
@@ -73,6 +73,9 @@ use Validator;
*/
class FireflyServiceProvider extends ServiceProvider
{
+ /**
+ * Start provider.
+ */
public function boot()
{
Validator::resolver(
@@ -94,7 +97,7 @@ class FireflyServiceProvider extends ServiceProvider
}
/**
- *
+ * Register stuff.
*/
public function register()
{
diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php
index 882ec93e0b..1169e49ead 100644
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@@ -43,7 +43,6 @@ use Validator;
*/
class AccountRepository implements AccountRepositoryInterface
{
-
/** @var User */
private $user;
@@ -72,6 +71,7 @@ class AccountRepository implements AccountRepositoryInterface
* @param Account $moveTo
*
* @return bool
+ *
* @throws \Exception
*/
public function destroy(Account $account, Account $moveTo): bool
@@ -161,6 +161,7 @@ class AccountRepository implements AccountRepositoryInterface
* @param array $data
*
* @return Account
+ *
* @throws FireflyException
*/
public function store(array $data): Account
@@ -222,7 +223,7 @@ class AccountRepository implements AccountRepositoryInterface
/** @var Transaction $transaction */
foreach ($journal->transactions as $transaction) {
$transaction->amount = bcmul($data['amount'], '-1');
- if ($transaction->account->accountType->type === AccountType::ASSET) {
+ if (AccountType::ASSET === $transaction->account->accountType->type) {
$transaction->amount = $data['amount'];
}
$transaction->save();
@@ -413,6 +414,7 @@ class AccountRepository implements AccountRepositoryInterface
* @param string $name
*
* @return Account
+ *
* @throws FireflyException
*/
protected function storeOpposingAccount(string $name): Account
@@ -511,6 +513,7 @@ class AccountRepository implements AccountRepositoryInterface
* @param array $data
*
* @return bool
+ *
* @throws \Exception
*/
protected function updateOpeningBalanceJournal(Account $account, TransactionJournal $journal, array $data): bool
diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php
index a5dd1abe28..985b32104c 100644
--- a/app/Repositories/Account/AccountRepositoryInterface.php
+++ b/app/Repositories/Account/AccountRepositoryInterface.php
@@ -33,7 +33,6 @@ use Illuminate\Support\Collection;
*/
interface AccountRepositoryInterface
{
-
/**
* Moved here from account CRUD.
*
diff --git a/app/Repositories/Account/FindAccountsTrait.php b/app/Repositories/Account/FindAccountsTrait.php
index bea13e9603..95f43af9d0 100644
--- a/app/Repositories/Account/FindAccountsTrait.php
+++ b/app/Repositories/Account/FindAccountsTrait.php
@@ -211,6 +211,7 @@ trait FindAccountsTrait
/**
* @return Account
+ *
* @throws FireflyException
*/
public function getCashAccount(): Account
diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php
index fb4af1a42f..05e3176293 100644
--- a/app/Repositories/Attachment/AttachmentRepository.php
+++ b/app/Repositories/Attachment/AttachmentRepository.php
@@ -43,6 +43,7 @@ class AttachmentRepository implements AttachmentRepositoryInterface
* @param Attachment $attachment
*
* @return bool
+ *
* @throws \Exception
*/
public function destroy(Attachment $attachment): bool
@@ -130,6 +131,7 @@ class AttachmentRepository implements AttachmentRepositoryInterface
* @param Attachment $attachment
*
* @return string
+ *
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function getContent(Attachment $attachment): string
diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php
index f4dbdbed36..00fe9f70e3 100644
--- a/app/Repositories/Bill/BillRepository.php
+++ b/app/Repositories/Bill/BillRepository.php
@@ -48,6 +48,7 @@ class BillRepository implements BillRepositoryInterface
* @param Bill $bill
*
* @return bool
+ *
* @throws \Exception
*/
public function destroy(Bill $bill): bool
@@ -391,6 +392,7 @@ class BillRepository implements BillRepositoryInterface
* @param Carbon $date
*
* @return \Carbon\Carbon
+ *
* @throws \FireflyIII\Support\Facades\FireflyException
* @throws \FireflyIII\Support\Facades\FireflyException
*/
@@ -430,6 +432,7 @@ class BillRepository implements BillRepositoryInterface
* @param Carbon $date
*
* @return Carbon
+ *
* @throws \FireflyIII\Support\Facades\FireflyException
* @throws \FireflyIII\Support\Facades\FireflyException
* @throws \FireflyIII\Support\Facades\FireflyException
@@ -616,10 +619,9 @@ class BillRepository implements BillRepositoryInterface
return $wordMatch;
}
-
/**
- * @param Bill $bill
- * @param string $note
+ * @param Bill $bill
+ * @param string $note
*
* @return bool
*/
diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php
index a0ce48e0c2..ed65e673ad 100644
--- a/app/Repositories/Budget/BudgetRepository.php
+++ b/app/Repositories/Budget/BudgetRepository.php
@@ -51,6 +51,7 @@ class BudgetRepository implements BudgetRepositoryInterface
/**
* @return bool
+ *
* @throws \Exception
* @throws \Exception
*/
@@ -125,6 +126,7 @@ class BudgetRepository implements BudgetRepositoryInterface
* @param Budget $budget
*
* @return bool
+ *
* @throws \Exception
*/
public function destroy(Budget $budget): bool
@@ -607,6 +609,7 @@ class BudgetRepository implements BudgetRepositoryInterface
* @param string $amount
*
* @return BudgetLimit
+ *
* @throws \Exception
*/
public function updateLimitAmount(Budget $budget, Carbon $start, Carbon $end, string $amount): BudgetLimit
diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php
index 7c6236eb3c..03ad9d4308 100644
--- a/app/Repositories/Category/CategoryRepository.php
+++ b/app/Repositories/Category/CategoryRepository.php
@@ -44,6 +44,7 @@ class CategoryRepository implements CategoryRepositoryInterface
* @param Category $category
*
* @return bool
+ *
* @throws \Exception
*/
public function destroy(Category $category): bool
diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php
index 67c2c840d5..9117d85c69 100644
--- a/app/Repositories/ExportJob/ExportJobRepository.php
+++ b/app/Repositories/ExportJob/ExportJobRepository.php
@@ -53,6 +53,7 @@ class ExportJobRepository implements ExportJobRepositoryInterface
/**
* @return bool
+ *
* @throws \Exception
*/
public function cleanup(): bool
@@ -138,6 +139,7 @@ class ExportJobRepository implements ExportJobRepositoryInterface
* @param ExportJob $job
*
* @return string
+ *
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function getContent(ExportJob $job): string
diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php
index 8fabdb67f8..8925dbaaf3 100644
--- a/app/Repositories/ImportJob/ImportJobRepository.php
+++ b/app/Repositories/ImportJob/ImportJobRepository.php
@@ -129,6 +129,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface
* @param null|UploadedFile $file
*
* @return bool
+ *
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function processFile(ImportJob $job, ?UploadedFile $file): bool
diff --git a/app/Repositories/Journal/CreateJournalsTrait.php b/app/Repositories/Journal/CreateJournalsTrait.php
index 286e184ef2..897d145a1c 100644
--- a/app/Repositories/Journal/CreateJournalsTrait.php
+++ b/app/Repositories/Journal/CreateJournalsTrait.php
@@ -42,6 +42,8 @@ use Log;
trait CreateJournalsTrait
{
/**
+ * Store accounts found in parent class.
+ *
* @param User $user
* @param TransactionType $type
* @param array $data
@@ -78,6 +80,8 @@ trait CreateJournalsTrait
}
/**
+ * Store a budget if found.
+ *
* @param Transaction $transaction
* @param int $budgetId
*/
@@ -91,6 +95,8 @@ trait CreateJournalsTrait
}
/**
+ * Store category if found.
+ *
* @param Transaction $transaction
* @param string $category
*/
@@ -161,6 +167,8 @@ trait CreateJournalsTrait
}
/**
+ * Store a transaction.
+ *
* @param array $data
*
* @return Transaction
@@ -202,6 +210,8 @@ trait CreateJournalsTrait
}
/**
+ * Update note for journal.
+ *
* @param TransactionJournal $journal
* @param string $note
*
diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php
index 6fee2857b5..29c2f204e4 100644
--- a/app/Repositories/Journal/JournalRepository.php
+++ b/app/Repositories/Journal/JournalRepository.php
@@ -99,6 +99,7 @@ class JournalRepository implements JournalRepositoryInterface
* @param TransactionJournal $journal
*
* @return bool
+ *
* @throws \Exception
*/
public function delete(TransactionJournal $journal): bool
@@ -180,7 +181,7 @@ class JournalRepository implements JournalRepositoryInterface
{
/** @var Transaction $transaction */
foreach ($journal->transactions as $transaction) {
- if ($transaction->account->accountType->type === AccountType::ASSET) {
+ if (AccountType::ASSET === $transaction->account->accountType->type) {
return $transaction;
}
}
@@ -274,6 +275,7 @@ class JournalRepository implements JournalRepositoryInterface
* @param array $data
*
* @return TransactionJournal
+ *
* @throws \FireflyIII\Exceptions\FireflyException
* @throws \FireflyIII\Exceptions\FireflyException
*/
@@ -361,6 +363,7 @@ class JournalRepository implements JournalRepositoryInterface
* @param array $data
*
* @return TransactionJournal
+ *
* @throws \FireflyIII\Exceptions\FireflyException
* @throws \FireflyIII\Exceptions\FireflyException
* @throws \FireflyIII\Exceptions\FireflyException
@@ -418,7 +421,6 @@ class JournalRepository implements JournalRepositoryInterface
return $journal;
}
-
/**
* Same as above but for transaction journal with multiple transactions.
*
diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php
index d3e8bafbe1..c9561c9196 100644
--- a/app/Repositories/Journal/JournalRepositoryInterface.php
+++ b/app/Repositories/Journal/JournalRepositoryInterface.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\Repositories\Journal;
diff --git a/app/Repositories/Journal/SupportJournalsTrait.php b/app/Repositories/Journal/SupportJournalsTrait.php
index f6b3b436f0..6584e18a80 100644
--- a/app/Repositories/Journal/SupportJournalsTrait.php
+++ b/app/Repositories/Journal/SupportJournalsTrait.php
@@ -119,6 +119,7 @@ trait SupportJournalsTrait
* @param array $data
*
* @return array
+ *
* @throws FireflyException
* @throws FireflyException
*/
@@ -167,6 +168,7 @@ trait SupportJournalsTrait
* @param array $data
*
* @return array
+ *
* @throws FireflyException
* @throws FireflyException
*/
diff --git a/app/Repositories/Journal/UpdateJournalsTrait.php b/app/Repositories/Journal/UpdateJournalsTrait.php
index dcb0c82086..31bcaa58a1 100644
--- a/app/Repositories/Journal/UpdateJournalsTrait.php
+++ b/app/Repositories/Journal/UpdateJournalsTrait.php
@@ -71,6 +71,8 @@ trait UpdateJournalsTrait
}
/**
+ * Update destination transaction.
+ *
* @param TransactionJournal $journal
* @param Account $account
* @param array $data
@@ -94,6 +96,8 @@ trait UpdateJournalsTrait
}
/**
+ * Update source transaction.
+ *
* @param TransactionJournal $journal
* @param Account $account
* @param array $data
@@ -118,6 +122,8 @@ trait UpdateJournalsTrait
}
/**
+ * Update tags.
+ *
* @param TransactionJournal $journal
* @param array $array
*
diff --git a/app/Repositories/LinkType/LinkTypeRepository.php b/app/Repositories/LinkType/LinkTypeRepository.php
index dbd3764df9..c2b4aa51e5 100644
--- a/app/Repositories/LinkType/LinkTypeRepository.php
+++ b/app/Repositories/LinkType/LinkTypeRepository.php
@@ -51,6 +51,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
* @param LinkType $moveTo
*
* @return bool
+ *
* @throws \Exception
*/
public function destroy(LinkType $linkType, LinkType $moveTo): bool
@@ -67,6 +68,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
* @param TransactionJournalLink $link
*
* @return bool
+ *
* @throws \Exception
*/
public function destroyLink(TransactionJournalLink $link): bool
diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php
index 0ac949d79e..3d92220a51 100644
--- a/app/Repositories/Rule/RuleRepository.php
+++ b/app/Repositories/Rule/RuleRepository.php
@@ -49,6 +49,7 @@ class RuleRepository implements RuleRepositoryInterface
* @param Rule $rule
*
* @return bool
+ *
* @throws \Exception
* @throws \Exception
* @throws \Exception
diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php
index c8b1c18921..f271e7d893 100644
--- a/app/Repositories/RuleGroup/RuleGroupRepository.php
+++ b/app/Repositories/RuleGroup/RuleGroupRepository.php
@@ -49,6 +49,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
* @param RuleGroup|null $moveTo
*
* @return bool
+ *
* @throws \Exception
* @throws \Exception
*/
diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php
index 36183fa5ac..9d18a137cb 100644
--- a/app/Repositories/Tag/TagRepository.php
+++ b/app/Repositories/Tag/TagRepository.php
@@ -74,6 +74,7 @@ class TagRepository implements TagRepositoryInterface
* @param Tag $tag
*
* @return bool
+ *
* @throws \Exception
*/
public function destroy(Tag $tag): bool
diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php
index cf3c87f78f..200649bc44 100644
--- a/app/Repositories/User/UserRepository.php
+++ b/app/Repositories/User/UserRepository.php
@@ -132,6 +132,7 @@ class UserRepository implements UserRepositoryInterface
* @param User $user
*
* @return bool
+ *
* @throws \Exception
*/
public function destroy(User $user): bool
diff --git a/app/Services/Bunq/Request/BunqRequest.php b/app/Services/Bunq/Request/BunqRequest.php
index a8a5e8f465..ef30bf91b9 100644
--- a/app/Services/Bunq/Request/BunqRequest.php
+++ b/app/Services/Bunq/Request/BunqRequest.php
@@ -46,7 +46,7 @@ abstract class BunqRequest
* @var array
*/
private $upperCaseHeaders
- = [
+ = [
'x-bunq-client-response-id' => 'X-Bunq-Client-Response-Id',
'x-bunq-client-request-id' => 'X-Bunq-Client-Request-Id',
];
@@ -330,6 +330,7 @@ abstract class BunqRequest
* @param array $headers
*
* @return array
+ *
* @throws Exception
*/
protected function sendUnsignedBunqDelete(string $uri, array $headers): array
@@ -360,6 +361,7 @@ abstract class BunqRequest
* @param array $headers
*
* @return array
+ *
* @throws Exception
*/
protected function sendUnsignedBunqPost(string $uri, array $data, array $headers): array
diff --git a/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php b/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
index bc408e819b..0351dc4d52 100644
--- a/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
+++ b/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
@@ -34,7 +34,6 @@ class DeleteDeviceSessionRequest extends BunqRequest
private $sessionToken;
/**
- *
* @throws \Exception
*/
public function call(): void
diff --git a/app/Services/Bunq/Request/DeviceServerRequest.php b/app/Services/Bunq/Request/DeviceServerRequest.php
index be5b856c16..e17cd8b42e 100644
--- a/app/Services/Bunq/Request/DeviceServerRequest.php
+++ b/app/Services/Bunq/Request/DeviceServerRequest.php
@@ -40,7 +40,6 @@ class DeviceServerRequest extends BunqRequest
private $permittedIps = [];
/**
- *
* @throws \Exception
*/
public function call(): void
diff --git a/app/Services/Bunq/Request/DeviceSessionRequest.php b/app/Services/Bunq/Request/DeviceSessionRequest.php
index 2ec74ffacc..4f6bf028b5 100644
--- a/app/Services/Bunq/Request/DeviceSessionRequest.php
+++ b/app/Services/Bunq/Request/DeviceSessionRequest.php
@@ -46,7 +46,6 @@ class DeviceSessionRequest extends BunqRequest
private $userPerson;
/**
- *
* @throws \Exception
*/
public function call(): void
diff --git a/app/Services/Bunq/Request/InstallationTokenRequest.php b/app/Services/Bunq/Request/InstallationTokenRequest.php
index 4dc7662116..03eef6d185 100644
--- a/app/Services/Bunq/Request/InstallationTokenRequest.php
+++ b/app/Services/Bunq/Request/InstallationTokenRequest.php
@@ -40,7 +40,6 @@ class InstallationTokenRequest extends BunqRequest
private $publicKey = '';
/**
- *
* @throws \Exception
*/
public function call(): void
diff --git a/app/Services/Bunq/Request/ListDeviceServerRequest.php b/app/Services/Bunq/Request/ListDeviceServerRequest.php
index 8db6245547..dd72623152 100644
--- a/app/Services/Bunq/Request/ListDeviceServerRequest.php
+++ b/app/Services/Bunq/Request/ListDeviceServerRequest.php
@@ -43,7 +43,6 @@ class ListDeviceServerRequest extends BunqRequest
}
/**
- *
* @throws \Exception
*/
public function call(): void
diff --git a/app/Services/Bunq/Request/ListMonetaryAccountRequest.php b/app/Services/Bunq/Request/ListMonetaryAccountRequest.php
index 4c9492ff01..a1c92be526 100644
--- a/app/Services/Bunq/Request/ListMonetaryAccountRequest.php
+++ b/app/Services/Bunq/Request/ListMonetaryAccountRequest.php
@@ -39,7 +39,6 @@ class ListMonetaryAccountRequest extends BunqRequest
private $userId = 0;
/**
- *
* @throws \Exception
*/
public function call(): void
diff --git a/app/Services/Bunq/Request/ListUserRequest.php b/app/Services/Bunq/Request/ListUserRequest.php
index 0d1dff19ae..514b62a533 100644
--- a/app/Services/Bunq/Request/ListUserRequest.php
+++ b/app/Services/Bunq/Request/ListUserRequest.php
@@ -42,7 +42,6 @@ class ListUserRequest extends BunqRequest
private $userPerson;
/**
- *
* @throws \Exception
*/
public function call(): void
diff --git a/app/Services/Currency/ExchangeRateInterface.php b/app/Services/Currency/ExchangeRateInterface.php
index e54fa9bb34..8d97a6cc47 100644
--- a/app/Services/Currency/ExchangeRateInterface.php
+++ b/app/Services/Currency/ExchangeRateInterface.php
@@ -29,8 +29,6 @@ use FireflyIII\User;
/**
* Interface ExchangeRateInterface
- *
- * @package FireflyIII\Services\Currency
*/
interface ExchangeRateInterface
{
diff --git a/app/Services/Spectre/Object/Customer.php b/app/Services/Spectre/Object/Customer.php
index 21f2f2f0f2..218ad4d3e9 100644
--- a/app/Services/Spectre/Object/Customer.php
+++ b/app/Services/Spectre/Object/Customer.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\Services\Spectre\Object;
@@ -82,9 +81,4 @@ class Customer extends SpectreObject
{
$this->secret = $secret;
}
-
-
-
-
-
-}
\ No newline at end of file
+}
diff --git a/app/Services/Spectre/Object/SpectreObject.php b/app/Services/Spectre/Object/SpectreObject.php
index e41db10601..f731cdf317 100644
--- a/app/Services/Spectre/Object/SpectreObject.php
+++ b/app/Services/Spectre/Object/SpectreObject.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\Services\Spectre\Object;
@@ -28,5 +27,4 @@ namespace FireflyIII\Services\Spectre\Object;
*/
class SpectreObject
{
-
-}
\ No newline at end of file
+}
diff --git a/app/Services/Spectre/Request/ListProvidersRequest.php b/app/Services/Spectre/Request/ListProvidersRequest.php
index aa01f3a205..e523ea38f8 100644
--- a/app/Services/Spectre/Request/ListProvidersRequest.php
+++ b/app/Services/Spectre/Request/ListProvidersRequest.php
@@ -35,7 +35,6 @@ class ListProvidersRequest extends SpectreRequest
protected $providers = [];
/**
- *
* @throws \Exception
*/
public function call(): void
@@ -79,6 +78,4 @@ class ListProvidersRequest extends SpectreRequest
{
return $this->providers;
}
-
-
}
diff --git a/app/Services/Spectre/Request/NewCustomerRequest.php b/app/Services/Spectre/Request/NewCustomerRequest.php
index 93cbef13c7..e7a96330ec 100644
--- a/app/Services/Spectre/Request/NewCustomerRequest.php
+++ b/app/Services/Spectre/Request/NewCustomerRequest.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\Services\Spectre\Request;
@@ -32,7 +31,6 @@ class NewCustomerRequest extends SpectreRequest
protected $customer = [];
/**
- *
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function call(): void
@@ -58,6 +56,4 @@ class NewCustomerRequest extends SpectreRequest
{
return $this->customer;
}
-
-
-}
\ No newline at end of file
+}
diff --git a/app/Services/Spectre/Request/SpectreRequest.php b/app/Services/Spectre/Request/SpectreRequest.php
index c93e77c036..824bd8aca8 100644
--- a/app/Services/Spectre/Request/SpectreRequest.php
+++ b/app/Services/Spectre/Request/SpectreRequest.php
@@ -22,7 +22,6 @@ declare(strict_types=1);
namespace FireflyIII\Services\Spectre\Request;
-use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\User;
use Log;
@@ -232,7 +231,6 @@ abstract class SpectreRequest
$this->detectError($response);
$statusCode = intval($response->status_code);
-
$body = $response->body;
$array = json_decode($body, true);
$responseHeaders = $response->headers->getAll();
@@ -299,7 +297,7 @@ abstract class SpectreRequest
}
$statusCode = intval($response->status_code);
- if ($statusCode !== 200) {
+ if (200 !== $statusCode) {
throw new FireflyException(sprintf('Status code %d: %s', $statusCode, $response->body));
}
diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php
index 7f79eba74c..02e3775377 100644
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@@ -78,6 +78,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
*/
public function checkbox(string $name, $value = 1, $checked = null, $options = []): string
@@ -101,6 +102,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
*/
public function date(string $name, $value = null, array $options = []): string
@@ -120,6 +122,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
*/
public function file(string $name, array $options = []): string
@@ -138,6 +141,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
*/
public function integer(string $name, $value = null, array $options = []): string
@@ -158,6 +162,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
*/
public function location(string $name, $value = null, array $options = []): string
@@ -231,6 +236,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
*/
public function multiCheckbox(string $name, array $list = [], $selected = null, array $options = []): string
@@ -253,6 +259,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
*/
public function multiRadio(string $name, array $list = [], $selected = null, array $options = []): string
@@ -274,6 +281,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
* @throws Facades\FireflyException
*/
@@ -304,6 +312,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
* @throws Facades\FireflyException
*/
@@ -335,6 +344,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
*/
public function number(string $name, $value = null, array $options = []): string
@@ -356,6 +366,7 @@ class ExpandedForm
* @param $name
*
* @return string
+ *
* @throws \Throwable
*/
public function optionsList(string $type, string $name): string
@@ -379,6 +390,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
*/
public function password(string $name, array $options = []): string
@@ -398,6 +410,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
*/
public function select(string $name, array $list = [], $selected = null, array $options = []): string
@@ -419,6 +432,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
*/
public function staticText(string $name, $value, array $options = []): string
@@ -437,6 +451,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
*/
public function tags(string $name, $value = null, array $options = []): string
@@ -457,6 +472,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
*/
public function text(string $name, $value = null, array $options = []): string
@@ -476,6 +492,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
*/
public function textarea(string $name, $value = null, array $options = []): string
@@ -576,6 +593,7 @@ class ExpandedForm
* @param array $options
*
* @return string
+ *
* @throws \Throwable
* @throws Facades\FireflyException
*/
diff --git a/app/Support/Import/Configuration/File/Initial.php b/app/Support/Import/Configuration/File/Initial.php
index 35d4acccbb..66baa95f26 100644
--- a/app/Support/Import/Configuration/File/Initial.php
+++ b/app/Support/Import/Configuration/File/Initial.php
@@ -75,7 +75,6 @@ class Initial implements ConfigurationInterface
'specifix' => [],
'delimiters' => $delimiters,
'specifics' => $specifics,
-
];
return $data;
diff --git a/app/Support/Import/Configuration/File/Map.php b/app/Support/Import/Configuration/File/Map.php
index 04b2ce3a54..ec54b7315d 100644
--- a/app/Support/Import/Configuration/File/Map.php
+++ b/app/Support/Import/Configuration/File/Map.php
@@ -188,6 +188,7 @@ class Map implements ConfigurationInterface
/**
* @return bool
+ *
* @throws FireflyException
*/
private function getMappableColumns(): bool
diff --git a/app/Support/Import/Configuration/File/Roles.php b/app/Support/Import/Configuration/File/Roles.php
index 466c0c515c..7ae7495582 100644
--- a/app/Support/Import/Configuration/File/Roles.php
+++ b/app/Support/Import/Configuration/File/Roles.php
@@ -48,15 +48,16 @@ class Roles implements ConfigurationInterface
* Get the data necessary to show the configuration screen.
*
* @return array
+ *
* @throws \League\Csv\Exception
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function getData(): array
{
- $config = $this->job->configuration;
- $content = $this->job->uploadFileContents();
- $headers = [];
- $offset = 0;
+ $config = $this->job->configuration;
+ $content = $this->job->uploadFileContents();
+ $headers = [];
+ $offset = 0;
// create CSV reader.
$reader = Reader::createFromString($content);
$reader->setDelimiter($config['delimiter']);
diff --git a/app/Support/Import/Configuration/File/Upload.php b/app/Support/Import/Configuration/File/Upload.php
index d9545cdbc5..8b6943489d 100644
--- a/app/Support/Import/Configuration/File/Upload.php
+++ b/app/Support/Import/Configuration/File/Upload.php
@@ -107,11 +107,10 @@ class Upload implements ConfigurationInterface
$config['has-file-upload'] = $uploaded;
$repository->setConfiguration($this->job, $config);
- if ($uploaded === false) {
+ if (false === $uploaded) {
$this->warning = 'No valid upload.';
}
return true;
}
-
}
diff --git a/app/Support/Import/Configuration/Spectre/InputMandatory.php b/app/Support/Import/Configuration/Spectre/InputMandatory.php
index a077c3cee1..c6182ff53a 100644
--- a/app/Support/Import/Configuration/Spectre/InputMandatory.php
+++ b/app/Support/Import/Configuration/Spectre/InputMandatory.php
@@ -18,12 +18,10 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\Support\Import\Configuration\Spectre;
-
use Crypt;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\ImportJob;
@@ -42,6 +40,7 @@ class InputMandatory implements ConfigurationInterface
* Get the data necessary to show the configuration screen.
*
* @return array
+ *
* @throws FireflyException
*/
public function getData(): array
@@ -76,8 +75,6 @@ class InputMandatory implements ConfigurationInterface
/**
* @param ImportJob $job
- *
- * @return void
*/
public function setJob(ImportJob $job)
{
@@ -90,6 +87,7 @@ class InputMandatory implements ConfigurationInterface
* @param array $data
*
* @return bool
+ *
* @throws FireflyException
*/
public function storeConfiguration(array $data): bool
@@ -120,4 +118,4 @@ class InputMandatory implements ConfigurationInterface
return true;
}
-}
\ No newline at end of file
+}
diff --git a/app/Support/Import/Configuration/Spectre/SelectCountry.php b/app/Support/Import/Configuration/Spectre/SelectCountry.php
index 356046605a..eec76e8e54 100644
--- a/app/Support/Import/Configuration/Spectre/SelectCountry.php
+++ b/app/Support/Import/Configuration/Spectre/SelectCountry.php
@@ -18,12 +18,10 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\Support\Import\Configuration\Spectre;
-
use FireflyIII\Models\ImportJob;
use FireflyIII\Models\SpectreProvider;
use FireflyIII\Support\Import\Configuration\ConfigurationInterface;
@@ -324,8 +322,6 @@ class SelectCountry implements ConfigurationInterface
/**
* @param ImportJob $job
- *
- * @return void
*/
public function setJob(ImportJob $job)
{
@@ -341,12 +337,12 @@ class SelectCountry implements ConfigurationInterface
*/
public function storeConfiguration(array $data): bool
{
- $config = $this->job->configuration;
- $config['country'] = $data['country_code'] ?? 'XF'; // default to fake country.
+ $config = $this->job->configuration;
+ $config['country'] = $data['country_code'] ?? 'XF'; // default to fake country.
$config['selected-country'] = true;
- $this->job->configuration = $config;
+ $this->job->configuration = $config;
$this->job->save();
return true;
}
-}
\ No newline at end of file
+}
diff --git a/app/Support/Import/Configuration/Spectre/SelectProvider.php b/app/Support/Import/Configuration/Spectre/SelectProvider.php
index 22332a7c48..843a722c04 100644
--- a/app/Support/Import/Configuration/Spectre/SelectProvider.php
+++ b/app/Support/Import/Configuration/Spectre/SelectProvider.php
@@ -18,12 +18,10 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\Support\Import\Configuration\Spectre;
-
use FireflyIII\Models\ImportJob;
use FireflyIII\Models\SpectreProvider;
use FireflyIII\Support\Import\Configuration\ConfigurationInterface;
@@ -69,8 +67,6 @@ class SelectProvider implements ConfigurationInterface
/**
* @param ImportJob $job
- *
- * @return void
*/
public function setJob(ImportJob $job)
{
@@ -86,12 +82,12 @@ class SelectProvider implements ConfigurationInterface
*/
public function storeConfiguration(array $data): bool
{
- $config = $this->job->configuration;
- $config['provider'] = intval($data['provider_code']) ?? 0; // default to fake country.
- $config['selected-provider'] = true;
- $this->job->configuration = $config;
+ $config = $this->job->configuration;
+ $config['provider'] = intval($data['provider_code']) ?? 0; // default to fake country.
+ $config['selected-provider'] = true;
+ $this->job->configuration = $config;
$this->job->save();
return true;
}
-}
\ No newline at end of file
+}
diff --git a/app/Support/Import/Information/BunqInformation.php b/app/Support/Import/Information/BunqInformation.php
index 7ea5ed7b08..851cafb2af 100644
--- a/app/Support/Import/Information/BunqInformation.php
+++ b/app/Support/Import/Information/BunqInformation.php
@@ -61,6 +61,7 @@ class BunqInformation implements InformationInterface
* color: any associated color.
*
* @return array
+ *
* @throws FireflyException
*/
public function getAccounts(): array
@@ -138,6 +139,7 @@ class BunqInformation implements InformationInterface
* @param int $userId
*
* @return Collection
+ *
* @throws \Exception
*/
private function getMonetaryAccounts(SessionToken $sessionToken, int $userId): Collection
@@ -190,6 +192,7 @@ class BunqInformation implements InformationInterface
/**
* @return SessionToken
+ *
* @throws \Exception
*/
private function startSession(): SessionToken
diff --git a/app/Support/Import/Information/SpectreInformation.php b/app/Support/Import/Information/SpectreInformation.php
index a105658985..4d59d6e855 100644
--- a/app/Support/Import/Information/SpectreInformation.php
+++ b/app/Support/Import/Information/SpectreInformation.php
@@ -61,6 +61,7 @@ class SpectreInformation implements InformationInterface
* color: any associated color.
*
* @return array
+ *
* @throws FireflyException
*/
public function getAccounts(): array
@@ -138,6 +139,7 @@ class SpectreInformation implements InformationInterface
* @param int $userId
*
* @return Collection
+ *
* @throws \Exception
*/
private function getMonetaryAccounts(SessionToken $sessionToken, int $userId): Collection
@@ -190,6 +192,7 @@ class SpectreInformation implements InformationInterface
/**
* @return SessionToken
+ *
* @throws \Exception
*/
private function startSession(): SessionToken
diff --git a/app/Support/Models/TransactionJournalTrait.php b/app/Support/Models/TransactionJournalTrait.php
index 127d1d31a6..196f154d45 100644
--- a/app/Support/Models/TransactionJournalTrait.php
+++ b/app/Support/Models/TransactionJournalTrait.php
@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Support\Models;
use Carbon\Carbon;
-use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournalMeta;
use FireflyIII\Models\TransactionType;
@@ -45,7 +44,6 @@ trait TransactionJournalTrait
{
/**
* @return string
- *
*/
public function amount(): string
{
diff --git a/app/Support/Search/Modifier.php b/app/Support/Search/Modifier.php
index eb6eb28e1b..afce3946c8 100644
--- a/app/Support/Search/Modifier.php
+++ b/app/Support/Search/Modifier.php
@@ -24,7 +24,6 @@ namespace FireflyIII\Support\Search;
use Carbon\Carbon;
use Exception;
-use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Transaction;
use Log;
use Steam;
@@ -59,7 +58,6 @@ class Modifier
* @return bool
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
- *
*/
public static function apply(array $modifier, Transaction $transaction): bool
{
diff --git a/app/TransactionRules/Actions/ClearNotes.php b/app/TransactionRules/Actions/ClearNotes.php
index ff823ffbeb..7dec7f12f7 100644
--- a/app/TransactionRules/Actions/ClearNotes.php
+++ b/app/TransactionRules/Actions/ClearNotes.php
@@ -51,6 +51,7 @@ class ClearNotes implements ActionInterface
* @param TransactionJournal $journal
*
* @return bool
+ *
* @throws \Exception
*/
public function act(TransactionJournal $journal): bool
diff --git a/app/TransactionRules/Actions/RemoveTag.php b/app/TransactionRules/Actions/RemoveTag.php
index d184e17ad6..dd81dedfd5 100644
--- a/app/TransactionRules/Actions/RemoveTag.php
+++ b/app/TransactionRules/Actions/RemoveTag.php
@@ -67,6 +67,7 @@ class RemoveTag implements ActionInterface
Log::debug(sprintf('RuleAction RemoveTag removed tag #%d ("%s") from journal #%d.', $tag->id, $tag->tag, $journal->id));
$journal->tags()->detach([$tag->id]);
$journal->touch();
+
return true;
}
Log::debug(sprintf('RuleAction RemoveTag tried to remove tag "%s" from journal #%d but no such tag exists.', $name, $journal->id));
diff --git a/app/TransactionRules/Actions/SetBudget.php b/app/TransactionRules/Actions/SetBudget.php
index ba5bf6926c..795cb61ee6 100644
--- a/app/TransactionRules/Actions/SetBudget.php
+++ b/app/TransactionRules/Actions/SetBudget.php
@@ -89,6 +89,7 @@ class SetBudget implements ActionInterface
$journal->budgets()->sync([$budget->id]);
$journal->touch();
+
return true;
}
}
diff --git a/app/TransactionRules/Actions/SetDescription.php b/app/TransactionRules/Actions/SetDescription.php
index a59778d7aa..ff703d0e32 100644
--- a/app/TransactionRules/Actions/SetDescription.php
+++ b/app/TransactionRules/Actions/SetDescription.php
@@ -35,7 +35,6 @@ class SetDescription implements ActionInterface
private $action;
/**
- *
* TriggerInterface constructor.
*
* @param RuleAction $action
diff --git a/app/TransactionRules/Actions/SetDestinationAccount.php b/app/TransactionRules/Actions/SetDestinationAccount.php
index 24d047fc51..e522903edf 100644
--- a/app/TransactionRules/Actions/SetDestinationAccount.php
+++ b/app/TransactionRules/Actions/SetDestinationAccount.php
@@ -59,6 +59,7 @@ class SetDestinationAccount implements ActionInterface
/**
* Set destination account to X
+ *
* @param TransactionJournal $journal
*
* @return bool
diff --git a/app/TransactionRules/Actions/SetNotes.php b/app/TransactionRules/Actions/SetNotes.php
index d59be0d862..e4193e5c6e 100644
--- a/app/TransactionRules/Actions/SetNotes.php
+++ b/app/TransactionRules/Actions/SetNotes.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\TransactionRules\Actions;
diff --git a/app/TransactionRules/Actions/SetSourceAccount.php b/app/TransactionRules/Actions/SetSourceAccount.php
index c5dcd32bed..5244211892 100644
--- a/app/TransactionRules/Actions/SetSourceAccount.php
+++ b/app/TransactionRules/Actions/SetSourceAccount.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
namespace FireflyIII\TransactionRules\Actions;
@@ -42,7 +41,7 @@ class SetSourceAccount implements ActionInterface
/** @var TransactionJournal The journal */
private $journal;
- /** @var Account The new source account*/
+ /** @var Account The new source account */
private $newSourceAccount;
/** @var AccountRepositoryInterface Account repository */
diff --git a/app/TransactionRules/Factory/ActionFactory.php b/app/TransactionRules/Factory/ActionFactory.php
index b776ec244b..f9864c0e5d 100644
--- a/app/TransactionRules/Factory/ActionFactory.php
+++ b/app/TransactionRules/Factory/ActionFactory.php
@@ -47,6 +47,7 @@ class ActionFactory
* @param RuleAction $action
*
* @return ActionInterface
+ *
* @throws FireflyException
*/
public static function getAction(RuleAction $action): ActionInterface
diff --git a/app/TransactionRules/Factory/TriggerFactory.php b/app/TransactionRules/Factory/TriggerFactory.php
index dc0529e33b..9616939987 100644
--- a/app/TransactionRules/Factory/TriggerFactory.php
+++ b/app/TransactionRules/Factory/TriggerFactory.php
@@ -49,6 +49,7 @@ class TriggerFactory
* @param RuleTrigger $trigger
*
* @return AbstractTrigger
+ *
* @throws FireflyException
*/
public static function getTrigger(RuleTrigger $trigger)
diff --git a/app/TransactionRules/Processor.php b/app/TransactionRules/Processor.php
index f3b7677d52..0c35753533 100644
--- a/app/TransactionRules/Processor.php
+++ b/app/TransactionRules/Processor.php
@@ -45,7 +45,7 @@ final class Processor
public $journal;
/** @var Rule Rule that applies */
public $rule;
- /** @var Collection All triggers*/
+ /** @var Collection All triggers */
public $triggers;
/** @var int Found triggers */
private $foundTriggers = 0;
@@ -95,6 +95,7 @@ final class Processor
* @param string $triggerValue
*
* @return Processor
+ *
* @throws \FireflyIII\Exceptions\FireflyException
*/
public static function makeFromString(string $triggerName, string $triggerValue)
@@ -119,6 +120,7 @@ final class Processor
* @param array $triggers
*
* @return Processor
+ *
* @throws \FireflyIII\Exceptions\FireflyException
*/
public static function makeFromStringArray(array $triggers)
diff --git a/app/TransactionRules/TransactionMatcher.php b/app/TransactionRules/TransactionMatcher.php
index 71f2ddc12f..11a8ed8a9d 100644
--- a/app/TransactionRules/TransactionMatcher.php
+++ b/app/TransactionRules/TransactionMatcher.php
@@ -109,6 +109,7 @@ class TransactionMatcher
/**
* Return limit
+ *
* @return int
*/
public function getLimit(): int
@@ -132,6 +133,7 @@ class TransactionMatcher
/**
* Get range
+ *
* @return int
*/
public function getRange(): int
@@ -155,6 +157,7 @@ class TransactionMatcher
/**
* Get triggers
+ *
* @return array
*/
public function getTriggers(): array
diff --git a/app/TransactionRules/Triggers/AbstractTrigger.php b/app/TransactionRules/Triggers/AbstractTrigger.php
index caddc279fc..201bcbad57 100644
--- a/app/TransactionRules/Triggers/AbstractTrigger.php
+++ b/app/TransactionRules/Triggers/AbstractTrigger.php
@@ -73,6 +73,7 @@ class AbstractTrigger
/**
* Make a new trigger from the rule trigger in the parameter
+ *
* @codeCoverageIgnore
*
* @param RuleTrigger $trigger
diff --git a/app/TransactionRules/Triggers/DescriptionContains.php b/app/TransactionRules/Triggers/DescriptionContains.php
index f7da2a4eea..d055699e2f 100644
--- a/app/TransactionRules/Triggers/DescriptionContains.php
+++ b/app/TransactionRules/Triggers/DescriptionContains.php
@@ -64,6 +64,7 @@ final class DescriptionContains extends AbstractTrigger implements TriggerInterf
/**
* Returns true when description contains X
+ *
* @param TransactionJournal $journal
*
* @return bool
diff --git a/app/TransactionRules/Triggers/HasNoBudget.php b/app/TransactionRules/Triggers/HasNoBudget.php
index e6505661c0..fa4bae0539 100644
--- a/app/TransactionRules/Triggers/HasNoBudget.php
+++ b/app/TransactionRules/Triggers/HasNoBudget.php
@@ -54,6 +54,7 @@ final class HasNoBudget extends AbstractTrigger implements TriggerInterface
/**
* Returns true when journal has no budget
+ *
* @param TransactionJournal $journal
*
* @return bool
diff --git a/app/TransactionRules/Triggers/NotesEnd.php b/app/TransactionRules/Triggers/NotesEnd.php
index 62798173c0..08cc86e290 100644
--- a/app/TransactionRules/Triggers/NotesEnd.php
+++ b/app/TransactionRules/Triggers/NotesEnd.php
@@ -65,6 +65,7 @@ final class NotesEnd extends AbstractTrigger implements TriggerInterface
/**
* Returns true when notes end with X
+ *
* @param TransactionJournal $journal
*
* @return bool
diff --git a/app/TransactionRules/Triggers/ToAccountIs.php b/app/TransactionRules/Triggers/ToAccountIs.php
index 53ce7d67b4..87b3831fea 100644
--- a/app/TransactionRules/Triggers/ToAccountIs.php
+++ b/app/TransactionRules/Triggers/ToAccountIs.php
@@ -64,6 +64,7 @@ final class ToAccountIs extends AbstractTrigger implements TriggerInterface
/**
* Returns true when to-account is X.
+ *
* @param TransactionJournal $journal
*
* @return bool
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 31397138b1..db84ef623b 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Carbon\Carbon;
diff --git a/database/migrations/2016_06_16_000000_create_support_tables.php b/database/migrations/2016_06_16_000000_create_support_tables.php
index 5785f6f04f..6e8d697ffb 100644
--- a/database/migrations/2016_06_16_000000_create_support_tables.php
+++ b/database/migrations/2016_06_16_000000_create_support_tables.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2016_06_16_000001_create_users_table.php b/database/migrations/2016_06_16_000001_create_users_table.php
index f4f0e7e1d7..551bfa748f 100644
--- a/database/migrations/2016_06_16_000001_create_users_table.php
+++ b/database/migrations/2016_06_16_000001_create_users_table.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2016_06_16_000002_create_main_tables.php b/database/migrations/2016_06_16_000002_create_main_tables.php
index a1d830e932..09e547b800 100644
--- a/database/migrations/2016_06_16_000002_create_main_tables.php
+++ b/database/migrations/2016_06_16_000002_create_main_tables.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2016_08_25_091522_changes_for_3101.php b/database/migrations/2016_08_25_091522_changes_for_3101.php
index 3611fcd9c2..5fabe0ffe0 100644
--- a/database/migrations/2016_08_25_091522_changes_for_3101.php
+++ b/database/migrations/2016_08_25_091522_changes_for_3101.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2016_09_12_121359_fix_nullables.php b/database/migrations/2016_09_12_121359_fix_nullables.php
index 1ace696868..606e08f4b9 100644
--- a/database/migrations/2016_09_12_121359_fix_nullables.php
+++ b/database/migrations/2016_09_12_121359_fix_nullables.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2016_10_09_150037_expand_transactions_table.php b/database/migrations/2016_10_09_150037_expand_transactions_table.php
index 55812581f6..a6ae3345a2 100644
--- a/database/migrations/2016_10_09_150037_expand_transactions_table.php
+++ b/database/migrations/2016_10_09_150037_expand_transactions_table.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2016_10_22_075804_changes_for_v410.php b/database/migrations/2016_10_22_075804_changes_for_v410.php
index a69a036741..227d40732e 100644
--- a/database/migrations/2016_10_22_075804_changes_for_v410.php
+++ b/database/migrations/2016_10_22_075804_changes_for_v410.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2016_11_24_210552_changes_for_v420.php b/database/migrations/2016_11_24_210552_changes_for_v420.php
index 37dcc6dfa8..9f209d531d 100644
--- a/database/migrations/2016_11_24_210552_changes_for_v420.php
+++ b/database/migrations/2016_11_24_210552_changes_for_v420.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2016_12_22_150431_changes_for_v430.php b/database/migrations/2016_12_22_150431_changes_for_v430.php
index fdcc789f7d..f35038fcb8 100644
--- a/database/migrations/2016_12_22_150431_changes_for_v430.php
+++ b/database/migrations/2016_12_22_150431_changes_for_v430.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2016_12_28_203205_changes_for_v431.php b/database/migrations/2016_12_28_203205_changes_for_v431.php
index 16cd72eafb..10168fb337 100644
--- a/database/migrations/2016_12_28_203205_changes_for_v431.php
+++ b/database/migrations/2016_12_28_203205_changes_for_v431.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2017_04_13_163623_changes_for_v440.php b/database/migrations/2017_04_13_163623_changes_for_v440.php
index 84eceac28b..c5829ec619 100644
--- a/database/migrations/2017_04_13_163623_changes_for_v440.php
+++ b/database/migrations/2017_04_13_163623_changes_for_v440.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2017_06_02_105232_changes_for_v450.php b/database/migrations/2017_06_02_105232_changes_for_v450.php
index f2f0d96454..4df00f1393 100644
--- a/database/migrations/2017_06_02_105232_changes_for_v450.php
+++ b/database/migrations/2017_06_02_105232_changes_for_v450.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2017_08_20_062014_changes_for_v470.php b/database/migrations/2017_08_20_062014_changes_for_v470.php
index 5ac77b7537..fc42fba920 100644
--- a/database/migrations/2017_08_20_062014_changes_for_v470.php
+++ b/database/migrations/2017_08_20_062014_changes_for_v470.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2017_11_04_170844_changes_for_v470a.php b/database/migrations/2017_11_04_170844_changes_for_v470a.php
index 1b72ed3a5f..b2d1f603cc 100644
--- a/database/migrations/2017_11_04_170844_changes_for_v470a.php
+++ b/database/migrations/2017_11_04_170844_changes_for_v470a.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
diff --git a/database/migrations/2017_12_09_111046_changes_for_spectre.php b/database/migrations/2017_12_09_111046_changes_for_spectre.php
index 752da44c92..ce907194ce 100644
--- a/database/migrations/2017_12_09_111046_changes_for_spectre.php
+++ b/database/migrations/2017_12_09_111046_changes_for_spectre.php
@@ -1,5 +1,8 @@
.
*/
-
declare(strict_types=1);
use FireflyIII\Models\AccountType;
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 18027044f3..de5a134985 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use Illuminate\Database\Seeder;
diff --git a/database/seeds/LinkTypeSeeder.php b/database/seeds/LinkTypeSeeder.php
index d81d184af1..c8d0266ca6 100644
--- a/database/seeds/LinkTypeSeeder.php
+++ b/database/seeds/LinkTypeSeeder.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use FireflyIII\Models\LinkType;
diff --git a/database/seeds/PermissionSeeder.php b/database/seeds/PermissionSeeder.php
index a95680bf5c..13690c8d62 100644
--- a/database/seeds/PermissionSeeder.php
+++ b/database/seeds/PermissionSeeder.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use FireflyIII\Models\Role;
diff --git a/database/seeds/TransactionCurrencySeeder.php b/database/seeds/TransactionCurrencySeeder.php
index 19fcd704c0..99552db096 100644
--- a/database/seeds/TransactionCurrencySeeder.php
+++ b/database/seeds/TransactionCurrencySeeder.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use FireflyIII\Models\TransactionCurrency;
diff --git a/database/seeds/TransactionTypeSeeder.php b/database/seeds/TransactionTypeSeeder.php
index 15f5b03f33..7bed4bd7f9 100644
--- a/database/seeds/TransactionTypeSeeder.php
+++ b/database/seeds/TransactionTypeSeeder.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
use FireflyIII\Models\TransactionType;
diff --git a/resources/lang/en_US/auth.php b/resources/lang/en_US/auth.php
index 6b133fe2a9..a9ccd1af92 100644
--- a/resources/lang/en_US/auth.php
+++ b/resources/lang/en_US/auth.php
@@ -18,11 +18,9 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
return [
-
/*
|--------------------------------------------------------------------------
| Authentication Language Lines
@@ -36,5 +34,4 @@ return [
'failed' => 'These credentials do not match our records.',
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
-
];
diff --git a/resources/lang/en_US/bank.php b/resources/lang/en_US/bank.php
index 49e01192b1..ef0d636f91 100644
--- a/resources/lang/en_US/bank.php
+++ b/resources/lang/en_US/bank.php
@@ -18,10 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
-
return [
-
];
diff --git a/resources/lang/en_US/breadcrumbs.php b/resources/lang/en_US/breadcrumbs.php
index 78b34ccdaa..0777e36191 100644
--- a/resources/lang/en_US/breadcrumbs.php
+++ b/resources/lang/en_US/breadcrumbs.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
return [
diff --git a/resources/lang/en_US/config.php b/resources/lang/en_US/config.php
index 74180288e2..d3be97099d 100644
--- a/resources/lang/en_US/config.php
+++ b/resources/lang/en_US/config.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
return [
@@ -31,5 +30,4 @@ return [
'quarter_of_year' => '%B %Y',
'year' => '%Y',
'half_year' => '%B %Y',
-
];
diff --git a/resources/lang/en_US/csv.php b/resources/lang/en_US/csv.php
index 22c74cf9f3..d61316b632 100644
--- a/resources/lang/en_US/csv.php
+++ b/resources/lang/en_US/csv.php
@@ -18,9 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
return [
-
];
diff --git a/resources/lang/en_US/demo.php b/resources/lang/en_US/demo.php
index 55b8bdf9be..4131067703 100644
--- a/resources/lang/en_US/demo.php
+++ b/resources/lang/en_US/demo.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
return [
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 4fc22f03e6..69deb78c7f 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
return [
@@ -353,7 +352,6 @@ return [
'rule_action_set_notes_choice' => 'Set notes to..',
'rule_action_set_notes' => 'Set notes to ":action_value"',
-
'rules_have_read_warning' => 'Have you read the warning?',
'apply_rule_warning' => 'Warning: running a rule(group) on a large selection of transactions could take ages, and it could time-out. If it does, the rule(group) will only be applied to an unknown subset of your transactions. This might leave your financial administration in tatters. Please be careful.',
@@ -430,7 +428,6 @@ return [
'optional_field_attachments' => 'Attachments',
'optional_field_meta_data' => 'Optional meta data',
-
// profile:
'change_your_password' => 'Change your password',
'delete_account' => 'Delete account',
@@ -467,7 +464,6 @@ return [
'login_with_new_email' => 'You can now login with your new email address.',
'login_with_old_email' => 'You can now login with your old email address again.',
-
// attachments
'nr_of_attachments' => 'One attachment|:count attachments',
'attachments' => 'Attachments',
@@ -573,7 +569,6 @@ return [
'suggested' => 'Suggested',
'average_between' => 'Average between :start and :end',
-
// bills:
'matching_on' => 'Matching on',
'between_amounts' => 'between :low and :high.',
@@ -729,7 +724,6 @@ return [
'opt_group_sharedAsset' => 'Shared asset accounts',
'opt_group_ccAsset' => 'Credit cards',
-
// new user:
'welcome' => 'Welcome to Firefly!',
'submit' => 'Submit',
@@ -1053,7 +1047,6 @@ return [
'(partially) pays for_outward' => '(partially) pays for',
'(partially) reimburses_outward' => '(partially) reimburses',
-
// split a transaction:
'splits' => 'Splits',
'add_another_split' => 'Add another split',
@@ -1131,6 +1124,4 @@ return [
'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent or insurance.',
'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
'no_bills_create_default' => 'Create a bill',
-
-
];
diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php
index b614d014fd..629eab85fa 100644
--- a/resources/lang/en_US/form.php
+++ b/resources/lang/en_US/form.php
@@ -18,11 +18,9 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
return [
-
// new user:
'bank_name' => 'Bank name',
'bank_balance' => 'Balance',
@@ -90,7 +88,6 @@ return [
'convert_Deposit' => 'Convert deposit',
'convert_Transfer' => 'Convert transfer',
-
'amount' => 'Amount',
'date' => 'Date',
'interest_date' => 'Interest date',
@@ -179,13 +176,11 @@ return [
'blocked' => 'Is blocked?',
'blocked_code' => 'Reason for block',
-
// admin
'domain' => 'Domain',
'single_user_mode' => 'Disable user registration',
'is_demo_site' => 'Is demo site',
-
// import
'import_file' => 'Import file',
'configuration_file' => 'Configuration file',
@@ -203,7 +198,6 @@ return [
'country_code' => 'Country code',
'provider_code' => 'Bank or data-provider',
-
'due_date' => 'Due date',
'payment_date' => 'Payment date',
'invoice_date' => 'Invoice date',
diff --git a/resources/lang/en_US/import.php b/resources/lang/en_US/import.php
index aeb2e41c55..5ee8ad72ee 100644
--- a/resources/lang/en_US/import.php
+++ b/resources/lang/en_US/import.php
@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
-
return [
// status of import:
'status_wait_title' => 'Please hold...',
@@ -92,7 +90,6 @@ return [
'csv_roles_submit' => 'Continue with step 4/4',
'csv_roles_warning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
-
// file: map data
'file_map_title' => 'Import setup (4/4) - Connect import data to Firefly III data',
'file_map_text' => 'In the following tables, the left value shows you information found in your uploaded file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.',
@@ -156,4 +153,4 @@ return [
'spectre_input_fields_title' => 'Input mandatory fields',
'spectre_input_fields_text' => 'The following fields are mandated by ":provider" (from :country).',
'spectre_instructions_english' => 'These instructions are provided by Spectre for your convencience. They are in English:',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/en_US/intro.php b/resources/lang/en_US/intro.php
index 42477bdf5f..2a09aff2a7 100644
--- a/resources/lang/en_US/intro.php
+++ b/resources/lang/en_US/intro.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
return [
diff --git a/resources/lang/en_US/list.php b/resources/lang/en_US/list.php
index 0658280acf..f7f6d0c8fa 100644
--- a/resources/lang/en_US/list.php
+++ b/resources/lang/en_US/list.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
return [
diff --git a/resources/lang/en_US/pagination.php b/resources/lang/en_US/pagination.php
index 7f67f61536..2c19d61e0c 100644
--- a/resources/lang/en_US/pagination.php
+++ b/resources/lang/en_US/pagination.php
@@ -18,12 +18,9 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
return [
-
'previous' => '« Previous',
'next' => 'Next »',
-
];
diff --git a/resources/lang/en_US/passwords.php b/resources/lang/en_US/passwords.php
index fe0c40ab0b..022045d473 100644
--- a/resources/lang/en_US/passwords.php
+++ b/resources/lang/en_US/passwords.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
return [
diff --git a/resources/lang/en_US/validation.php b/resources/lang/en_US/validation.php
index ba0fd8bfc7..2aed996555 100644
--- a/resources/lang/en_US/validation.php
+++ b/resources/lang/en_US/validation.php
@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see .
*/
-
declare(strict_types=1);
return [
diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twig
index bffcb0d779..90a031efbb 100644
--- a/resources/views/list/accounts.twig
+++ b/resources/views/list/accounts.twig
@@ -68,4 +68,4 @@
{{ accounts.render|raw }}
-
\ No newline at end of file
+
diff --git a/tests/Feature/Controllers/Account/ReconcileControllerTest.php b/tests/Feature/Controllers/Account/ReconcileControllerTest.php
index ed20501594..11d8428f41 100644
--- a/tests/Feature/Controllers/Account/ReconcileControllerTest.php
+++ b/tests/Feature/Controllers/Account/ReconcileControllerTest.php
@@ -283,4 +283,4 @@ class ReconcileControllerTest extends TestCase
$response->assertSessionHas('error');
}
-}
\ No newline at end of file
+}
diff --git a/tests/Feature/Controllers/Admin/HomeControllerTest.php b/tests/Feature/Controllers/Admin/HomeControllerTest.php
index 2189bbcd45..2948f79006 100644
--- a/tests/Feature/Controllers/Admin/HomeControllerTest.php
+++ b/tests/Feature/Controllers/Admin/HomeControllerTest.php
@@ -48,7 +48,8 @@ class HomeControllerTest extends TestCase
$response->assertSee('');
}
- public function testTestMessage() {
+ public function testTestMessage()
+ {
Event::fake();
$this->be($this->user());
diff --git a/tests/Feature/Controllers/BudgetControllerTest.php b/tests/Feature/Controllers/BudgetControllerTest.php
index 49f7537508..88fdd3200a 100644
--- a/tests/Feature/Controllers/BudgetControllerTest.php
+++ b/tests/Feature/Controllers/BudgetControllerTest.php
@@ -44,20 +44,6 @@ use Tests\TestCase;
class BudgetControllerTest extends TestCase
{
- /**
- * @covers \FireflyIII\Http\Controllers\BudgetController::infoIncome
- */
- public function testInfoIncome() {
- // mock stuff
- $repository = $this->mock(BudgetRepositoryInterface::class);
- $repository->shouldReceive('getAvailableBudget')->andReturn('100.123');
-
- $data = ['amount' => 200, 'start' => '2017-01-01', 'end' => '2017-01-31'];
- $this->be($this->user());
- $response = $this->get(route('budgets.income.info', ['20170101','20170131']), $data);
- $response->assertStatus(200);
- }
-
/**
* @covers \FireflyIII\Http\Controllers\BudgetController::amount
*/
@@ -299,6 +285,21 @@ class BudgetControllerTest extends TestCase
$response->assertSee('');
}
+ /**
+ * @covers \FireflyIII\Http\Controllers\BudgetController::infoIncome
+ */
+ public function testInfoIncome()
+ {
+ // mock stuff
+ $repository = $this->mock(BudgetRepositoryInterface::class);
+ $repository->shouldReceive('getAvailableBudget')->andReturn('100.123');
+
+ $data = ['amount' => 200, 'start' => '2017-01-01', 'end' => '2017-01-31'];
+ $this->be($this->user());
+ $response = $this->get(route('budgets.income.info', ['20170101', '20170131']), $data);
+ $response->assertStatus(200);
+ }
+
/**
* @covers \FireflyIII\Http\Controllers\BudgetController::noBudget
* @covers \FireflyIII\Http\Controllers\BudgetController::getPeriodOverview
diff --git a/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php b/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php
index 9ea2de17f8..2608351a4b 100644
--- a/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php
+++ b/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php
@@ -57,10 +57,10 @@ class ExpenseReportControllerTest extends TestCase
$accountRepository = $this->mock(AccountRepositoryInterface::class);
$accountRepository->shouldReceive('findByName')->once()->andReturn($expense);
- $set = new Collection;
- $transaction = new Transaction();
+ $set = new Collection;
+ $transaction = new Transaction();
$transaction->opposing_account_name = 'Somebody';
- $transaction->transaction_amount = '5';
+ $transaction->transaction_amount = '5';
$set->push($transaction);
$collector->shouldReceive('setAccounts')->andReturnSelf();
$collector->shouldReceive('setRange')->andReturnSelf();
diff --git a/tests/Feature/Controllers/ProfileControllerTest.php b/tests/Feature/Controllers/ProfileControllerTest.php
index db51169be8..aa13f16329 100644
--- a/tests/Feature/Controllers/ProfileControllerTest.php
+++ b/tests/Feature/Controllers/ProfileControllerTest.php
@@ -340,7 +340,7 @@ class ProfileControllerTest extends TestCase
}
/**
- * @covers \FireflyIII\Http\Controllers\ProfileController::undoEmailChange()
+ * @covers \FireflyIII\Http\Controllers\ProfileController::undoEmailChange()
* @expectedExceptionMessage Invalid token
*/
public function testUndoEmailChangeBadHash()
@@ -364,7 +364,7 @@ class ProfileControllerTest extends TestCase
}
/**
- * @covers \FireflyIII\Http\Controllers\ProfileController::undoEmailChange()
+ * @covers \FireflyIII\Http\Controllers\ProfileController::undoEmailChange()
* @expectedExceptionMessage Invalid token
*/
public function testUndoEmailChangeBadToken()