mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Various code cleanup.
This commit is contained in:
parent
4b96558433
commit
b302775c37
@ -42,6 +42,7 @@ class AdminRequestedTestMessage extends Event
|
|||||||
/** @var User The user */
|
/** @var User The user */
|
||||||
public $user;
|
public $user;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new event instance.
|
* Create a new event instance.
|
||||||
*
|
*
|
||||||
|
@ -41,6 +41,7 @@ class RegisteredUser extends Event
|
|||||||
/** @var User The user */
|
/** @var User The user */
|
||||||
public $user;
|
public $user;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new event instance. This event is triggered when a new user registers.
|
* Create a new event instance. This event is triggered when a new user registers.
|
||||||
*
|
*
|
||||||
|
@ -43,6 +43,7 @@ class RequestedNewPassword extends Event
|
|||||||
/** @var User The user */
|
/** @var User The user */
|
||||||
public $user;
|
public $user;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new event instance. This event is triggered when a users tries to reset his or her password.
|
* Create a new event instance. This event is triggered when a users tries to reset his or her password.
|
||||||
*
|
*
|
||||||
|
@ -46,6 +46,7 @@ class RequestedReportOnJournals
|
|||||||
/** @var int The ID of the user. */
|
/** @var int The ID of the user. */
|
||||||
public $userId;
|
public $userId;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new event instance.
|
* Create a new event instance.
|
||||||
*
|
*
|
||||||
|
@ -40,6 +40,7 @@ class RequestedVersionCheckStatus extends Event
|
|||||||
/** @var User The user */
|
/** @var User The user */
|
||||||
public $user;
|
public $user;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new event instance. This event is triggered when Firefly III wants to know
|
* Create a new event instance. This event is triggered when Firefly III wants to know
|
||||||
* what the deal is with the version checker.
|
* what the deal is with the version checker.
|
||||||
|
@ -41,6 +41,7 @@ class StoredTransactionGroup extends Event
|
|||||||
/** @var TransactionGroup The group that was stored. */
|
/** @var TransactionGroup The group that was stored. */
|
||||||
public $transactionGroup;
|
public $transactionGroup;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new event instance.
|
* Create a new event instance.
|
||||||
*
|
*
|
||||||
|
@ -31,7 +31,6 @@ use Illuminate\Queue\SerializesModels;
|
|||||||
* Class UpdatedTransactionGroup.
|
* Class UpdatedTransactionGroup.
|
||||||
*
|
*
|
||||||
* @codeCoverageIgnore
|
* @codeCoverageIgnore
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
class UpdatedTransactionGroup extends Event
|
class UpdatedTransactionGroup extends Event
|
||||||
{
|
{
|
||||||
@ -42,6 +41,7 @@ class UpdatedTransactionGroup extends Event
|
|||||||
/** @var TransactionGroup The group that was stored. */
|
/** @var TransactionGroup The group that was stored. */
|
||||||
public $transactionGroup;
|
public $transactionGroup;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new event instance.
|
* Create a new event instance.
|
||||||
*
|
*
|
||||||
|
@ -45,6 +45,7 @@ class UserChangedEmail extends Event
|
|||||||
/** @var User The user itself */
|
/** @var User The user itself */
|
||||||
public $user;
|
public $user;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* UserChangedEmail constructor.
|
* UserChangedEmail constructor.
|
||||||
*
|
*
|
||||||
|
@ -31,10 +31,10 @@ use Exception;
|
|||||||
use FireflyIII\Jobs\MailError;
|
use FireflyIII\Jobs\MailError;
|
||||||
use Illuminate\Auth\AuthenticationException;
|
use Illuminate\Auth\AuthenticationException;
|
||||||
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
|
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Validation\ValidationException as LaravelValidationException;
|
use Illuminate\Validation\ValidationException as LaravelValidationException;
|
||||||
use League\OAuth2\Server\Exception\OAuthServerException;
|
use League\OAuth2\Server\Exception\OAuthServerException;
|
||||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Throwable;
|
use Throwable;
|
||||||
/**
|
/**
|
||||||
* Class Handler
|
* Class Handler
|
||||||
|
@ -152,7 +152,6 @@ class AccountFactory
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
|
||||||
* @param string $accountName
|
* @param string $accountName
|
||||||
* @param string $accountType
|
* @param string $accountType
|
||||||
*
|
*
|
||||||
@ -198,7 +197,6 @@ class AccountFactory
|
|||||||
* @param null|string $accountType
|
* @param null|string $accountType
|
||||||
*
|
*
|
||||||
* @return AccountType|null
|
* @return AccountType|null
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
protected function getAccountType(?int $accountTypeId, ?string $accountType): ?AccountType
|
protected function getAccountType(?int $accountTypeId, ?string $accountType): ?AccountType
|
||||||
{
|
{
|
||||||
|
@ -39,6 +39,7 @@ class AttachmentFactory
|
|||||||
/** @var User */
|
/** @var User */
|
||||||
private $user;
|
private $user;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
*
|
*
|
||||||
|
@ -43,6 +43,7 @@ class BillFactory
|
|||||||
/** @var User */
|
/** @var User */
|
||||||
private $user;
|
private $user;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
*
|
*
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
/** @noinspection MultipleReturnStatementsInspection */
|
/** @noinspection MultipleReturnStatementsInspection */
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
|
||||||
namespace FireflyIII\Factory;
|
namespace FireflyIII\Factory;
|
||||||
|
|
||||||
use FireflyIII\Models\Budget;
|
use FireflyIII\Models\Budget;
|
||||||
@ -36,6 +35,7 @@ class BudgetFactory
|
|||||||
/** @var User */
|
/** @var User */
|
||||||
private $user;
|
private $user;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
*
|
*
|
||||||
@ -53,7 +53,6 @@ class BudgetFactory
|
|||||||
* @param null|string $budgetName
|
* @param null|string $budgetName
|
||||||
*
|
*
|
||||||
* @return Budget|null
|
* @return Budget|null
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public function find(?int $budgetId, ?string $budgetName): ?Budget
|
public function find(?int $budgetId, ?string $budgetName): ?Budget
|
||||||
{
|
{
|
||||||
|
@ -38,6 +38,7 @@ class CategoryFactory
|
|||||||
/** @var User */
|
/** @var User */
|
||||||
private $user;
|
private $user;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
*
|
*
|
||||||
|
@ -54,7 +54,6 @@ class PiggyBankEventFactory
|
|||||||
* @param PiggyBank|null $piggyBank
|
* @param PiggyBank|null $piggyBank
|
||||||
*
|
*
|
||||||
* @return PiggyBankEvent|null
|
* @return PiggyBankEvent|null
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public function create(TransactionJournal $journal, ?PiggyBank $piggyBank): ?PiggyBankEvent
|
public function create(TransactionJournal $journal, ?PiggyBank $piggyBank): ?PiggyBankEvent
|
||||||
{
|
{
|
||||||
|
@ -36,6 +36,7 @@ class PiggyBankFactory
|
|||||||
/** @var User */
|
/** @var User */
|
||||||
private $user;
|
private $user;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
*
|
*
|
||||||
@ -53,7 +54,6 @@ class PiggyBankFactory
|
|||||||
* @param null|string $piggyBankName
|
* @param null|string $piggyBankName
|
||||||
*
|
*
|
||||||
* @return PiggyBank|null
|
* @return PiggyBank|null
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public function find(?int $piggyBankId, ?string $piggyBankName): ?PiggyBank
|
public function find(?int $piggyBankId, ?string $piggyBankName): ?PiggyBank
|
||||||
{
|
{
|
||||||
|
@ -39,12 +39,13 @@ use Log;
|
|||||||
*/
|
*/
|
||||||
class RecurrenceFactory
|
class RecurrenceFactory
|
||||||
{
|
{
|
||||||
|
|
||||||
|
use TransactionTypeTrait, RecurringTransactionTrait;
|
||||||
/** @var MessageBag */
|
/** @var MessageBag */
|
||||||
private $errors;
|
private $errors;
|
||||||
/** @var User */
|
/** @var User */
|
||||||
private $user;
|
private $user;
|
||||||
|
|
||||||
use TransactionTypeTrait, RecurringTransactionTrait;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
|
@ -40,6 +40,7 @@ class TagFactory
|
|||||||
/** @var User */
|
/** @var User */
|
||||||
private $user;
|
private $user;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
*
|
*
|
||||||
|
@ -82,7 +82,6 @@ class TransactionCurrencyFactory
|
|||||||
* @param null|string $currencyCode
|
* @param null|string $currencyCode
|
||||||
*
|
*
|
||||||
* @return TransactionCurrency|null
|
* @return TransactionCurrency|null
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public function find(?int $currencyId, ?string $currencyCode): ?TransactionCurrency
|
public function find(?int $currencyId, ?string $currencyCode): ?TransactionCurrency
|
||||||
{
|
{
|
||||||
|
@ -51,6 +51,7 @@ class TransactionFactory
|
|||||||
/** @var User */
|
/** @var User */
|
||||||
private $user;
|
private $user;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
*
|
*
|
||||||
|
@ -40,6 +40,7 @@ class TransactionGroupFactory
|
|||||||
/** @var User The user */
|
/** @var User The user */
|
||||||
private $user;
|
private $user;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TransactionGroupFactory constructor.
|
* TransactionGroupFactory constructor.
|
||||||
*/
|
*/
|
||||||
|
@ -76,6 +76,7 @@ class TransactionJournalFactory
|
|||||||
/** @var User The user */
|
/** @var User The user */
|
||||||
private $user;
|
private $user;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
*
|
*
|
||||||
@ -101,7 +102,7 @@ class TransactionJournalFactory
|
|||||||
'import_hash', 'import_hash_v2', 'external_id', 'original_source',
|
'import_hash', 'import_hash_v2', 'external_id', 'original_source',
|
||||||
|
|
||||||
// recurring transactions
|
// recurring transactions
|
||||||
'recurrence_total', 'recurrence_count'
|
'recurrence_total', 'recurrence_count',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ class ChangesForV540 extends Migration
|
|||||||
{
|
{
|
||||||
Schema::table(
|
Schema::table(
|
||||||
'oauth_clients', static function (Blueprint $table) {
|
'oauth_clients', static function (Blueprint $table) {
|
||||||
$table->dropColumn('order');
|
$table->dropColumn('provider');
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user