Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Some minor code cleanup.
James Cole12bbc91dca32
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.phpindex d99f878a27..6f5b8db551 100644--- a/app/Http/Controllers/Controller.php+++ b/app/Http/Controllers/Controller.php@@ -99,6 +99,7 @@ abstract class Controller extends BaseController$logoutUrl = config('firefly.custom_logout_url');// overrule v2 layout back to v1.+if ('true' === request()->get('force_default_layout') && 'v2' === config('view.layout')) {// config('view.layout','v1');Config::set('view.layout', 'v1');diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.phpindex 56078984e2..4d20d602fc 100644--- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php+++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php@@ -27,6 +27,8 @@ use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Attachment;use FireflyIII\Models\UserGroup;+use FireflyIII\User;+use Illuminate\Contracts\Auth\Authenticatable;use Illuminate\Support\Collection;/**@@ -37,7 +39,8 @@ use Illuminate\Support\Collection;* @method getUser()* @method checkUserGroupAccess(UserRoleEnum $role)* @method setUserGroupById(int $userGroupId)- */+ * @method setUser(null|Authenticatable|User $user)+*/interface AttachmentRepositoryInterface{public function destroy(Attachment $attachment): bool;diff --git a/app/Repositories/PeriodStatistic/PeriodStatisticRepository.php b/app/Repositories/PeriodStatistic/PeriodStatisticRepository.phpindex 9832e0b24d..2d9c0109a7 100644--- a/app/Repositories/PeriodStatistic/PeriodStatisticRepository.php+++ b/app/Repositories/PeriodStatistic/PeriodStatisticRepository.php@@ -25,7 +25,10 @@ declare(strict_types=1);namespace FireflyIII\Repositories\PeriodStatistic;use Carbon\Carbon;+use FireflyIII\Models\Account;+use FireflyIII\Models\Category;use FireflyIII\Models\PeriodStatistic;+use FireflyIII\Models\Tag;use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;use Illuminate\Database\Eloquent\Builder;@@ -38,7 +41,7 @@ class PeriodStatisticRepository implements PeriodStatisticRepositoryInterface, U{use UserGroupTrait;- public function allInRangeForModel(Model $model, Carbon $start, Carbon $end): Collection+ public function allInRangeForModel(Account|Category|Tag $model, Carbon $start, Carbon $end): Collection{return $model->primaryPeriodStatistics()->where('start', '>=', $start)->where('end', '<=', $end)->get();}diff --git a/app/Repositories/PeriodStatistic/PeriodStatisticRepositoryInterface.php b/app/Repositories/PeriodStatistic/PeriodStatisticRepositoryInterface.phpindex effc726764..6e9bce6afa 100644--- a/app/Repositories/PeriodStatistic/PeriodStatisticRepositoryInterface.php+++ b/app/Repositories/PeriodStatistic/PeriodStatisticRepositoryInterface.php@@ -25,13 +25,17 @@ declare(strict_types=1);namespace FireflyIII\Repositories\PeriodStatistic;use Carbon\Carbon;+use FireflyIII\Models\Account;+use FireflyIII\Models\Category;use FireflyIII\Models\PeriodStatistic;+use FireflyIII\Models\Tag;use Illuminate\Database\Eloquent\Model;use Illuminate\Support\Collection;interface PeriodStatisticRepositoryInterface{- public function allInRangeForModel(Model $model, Carbon $start, Carbon $end): Collection;+ public function allInRangeForModel(Account|Category|Tag $model, Carbon $start, Carbon $end): Collection;+ public function deleteStatisticsForType(string $class, Collection $objects, Collection $dates): void;public function allInRangeForPrefix(string $prefix, Carbon $start, Carbon $end): Collection;diff --git a/app/Support/Http/Controllers/UserNavigation.php b/app/Support/Http/Controllers/UserNavigation.phpindex acdfe20e77..7c87d72f09 100644--- a/app/Support/Http/Controllers/UserNavigation.php+++ b/app/Support/Http/Controllers/UserNavigation.php@@ -111,6 +111,7 @@ trait UserNavigationreturn redirect(route('index'));}+ /** @var TransactionJournal $journal */$journal = $transaction->transactionJournal;/** @var null|Transaction $other */diff --git a/app/Support/Request/ConvertsDataTypes.php b/app/Support/Request/ConvertsDataTypes.phpindex 4f2fcd79da..9a1a05d799 100644--- a/app/Support/Request/ConvertsDataTypes.php+++ b/app/Support/Request/ConvertsDataTypes.php@@ -27,8 +27,10 @@ namespace FireflyIII\Support\Request;use Carbon\Carbon;use Carbon\Exceptions\InvalidDateException;use Carbon\Exceptions\InvalidFormatException;+use FireflyIII\Models\UserGroup;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Support\Facades\Steam;+use Illuminate\Http\Request;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;@@ -36,6 +38,7 @@ use function Safe\preg_replace;/*** Trait ConvertsDataTypes+ * @method UserGroup validateUserGroup(Request $request)*/trait ConvertsDataTypes{