IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Various code cleanup [skip ci]

Browse Source
This commit is contained in:
James Cole 2018-03-10 22:38:20 +01:00
parent a55d18709c
commit aad0864018
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
59 changed files with 118 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Api/V1/Controllers/BillController.php
View File

@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
use FireflyIII\Api\V1\Requests\BillRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Bill;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Transformers\BillTransformer;

1
app/Api/V1/Controllers/Controller.php
View File

@ -34,6 +34,7 @@ use Symfony\Component\HttpFoundation\ParameterBag;
/**
* Class Controller.
*
* @codeCoverageIgnore
*/
class Controller extends BaseController

1
app/Api/V1/Controllers/TransactionController.php
View File

@ -37,7 +37,6 @@ use Illuminate\Support\Collection;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
use Log;
use Preferences;

1
app/Api/V1/Requests/Request.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use FireflyIII\Http\Requests\Request as FireflyIIIRequest;
/**
* Class Request.
*/

1
app/Exceptions/FireflyException.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Exceptions;
use Exception;
/**
* Class FireflyException.
*/

1
app/Handlers/Events/StoredJournalEventHandler.php
View File

@ -30,7 +30,6 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface as PRI;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface as RGRI;
use FireflyIII\Support\Events\BillScanner;
use FireflyIII\TransactionRules\Processor;
use Log;
/**
* @codeCoverageIgnore

1
app/Helpers/Chart/MetaPieChart.php
View File

@ -282,6 +282,7 @@ class MetaPieChart implements MetaPieChartInterface
$collector->withCategoryInformation();
$collector->withBudgetInformation();
}
// @codeCoverageIgnoreEnd
return $collector->getJournals();

14
app/Helpers/Collector/JournalCollectorInterface.php
View File

@ -42,13 +42,6 @@ interface JournalCollectorInterface
*/
public function addFilter(string $filter): JournalCollectorInterface;
/**
* @param Collection $journals
*
* @return JournalCollectorInterface
*/
public function setJournals(Collection $journals): JournalCollectorInterface;
/**
* @param string $amount
*
@ -153,6 +146,13 @@ interface JournalCollectorInterface
*/
public function setCategory(Category $category): JournalCollectorInterface;
/**
* @param Collection $journals
*
* @return JournalCollectorInterface
*/
public function setJournals(Collection $journals): JournalCollectorInterface;
/**
* @param int $limit
*

61
app/Http/Controllers/ProfileController.php
View File

@ -94,21 +94,9 @@ class ProfileController extends Controller
return view('profile.change-password', compact('title', 'subTitle', 'subTitleIcon'));
}
/**
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function deleteCode()
{
Preferences::delete('twoFactorAuthEnabled');
Preferences::delete('twoFactorAuthSecret');
Session::flash('success', strval(trans('firefly.pref_two_factor_auth_disabled')));
Session::flash('info', strval(trans('firefly.pref_two_factor_auth_remove_it')));
return redirect(route('profile.index'));
}
/**
* View that generates a 2FA code for the user.
*
* @return View
*/
public function code()
@ -121,23 +109,6 @@ class ProfileController extends Controller
return view('profile.code', compact('image'));
}
/**
* @param TokenFormRequest $request
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @SuppressWarnings(PHPMD.UnusedFormalParameter) // it's unused but the class does some validation.
*/
public function postCode(TokenFormRequest $request)
{
Preferences::set('twoFactorAuthEnabled', 1);
Preferences::set('twoFactorAuthSecret', Session::get('two-factor-secret'));
Session::flash('success', strval(trans('firefly.saved_preferences')));
Preferences::mark();
return redirect(route('profile.index'));
}
/**
* @param UserRepositoryInterface $repository
* @param string $token
@ -185,6 +156,19 @@ class ProfileController extends Controller
return view('profile.delete-account', compact('title', 'subTitle', 'subTitleIcon'));
}
/**
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function deleteCode()
{
Preferences::delete('twoFactorAuthEnabled');
Preferences::delete('twoFactorAuthSecret');
Session::flash('success', strval(trans('firefly.pref_two_factor_auth_disabled')));
Session::flash('info', strval(trans('firefly.pref_two_factor_auth_remove_it')));
return redirect(route('profile.index'));
}
/**
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
@ -296,6 +280,23 @@ class ProfileController extends Controller
return redirect(route('profile.index'));
}
/**
* @param TokenFormRequest $request
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @SuppressWarnings(PHPMD.UnusedFormalParameter) // it's unused but the class does some validation.
*/
public function postCode(TokenFormRequest $request)
{
Preferences::set('twoFactorAuthEnabled', 1);
Preferences::set('twoFactorAuthSecret', Session::get('two-factor-secret'));
Session::flash('success', strval(trans('firefly.saved_preferences')));
Preferences::mark();
return redirect(route('profile.index'));
}
/**
* @param UserRepositoryInterface $repository
* @param DeleteAccountFormRequest $request

1
app/Http/Controllers/RuleGroupController.php
View File

@ -189,6 +189,7 @@ class RuleGroupController extends Controller
{
// does the user have shared accounts?
$accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
// todo could be removed?
$accountList = ExpandedForm::makeSelectList($accounts);
$checkedAccounts = array_keys($accountList);
$first = session('first')->format('Y-m-d');

2
app/Http/Kernel.php
View File

@ -67,7 +67,7 @@ class Kernel extends HttpKernel
TrimStrings::class,
ConvertEmptyStringsToNull::class,
TrustProxies::class,
Installer::class
Installer::class,
];
/**

8
app/Http/Middleware/Installer.php
View File

@ -33,6 +33,7 @@ class Installer
$strpos = stripos($url, '/install');
if (!($strpos === false)) {
Log::debug(sprintf('URL is %s, will NOT run installer middleware', $url));
return $next($request);
}
Log::debug(sprintf('URL is %s, will run installer middleware', $url));
@ -59,13 +60,16 @@ class Installer
$configVersion = intval(config('firefly.db_version'));
$dbVersion = intval(FireflyConfig::getFresh('db_version', 1)->data);
if ($configVersion > $dbVersion) {
Log::warning(sprintf(
Log::warning(
sprintf(
'The current installed version (%d) is older than the required version (%d). Redirect to migrate routine.', $dbVersion, $configVersion
));
)
);
// redirect to migrate routine:
return response()->redirectTo(route('installer.index'));
}
return $next($request);
}

1
app/Import/Configuration/BunqConfigurator.php
View File

@ -186,6 +186,7 @@ class BunqConfigurator implements ConfiguratorInterface
return false;
case 'initial':
Log::debug('isJobConfigured returns true');
return true;
break;
default:

1
app/Models/Account.php
View File

@ -22,7 +22,6 @@ declare(strict_types=1);
namespace FireflyIII\Models;
use Carbon\Carbon;
use Crypt;
use FireflyIII\Exceptions\FireflyException;
use Illuminate\Contracts\Encryption\DecryptException;

1
app/Models/ImportJob.php
View File

@ -32,6 +32,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class ImportJob.
*
* @property User $user
*/
class ImportJob extends Model

2
app/Models/PiggyBank.php
View File

@ -90,6 +90,7 @@ class PiggyBank extends Model
/**
* Grabs the PiggyBankRepetition that's currently relevant / active.
*
* @deprecated
* @returns PiggyBankRepetition
*/
@ -153,6 +154,7 @@ class PiggyBank extends Model
/**
* @param Carbon $date
*
* @deprecated
* @return string
*/

1
app/Models/PiggyBankEvent.php
View File

@ -26,6 +26,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class PiggyBankEvent.
*
* @property $piggyBank
*/
class PiggyBankEvent extends Model

1
app/Models/Preference.php
View File

@ -31,6 +31,7 @@ use Log;
/**
* Class Preference.
*
* @property mixed $data
*/
class Preference extends Model

5
app/Providers/EventServiceProvider.php
View File

@ -24,15 +24,10 @@ namespace FireflyIII\Providers;
use FireflyIII\Events\RegisteredUser;
use FireflyIII\Events\RequestedVersionCheckStatus;
use FireflyIII\Models\Account;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankRepetition;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionJournalMeta;
use Illuminate\Auth\Events\Login;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
use Log;
/**
* Class EventServiceProvider.

1
app/Providers/FireflyServiceProvider.php
View File

@ -46,7 +46,6 @@ use FireflyIII\Repositories\TransactionType\TransactionTypeRepository;
use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
use FireflyIII\Repositories\User\UserRepository;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Services\Password\PwndVerifier;
use FireflyIII\Services\Password\PwndVerifierV2;
use FireflyIII\Services\Password\Verifier;
use FireflyIII\Support\Amount;

19
app/Repositories/Budget/BudgetRepositoryInterface.php
View File

@ -73,21 +73,13 @@ interface BudgetRepositoryInterface
* Find a budget.
*
* @param int $budgetId
*
* @deprecated
*
* @return Budget
*/
public function find(int $budgetId): Budget;
/**
* Find a budget or return NULL
*
* @param int $budgetId
*
* @return Budget|null
*/
public function findNull(int $budgetId): ?Budget;
/**
* Find a budget.
*
@ -97,6 +89,15 @@ interface BudgetRepositoryInterface
*/
public function findByName(string $name): ?Budget;
/**
* Find a budget or return NULL
*
* @param int $budgetId
*
* @return Budget|null
*/
public function findNull(int $budgetId): ?Budget;
/**
* This method returns the oldest journal or transaction date known to this budget.
* Will cache result.

19
app/Repositories/Category/CategoryRepositoryInterface.php
View File

@ -53,20 +53,12 @@ interface CategoryRepositoryInterface
* Find a category.
*
* @param int $categoryId
*
* @deprecated
* @return Category
*/
public function find(int $categoryId): Category;
/**
* Find a category or return NULL
*
* @param int $categoryId
*
* @return Category|null
*/
public function findNull(int $categoryId): ?Category;
/**
* Find a category.
*
@ -76,6 +68,15 @@ interface CategoryRepositoryInterface
*/
public function findByName(string $name): ?Category;
/**
* Find a category or return NULL
*
* @param int $categoryId
*
* @return Category|null
*/
public function findNull(int $categoryId): ?Category;
/**
* @param Category $category
*

2
app/Rules/BelongsUser.php
View File

@ -2,7 +2,6 @@
declare(strict_types=1);
/**
* BelongsUser.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
@ -61,6 +60,7 @@ class BelongsUser implements Rule
/**
* Determine if the validation rule passes.
* TODO use repositories?
*
* @param string $attribute
* @param mixed $value
*

3
app/Rules/ValidTransactions.php
View File

@ -2,7 +2,6 @@
declare(strict_types=1);
/**
* ValidTransactions.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
@ -75,10 +74,12 @@ class ValidTransactions implements Rule
->where('accounts.user_id', $userId)->count();
if ($count === 0) {
Log::debug(sprintf('Count for transaction #%d and user #%d is zero! Return FALSE', $transactionId, $userId));
return false;
}
}
Log::debug('Return true!');
return true;
}
}

1
app/Services/Bunq/Request/DeviceSessionRequest.php
View File

@ -28,7 +28,6 @@ use FireflyIII\Services\Bunq\Object\UserCompany;
use FireflyIII\Services\Bunq\Object\UserPerson;
use FireflyIII\Services\Bunq\Token\InstallationToken;
use FireflyIII\Services\Bunq\Token\SessionToken;
use Log;
/**
* Class DeviceSessionRequest.

1
app/Services/Internal/Destroy/BillDestroyService.php
View File

@ -26,6 +26,7 @@ namespace FireflyIII\Services\Internal\Destroy;
use Exception;
use FireflyIII\Models\Bill;
use Log;
/**
* @codeCoverageIgnore
* Class BillDestroyService

2
app/Services/Internal/Support/AccountServiceTrait.php
View File

@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Services\Internal\Support;
use Exception;
use FireflyIII\Factory\AccountFactory;
use FireflyIII\Factory\AccountMetaFactory;
use FireflyIII\Factory\TransactionFactory;
@ -255,6 +254,7 @@ trait AccountServiceTrait
return true;
}
return true; // @codeCoverageIgnore
}

1
app/Services/Internal/Support/BillServiceTrait.php
View File

@ -22,6 +22,7 @@
declare(strict_types=1);
namespace FireflyIII\Services\Internal\Support;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Note;

3
app/Services/Internal/Support/TransactionServiceTrait.php
View File

@ -217,6 +217,7 @@ trait TransactionServiceTrait
{
if (is_null($budget)) {
$transaction->budgets()->sync([]);
return;
}
$transaction->budgets()->sync([$budget->id]);
@ -233,6 +234,7 @@ trait TransactionServiceTrait
{
if (is_null($category)) {
$transaction->categories()->sync([]);
return;
}
$transaction->categories()->sync([$category->id]);
@ -260,6 +262,7 @@ trait TransactionServiceTrait
if (is_null($currency)) {
$transaction->foreign_currency_id = null;
$transaction->save();
return;
}
$transaction->foreign_currency_id = $currency->id;

7
app/Services/Internal/Update/AccountUpdateService.php
View File

@ -23,14 +23,8 @@ declare(strict_types=1);
namespace FireflyIII\Services\Internal\Update;
use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Factory\AccountMetaFactory;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountMeta;
use FireflyIII\Models\AccountType;
use FireflyIII\Services\Internal\Support\AccountServiceTrait;
use Log;
/**
* Class AccountUpdateService
@ -40,7 +34,6 @@ class AccountUpdateService
use AccountServiceTrait;
/**
* Update account data.
*

1
app/Support/Twig/Extension/Transaction.php
View File

@ -225,6 +225,7 @@ class Transaction extends Twig_Extension
/**
* TODO improve code
*
* @param TransactionModel $transaction
*
* @return string

2
app/Support/Twig/General.php
View File

@ -24,10 +24,8 @@ namespace FireflyIII\Support\Twig;
use Carbon\Carbon;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal;
use League\CommonMark\CommonMarkConverter;
use Route;
use Steam;
use Twig_Extension;
use Twig_SimpleFilter;
use Twig_SimpleFunction;

1
app/Transformers/AccountTransformer.php
View File

@ -25,7 +25,6 @@ namespace FireflyIII\Transformers;
use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;

1
app/Transformers/BillTransformer.php
View File

@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Transformers;
use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Note;

1
app/Transformers/BudgetTransformer.php
View File

@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Transformers;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Budget;
use Illuminate\Support\Collection;

1
app/Transformers/CategoryTransformer.php
View File

@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Transformers;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Category;
use Illuminate\Support\Collection;

1
app/Transformers/JournalMetaTransformer.php
View File

@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Transformers;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\TransactionJournalMeta;
use Illuminate\Support\Collection;

1
app/Transformers/PiggyBankEventTransformer.php
View File

@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Transformers;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;

1
app/Transformers/TagTransformer.php
View File

@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Transformers;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Tag;
use League\Fractal\Resource\Collection as FractalCollection;