Code style fixes.

This commit is contained in:
James Cole
2020-07-31 09:42:00 +02:00
parent 9234636422
commit c0b7ef878a
47 changed files with 39 additions and 52 deletions

View File

@@ -45,11 +45,11 @@ use League\Fractal\Resource\Item;
/** /**
* Class AccountController. * Class AccountController.
*
*/ */
class AccountController extends Controller class AccountController extends Controller
{ {
use AccountFilter, TransactionFilter; use AccountFilter, TransactionFilter;
public const RESOURCE_KEY = 'accounts'; public const RESOURCE_KEY = 'accounts';
private AccountRepositoryInterface $repository; private AccountRepositoryInterface $repository;
@@ -166,7 +166,6 @@ class AccountController extends Controller
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore
*
*/ */
public function piggyBanks(Account $account): JsonResponse public function piggyBanks(Account $account): JsonResponse
{ {
@@ -246,7 +245,6 @@ class AccountController extends Controller
* @param Account $account * @param Account $account
* *
* @return JsonResponse * @return JsonResponse
*
*/ */
public function transactions(Request $request, Account $account): JsonResponse public function transactions(Request $request, Account $account): JsonResponse
{ {

View File

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Requests\AttachmentStoreRequest;
use FireflyIII\Api\V1\Requests\AttachmentUpdateRequest; use FireflyIII\Api\V1\Requests\AttachmentUpdateRequest;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Models\Attachment; use FireflyIII\Models\Attachment;
use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface; use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
use FireflyIII\Transformers\AttachmentTransformer; use FireflyIII\Transformers\AttachmentTransformer;
@@ -45,7 +44,6 @@ use function strlen;
/** /**
* Class AttachmentController. * Class AttachmentController.
*
*/ */
class AttachmentController extends Controller class AttachmentController extends Controller
{ {

View File

@@ -41,6 +41,7 @@ class AccountController extends Controller
use AccountFilter; use AccountFilter;
private array $balanceTypes; private array $balanceTypes;
private AccountRepositoryInterface $repository; private AccountRepositoryInterface $repository;
@@ -60,7 +61,7 @@ class AccountController extends Controller
return $next($request); return $next($request);
} }
); );
$this->balanceTypes = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE,]; $this->balanceTypes = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE, ];
} }
/** /**

View File

@@ -38,6 +38,7 @@ use Illuminate\Http\JsonResponse;
class PiggyBankController extends Controller class PiggyBankController extends Controller
{ {
private PiggyBankRepositoryInterface $piggyRepository; private PiggyBankRepositoryInterface $piggyRepository;
private AccountRepositoryInterface $accountRepository; private AccountRepositoryInterface $accountRepository;

View File

@@ -36,7 +36,6 @@ use Illuminate\Http\JsonResponse;
*/ */
class TagController extends Controller class TagController extends Controller
{ {
private TagRepositoryInterface $repository; private TagRepositoryInterface $repository;

View File

@@ -38,8 +38,8 @@ use Illuminate\Support\Collection;
*/ */
class TransactionController extends Controller class TransactionController extends Controller
{ {
private JournalRepositoryInterface $repository; private JournalRepositoryInterface $repository;
private TransactionGroupRepositoryInterface $groupRepository; private TransactionGroupRepositoryInterface $groupRepository;

View File

@@ -38,7 +38,6 @@ use League\Fractal\Resource\Item;
/** /**
* Class AvailableBudgetController. * Class AvailableBudgetController.
*
*/ */
class AvailableBudgetController extends Controller class AvailableBudgetController extends Controller
{ {

View File

@@ -44,11 +44,11 @@ use League\Fractal\Resource\Item;
/** /**
* Class BillController. * Class BillController.
*
*/ */
class BillController extends Controller class BillController extends Controller
{ {
use TransactionFilter; use TransactionFilter;
/** @var BillRepositoryInterface The bill repository */ /** @var BillRepositoryInterface The bill repository */
private $repository; private $repository;

View File

@@ -47,13 +47,14 @@ use League\Fractal\Resource\Item;
/** /**
* Class BudgetController. * Class BudgetController.
*
*/ */
class BudgetController extends Controller class BudgetController extends Controller
{ {
use TransactionFilter; use TransactionFilter;
/** @var BudgetLimitRepositoryInterface */ /** @var BudgetLimitRepositoryInterface */
private $blRepository; private $blRepository;
/** @var BudgetRepositoryInterface The budget repository */ /** @var BudgetRepositoryInterface The budget repository */
private $repository; private $repository;

View File

@@ -44,13 +44,14 @@ use League\Fractal\Resource\Item;
/** /**
* Class BudgetLimitController. * Class BudgetLimitController.
*
*/ */
class BudgetLimitController extends Controller class BudgetLimitController extends Controller
{ {
use TransactionFilter; use TransactionFilter;
/** @var BudgetLimitRepositoryInterface */ /** @var BudgetLimitRepositoryInterface */
private $blRepository; private $blRepository;
/** @var BudgetRepositoryInterface The budget repository */ /** @var BudgetRepositoryInterface The budget repository */
private $repository; private $repository;

View File

@@ -42,11 +42,11 @@ use League\Fractal\Resource\Item;
/** /**
* Class CategoryController. * Class CategoryController.
*
*/ */
class CategoryController extends Controller class CategoryController extends Controller
{ {
use TransactionFilter; use TransactionFilter;
/** @var CategoryRepositoryInterface The category repository */ /** @var CategoryRepositoryInterface The category repository */
private $repository; private $repository;

View File

@@ -42,7 +42,9 @@ use Illuminate\Http\JsonResponse;
class AccountController extends Controller class AccountController extends Controller
{ {
use ApiSupport; use ApiSupport;
private CurrencyRepositoryInterface $currencyRepository; private CurrencyRepositoryInterface $currencyRepository;
private AccountRepositoryInterface $repository; private AccountRepositoryInterface $repository;

View File

@@ -40,6 +40,7 @@ class AvailableBudgetController extends Controller
{ {
/** @var OperationsRepositoryInterface */ /** @var OperationsRepositoryInterface */
private $opsRepository; private $opsRepository;
/** @var BudgetRepositoryInterface */ /** @var BudgetRepositoryInterface */
private $repository; private $repository;

View File

@@ -41,7 +41,9 @@ use Illuminate\Support\Collection;
class BudgetController extends Controller class BudgetController extends Controller
{ {
private BudgetLimitRepositoryInterface $blRepository; private BudgetLimitRepositoryInterface $blRepository;
private OperationsRepositoryInterface $opsRepository; private OperationsRepositoryInterface $opsRepository;
private BudgetRepositoryInterface $repository; private BudgetRepositoryInterface $repository;

View File

@@ -40,8 +40,10 @@ class CategoryController extends Controller
{ {
/** @var CategoryRepositoryInterface */ /** @var CategoryRepositoryInterface */
private $categoryRepository; private $categoryRepository;
/** @var NoCategoryRepositoryInterface */ /** @var NoCategoryRepositoryInterface */
private $noCatRepository; private $noCatRepository;
/** @var OperationsRepositoryInterface */ /** @var OperationsRepositoryInterface */
private $opsRepository; private $opsRepository;
@@ -92,7 +94,7 @@ class CategoryController extends Controller
$categories = []; $categories = [];
foreach ([$spentWith, $spentWithout,] as $set) { foreach ([$spentWith, $spentWithout, ] as $set) {
foreach ($set as $currency) { foreach ($set as $currency) {
foreach ($currency['categories'] as $category) { foreach ($currency['categories'] as $category) {
$categories[] = $category['name']; $categories[] = $category['name'];

View File

@@ -37,15 +37,12 @@ use Illuminate\Http\JsonResponse;
*/ */
class ConfigurationController extends Controller class ConfigurationController extends Controller
{ {
/** @var UserRepositoryInterface The user repository */ /** @var UserRepositoryInterface The user repository */
private $repository; private $repository;
/** /**
* ConfigurationController constructor. * ConfigurationController constructor.
*
*/ */
public function __construct() public function __construct()
{ {

View File

@@ -39,7 +39,6 @@ use Symfony\Component\HttpFoundation\ParameterBag;
* Class Controller. * Class Controller.
* *
* @codeCoverageIgnore * @codeCoverageIgnore
*
*/ */
class Controller extends BaseController class Controller extends BaseController
{ {
@@ -51,7 +50,6 @@ class Controller extends BaseController
/** /**
* Controller constructor. * Controller constructor.
*
*/ */
public function __construct() public function __construct()
{ {
@@ -63,7 +61,6 @@ class Controller extends BaseController
* Method to help build URI's. * Method to help build URI's.
* *
* @return string * @return string
*
*/ */
protected function buildParams(): string protected function buildParams(): string
{ {

View File

@@ -21,7 +21,6 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers; namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\CurrencyRequest; use FireflyIII\Api\V1\Requests\CurrencyRequest;
@@ -64,13 +63,14 @@ use League\Fractal\Resource\Item;
/** /**
* Class CurrencyController. * Class CurrencyController.
*
*/ */
class CurrencyController extends Controller class CurrencyController extends Controller
{ {
use AccountFilter, TransactionFilter; use AccountFilter, TransactionFilter;
/** @var CurrencyRepositoryInterface The currency repository */ /** @var CurrencyRepositoryInterface The currency repository */
private $repository; private $repository;
/** @var UserRepositoryInterface The user repository */ /** @var UserRepositoryInterface The user repository */
private $userRepository; private $userRepository;

View File

@@ -46,7 +46,6 @@ class CurrencyExchangeRateController extends Controller
/** /**
* CurrencyExchangeRateController constructor. * CurrencyExchangeRateController constructor.
*
*/ */
public function __construct() public function __construct()
{ {

View File

@@ -42,11 +42,11 @@ use League\Fractal\Resource\Item;
/** /**
* Class LinkTypeController. * Class LinkTypeController.
*
*/ */
class LinkTypeController extends Controller class LinkTypeController extends Controller
{ {
use TransactionFilter; use TransactionFilter;
/** @var LinkTypeRepositoryInterface The link type repository */ /** @var LinkTypeRepositoryInterface The link type repository */
private $repository; private $repository;

View File

@@ -39,7 +39,6 @@ use League\Fractal\Resource\Item;
/** /**
* Class GroupController. * Class GroupController.
*
*/ */
class ObjectGroupController extends Controller class ObjectGroupController extends Controller
{ {
@@ -123,7 +122,6 @@ class ObjectGroupController extends Controller
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore
*
*/ */
public function piggyBanks(ObjectGroup $objectGroup): JsonResponse public function piggyBanks(ObjectGroup $objectGroup): JsonResponse
{ {

View File

@@ -40,11 +40,9 @@ use League\Fractal\Resource\Item;
/** /**
* Class PiggyBankController. * Class PiggyBankController.
*
*/ */
class PiggyBankController extends Controller class PiggyBankController extends Controller
{ {
/** @var PiggyBankRepositoryInterface The piggy bank repository */ /** @var PiggyBankRepositoryInterface The piggy bank repository */
private $repository; private $repository;

View File

@@ -35,7 +35,6 @@ use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item; use League\Fractal\Resource\Item;
/** /**
*
* Class PreferenceController * Class PreferenceController
*/ */
class PreferenceController extends Controller class PreferenceController extends Controller

View File

@@ -48,6 +48,7 @@ use Log;
class RecurrenceController extends Controller class RecurrenceController extends Controller
{ {
use TransactionFilter; use TransactionFilter;
/** @var RecurringRepositoryInterface The recurring transaction repository */ /** @var RecurringRepositoryInterface The recurring transaction repository */
private $repository; private $repository;

View File

@@ -46,12 +46,12 @@ use Log;
/** /**
* Class RuleController * Class RuleController
*
*/ */
class RuleController extends Controller class RuleController extends Controller
{ {
/** @var AccountRepositoryInterface Account repository */ /** @var AccountRepositoryInterface Account repository */
private $accountRepository; private $accountRepository;
/** @var RuleRepositoryInterface The rule repository */ /** @var RuleRepositoryInterface The rule repository */
private $ruleRepository; private $ruleRepository;

View File

@@ -54,6 +54,7 @@ class RuleGroupController extends Controller
{ {
/** @var AccountRepositoryInterface Account repository */ /** @var AccountRepositoryInterface Account repository */
private $accountRepository; private $accountRepository;
/** @var RuleGroupRepositoryInterface The rule group repository */ /** @var RuleGroupRepositoryInterface The rule group repository */
private $ruleGroupRepository; private $ruleGroupRepository;

View File

@@ -49,12 +49,16 @@ class SummaryController extends Controller
{ {
/** @var AvailableBudgetRepositoryInterface */ /** @var AvailableBudgetRepositoryInterface */
private $abRepository; private $abRepository;
/** @var AccountRepositoryInterface */ /** @var AccountRepositoryInterface */
private $accountRepository; private $accountRepository;
/** @var BillRepositoryInterface */ /** @var BillRepositoryInterface */
private $billRepository; private $billRepository;
/** @var BudgetRepositoryInterface */ /** @var BudgetRepositoryInterface */
private $budgetRepository; private $budgetRepository;
/** @var CurrencyRepositoryInterface */ /** @var CurrencyRepositoryInterface */
private $currencyRepos; private $currencyRepos;

View File

@@ -23,8 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers; namespace FireflyIII\Api\V1\Controllers;
use Carbon\Carbon;
use FireflyIII\Api\V1\Requests\DateRequest;
use FireflyIII\Api\V1\Requests\TagStoreRequest; use FireflyIII\Api\V1\Requests\TagStoreRequest;
use FireflyIII\Api\V1\Requests\TagUpdateRequest; use FireflyIII\Api\V1\Requests\TagUpdateRequest;
use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -38,7 +36,6 @@ use FireflyIII\User;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use League\Fractal\Pagination\IlluminatePaginatorAdapter; use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection; use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item; use League\Fractal\Resource\Item;

View File

@@ -59,7 +59,9 @@ class TransactionController extends Controller
use TransactionFilter; use TransactionFilter;
private TransactionGroupRepositoryInterface $groupRepository; private TransactionGroupRepositoryInterface $groupRepository;
private JournalAPIRepositoryInterface $journalAPIRepository; private JournalAPIRepositoryInterface $journalAPIRepository;
private JournalRepositoryInterface $repository; private JournalRepositoryInterface $repository;

View File

@@ -47,6 +47,7 @@ class TransactionLinkController extends Controller
/** @var JournalRepositoryInterface The journal repository */ /** @var JournalRepositoryInterface The journal repository */
private $journalRepository; private $journalRepository;
/** @var LinkTypeRepositoryInterface The link type repository */ /** @var LinkTypeRepositoryInterface The link type repository */
private $repository; private $repository;

View File

@@ -39,7 +39,6 @@ use League\Fractal\Resource\Item;
/** /**
* Class UserController. * Class UserController.
*
*/ */
class UserController extends Controller class UserController extends Controller
{ {

View File

@@ -72,7 +72,7 @@ class AutocompleteRequest extends FormRequest
public function rules(): array public function rules(): array
{ {
return [ return [
'limit' => 'min:0|max:1337' 'limit' => 'min:0|max:1337',
]; ];
} }
} }

View File

@@ -81,7 +81,6 @@ class BillRequest extends FormRequest
* The rules that the incoming request must be matched against. * The rules that the incoming request must be matched against.
* *
* @return array * @return array
*
*/ */
public function rules(): array public function rules(): array
{ {

View File

@@ -29,7 +29,6 @@ use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
/** /**
*
* Class LinkTypeRequest * Class LinkTypeRequest
* *
* @codeCoverageIgnore * @codeCoverageIgnore

View File

@@ -31,7 +31,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
/** /**
*
* Class PiggyBankRequest * Class PiggyBankRequest
* *
* @codeCoverageIgnore * @codeCoverageIgnore

View File

@@ -28,7 +28,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
/** /**
*
* Class PiggyBankStoreRequest * Class PiggyBankStoreRequest
* *
* @codeCoverageIgnore * @codeCoverageIgnore

View File

@@ -27,7 +27,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
/** /**
*
* Class PreferenceRequest * Class PreferenceRequest
* *
* @codeCoverageIgnore * @codeCoverageIgnore

View File

@@ -22,7 +22,6 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests; namespace FireflyIII\Api\V1\Requests;

View File

@@ -22,7 +22,6 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests; namespace FireflyIII\Api\V1\Requests;

View File

@@ -32,7 +32,6 @@ use function is_array;
/** /**
* Class RuleStoreRequest * Class RuleStoreRequest
*
*/ */
class RuleStoreRequest extends FormRequest class RuleStoreRequest extends FormRequest
{ {

View File

@@ -22,7 +22,6 @@
declare(strict_types=1); declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests; namespace FireflyIII\Api\V1\Requests;

View File

@@ -32,7 +32,6 @@ use function is_array;
/** /**
* Class RuleUpdateRequest * Class RuleUpdateRequest
*
*/ */
class RuleUpdateRequest extends FormRequest class RuleUpdateRequest extends FormRequest
{ {

View File

@@ -31,7 +31,6 @@ use Illuminate\Foundation\Http\FormRequest;
* Class TagStoreRequest * Class TagStoreRequest
* *
* @codeCoverageIgnore * @codeCoverageIgnore
*
*/ */
class TagStoreRequest extends FormRequest class TagStoreRequest extends FormRequest
{ {

View File

@@ -32,7 +32,6 @@ use Illuminate\Foundation\Http\FormRequest;
* Class TagUpdateRequest * Class TagUpdateRequest
* *
* @codeCoverageIgnore * @codeCoverageIgnore
*
*/ */
class TagUpdateRequest extends FormRequest class TagUpdateRequest extends FormRequest
{ {

View File

@@ -31,7 +31,6 @@ use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator; use Illuminate\Validation\Validator;
/** /**
*
* Class TransactionLinkRequest * Class TransactionLinkRequest
*/ */
class TransactionLinkRequest extends FormRequest class TransactionLinkRequest extends FormRequest
@@ -65,7 +64,6 @@ class TransactionLinkRequest extends FormRequest
} }
/** /**
*
* The rules that the incoming request must be matched against. * The rules that the incoming request must be matched against.
* *
* @return array * @return array

View File

@@ -44,14 +44,19 @@ class TransactionUpdateRequest extends FormRequest
/** @var array Array values. */ /** @var array Array values. */
private $arrayFields; private $arrayFields;
/** @var array Boolean values. */ /** @var array Boolean values. */
private $booleanFields; private $booleanFields;
/** @var array Fields that contain date values. */ /** @var array Fields that contain date values. */
private $dateFields; private $dateFields;
/** @var array Fields that contain integer values. */ /** @var array Fields that contain integer values. */
private $integerFields; private $integerFields;
/** @var array Fields that contain string values. */ /** @var array Fields that contain string values. */
private $stringFields; private $stringFields;
/** @var array Fields that contain text (with newlines) */ /** @var array Fields that contain text (with newlines) */
private $textareaFields; private $textareaFields;
@@ -130,7 +135,7 @@ class TransactionUpdateRequest extends FormRequest
'sepa_ep', 'sepa_ep',
'sepa_ci', 'sepa_ci',
'sepa_batch_id', 'sepa_batch_id',
'external_uri' 'external_uri',
]; ];
$this->booleanFields = [ $this->booleanFields = [
'reconciled', 'reconciled',

View File

@@ -24,10 +24,8 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests; namespace FireflyIII\Api\V1\Requests;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Rules\IsBoolean; use FireflyIII\Rules\IsBoolean;
use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\Support\Request\ConvertsDataTypes;
use FireflyIII\User;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;