mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-19 10:53:31 +00:00
Code cleanup.
This commit is contained in:
@@ -14,7 +14,6 @@ declare(strict_types = 1);
|
|||||||
namespace FireflyIII\Export\Exporter;
|
namespace FireflyIII\Export\Exporter;
|
||||||
|
|
||||||
use FireflyIII\Export\Entry\Entry;
|
use FireflyIII\Export\Entry\Entry;
|
||||||
use FireflyIII\Export\Entry\EntryAccount;
|
|
||||||
use FireflyIII\Models\ExportJob;
|
use FireflyIII\Models\ExportJob;
|
||||||
use League\Csv\Writer;
|
use League\Csv\Writer;
|
||||||
use SplFileObject;
|
use SplFileObject;
|
||||||
|
@@ -45,8 +45,6 @@ class Processor
|
|||||||
public $job;
|
public $job;
|
||||||
/** @var array */
|
/** @var array */
|
||||||
public $settings;
|
public $settings;
|
||||||
/** @var \FireflyIII\Export\ConfigurationFile */
|
|
||||||
private $configurationMaker;
|
|
||||||
/** @var Collection */
|
/** @var Collection */
|
||||||
private $exportEntries;
|
private $exportEntries;
|
||||||
/** @var Collection */
|
/** @var Collection */
|
||||||
|
@@ -17,10 +17,8 @@ use FireflyIII\Models\Attachment;
|
|||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Support\MessageBag;
|
use Illuminate\Support\MessageBag;
|
||||||
use Input;
|
use Input;
|
||||||
use Log;
|
|
||||||
use Storage;
|
use Storage;
|
||||||
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
||||||
use TypeError;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class AttachmentHelper
|
* Class AttachmentHelper
|
||||||
@@ -236,14 +234,9 @@ class AttachmentHelper implements AttachmentHelperInterface
|
|||||||
private function getFiles()
|
private function getFiles()
|
||||||
{
|
{
|
||||||
$files = null;
|
$files = null;
|
||||||
try {
|
|
||||||
if (Input::hasFile('attachments')) {
|
if (Input::hasFile('attachments')) {
|
||||||
$files = Input::file('attachments');
|
$files = Input::file('attachments');
|
||||||
}
|
}
|
||||||
} catch (TypeError $e) {
|
|
||||||
// Log it, do nothing else.
|
|
||||||
Log::error($e->getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
return $files;
|
return $files;
|
||||||
}
|
}
|
||||||
|
@@ -57,19 +57,6 @@ class JournalCollector
|
|||||||
];
|
];
|
||||||
/** @var bool */
|
/** @var bool */
|
||||||
private $filterTransfers = false;
|
private $filterTransfers = false;
|
||||||
/** @var array */
|
|
||||||
private $group
|
|
||||||
= [
|
|
||||||
'transaction_journals.id',
|
|
||||||
'transaction_journals.description',
|
|
||||||
'firefly-iii.transaction_journals.date',
|
|
||||||
'transaction_journals.encrypted',
|
|
||||||
'transaction_currencies.code',
|
|
||||||
'transaction_types.type',
|
|
||||||
'transaction_journals.bill_id',
|
|
||||||
'bills.name',
|
|
||||||
'transactions.amount',
|
|
||||||
];
|
|
||||||
/** @var bool */
|
/** @var bool */
|
||||||
private $joinedBudget = false;
|
private $joinedBudget = false;
|
||||||
/** @var bool */
|
/** @var bool */
|
||||||
@@ -285,6 +272,8 @@ class JournalCollector
|
|||||||
public function setOffset(int $offset): JournalCollector
|
public function setOffset(int $offset): JournalCollector
|
||||||
{
|
{
|
||||||
$this->offset = $offset;
|
$this->offset = $offset;
|
||||||
|
|
||||||
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -275,13 +275,12 @@ class AccountController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param AccountTaskerInterface $tasker
|
|
||||||
* @param Account $account
|
* @param Account $account
|
||||||
* @param string $date
|
* @param string $date
|
||||||
*
|
*
|
||||||
* @return View
|
* @return View
|
||||||
*/
|
*/
|
||||||
public function showWithDate(AccountTaskerInterface $tasker, Account $account, string $date)
|
public function showWithDate(Account $account, string $date)
|
||||||
{
|
{
|
||||||
$carbon = new Carbon($date);
|
$carbon = new Carbon($date);
|
||||||
$range = Preferences::get('viewRange', '1M')->data;
|
$range = Preferences::get('viewRange', '1M')->data;
|
||||||
|
@@ -24,7 +24,6 @@ use FireflyIII\Models\Budget;
|
|||||||
use FireflyIII\Models\LimitRepetition;
|
use FireflyIII\Models\LimitRepetition;
|
||||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
||||||
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
|
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
|
||||||
use Illuminate\Pagination\LengthAwarePaginator;
|
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Input;
|
use Input;
|
||||||
use Log;
|
use Log;
|
||||||
|
@@ -240,9 +240,7 @@ class CategoryController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param CRI $repository
|
|
||||||
* @param Category $category
|
* @param Category $category
|
||||||
*
|
|
||||||
* @param $date
|
* @param $date
|
||||||
*
|
*
|
||||||
* @return View
|
* @return View
|
||||||
|
@@ -117,7 +117,7 @@ class HomeController extends Controller
|
|||||||
/**
|
/**
|
||||||
* @param ARI $repository
|
* @param ARI $repository
|
||||||
*
|
*
|
||||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
|
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
|
||||||
*/
|
*/
|
||||||
public function index(ARI $repository)
|
public function index(ARI $repository)
|
||||||
{
|
{
|
||||||
|
@@ -13,7 +13,6 @@ declare(strict_types = 1);
|
|||||||
|
|
||||||
namespace FireflyIII\Http\Controllers;
|
namespace FireflyIII\Http\Controllers;
|
||||||
|
|
||||||
use FireflyIII\Events\DeletedUser;
|
|
||||||
use FireflyIII\Http\Requests\DeleteAccountFormRequest;
|
use FireflyIII\Http\Requests\DeleteAccountFormRequest;
|
||||||
use FireflyIII\Http\Requests\ProfileFormRequest;
|
use FireflyIII\Http\Requests\ProfileFormRequest;
|
||||||
use FireflyIII\User;
|
use FireflyIII\User;
|
||||||
|
@@ -33,6 +33,8 @@ class BudgetController extends Controller
|
|||||||
* @param Carbon $start
|
* @param Carbon $start
|
||||||
* @param Carbon $end
|
* @param Carbon $end
|
||||||
* @param Collection $accounts
|
* @param Collection $accounts
|
||||||
|
*
|
||||||
|
* @return mixed|string
|
||||||
*/
|
*/
|
||||||
public function budgetMultiYear(BudgetReportHelperInterface $helper, Carbon $start, Carbon $end, Collection $accounts)
|
public function budgetMultiYear(BudgetReportHelperInterface $helper, Carbon $start, Carbon $end, Collection $accounts)
|
||||||
{
|
{
|
||||||
|
@@ -206,7 +206,6 @@ class ConvertController extends Controller
|
|||||||
$sourceAccount = TransactionJournal::sourceAccountList($journal)->first();
|
$sourceAccount = TransactionJournal::sourceAccountList($journal)->first();
|
||||||
$destinationAccount = TransactionJournal::destinationAccountList($journal)->first();
|
$destinationAccount = TransactionJournal::destinationAccountList($journal)->first();
|
||||||
$sourceType = $journal->transactionType;
|
$sourceType = $journal->transactionType;
|
||||||
$source = new Account;
|
|
||||||
$joined = $sourceType->type . '-' . $destinationType->type;
|
$joined = $sourceType->type . '-' . $destinationType->type;
|
||||||
switch ($joined) {
|
switch ($joined) {
|
||||||
default:
|
default:
|
||||||
|
@@ -46,8 +46,6 @@ class Note extends Model
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $value
|
|
||||||
*
|
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getMarkdownAttribute(): string
|
public function getMarkdownAttribute(): string
|
||||||
|
@@ -24,7 +24,6 @@ use FireflyIII\Models\TransactionJournal;
|
|||||||
use FireflyIII\Models\TransactionType;
|
use FireflyIII\Models\TransactionType;
|
||||||
use FireflyIII\User;
|
use FireflyIII\User;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
|
||||||
use Illuminate\Database\Query\JoinClause;
|
use Illuminate\Database\Query\JoinClause;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Log;
|
use Log;
|
||||||
|
@@ -29,7 +29,8 @@ interface JournalRepositoryInterface
|
|||||||
/**
|
/**
|
||||||
* @param TransactionJournal $journal
|
* @param TransactionJournal $journal
|
||||||
* @param TransactionType $type
|
* @param TransactionType $type
|
||||||
* @param array $data
|
* @param Account $source
|
||||||
|
* @param Account $destination
|
||||||
*
|
*
|
||||||
* @return MessageBag
|
* @return MessageBag
|
||||||
*/
|
*/
|
||||||
|
@@ -16,6 +16,7 @@ namespace FireflyIII\Rules\Actions;
|
|||||||
|
|
||||||
use FireflyIII\Models\RuleAction;
|
use FireflyIII\Models\RuleAction;
|
||||||
use FireflyIII\Models\TransactionJournal;
|
use FireflyIII\Models\TransactionJournal;
|
||||||
|
use Log;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class ClearCategory
|
* Class ClearCategory
|
||||||
|
Reference in New Issue
Block a user