IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-13 09:32:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole 2017-02-17 06:42:36 +01:00
parent 1d979778e8
commit 5d0cdc4ffa
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
31 changed files with 168 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/Console/Commands/UpgradeFireflyInstructions.php
View File

@ -84,21 +84,8 @@ class UpgradeFireflyInstructions extends Command
}
}
/**
* Show a line
*/
private function showLine()
private function installInstructions()
{
$line = '+';
for ($i = 0; $i < 78; $i++) {
$line .= '-';
}
$line .= '+';
$this->line($line);
}
private function installInstructions() {
/** @var string $version */
$version = config('firefly.version');
$config = config('upgrade.text.install');
@ -120,6 +107,7 @@ class UpgradeFireflyInstructions extends Command
$this->boxed('Firefly III should be ready for use.');
$this->boxed('');
$this->showLine();
return;
}
@ -129,6 +117,20 @@ class UpgradeFireflyInstructions extends Command
$this->showLine();
}
/**
* Show a line
*/
private function showLine()
{
$line = '+';
for ($i = 0; $i < 78; $i++) {
$line .= '-';
}
$line .= '+';
$this->line($line);
}
private function updateInstructions()
{
/** @var string $version */
@ -152,6 +154,7 @@ class UpgradeFireflyInstructions extends Command
$this->boxed('Firefly III should be ready for use.');
$this->boxed('');
$this->showLine();
return;
}

1
app/Export/Collector/AttachmentCollector.php
View File

@ -16,7 +16,6 @@ namespace FireflyIII\Export\Collector;
use Carbon\Carbon;
use Crypt;
use FireflyIII\Models\Attachment;
use FireflyIII\Models\ExportJob;
use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
use Illuminate\Contracts\Encryption\DecryptException;
use Illuminate\Support\Collection;

14
app/Export/Collector/CollectorInterface.php
View File

@ -33,13 +33,6 @@ interface CollectorInterface
*/
public function run(): bool;
/**
* @param ExportJob $job
*
* @return mixed
*/
public function setJob(ExportJob $job);
/**
* @param Collection $entries
*
@ -48,4 +41,11 @@ interface CollectorInterface
*/
public function setEntries(Collection $entries);
/**
* @param ExportJob $job
*
* @return mixed
*/
public function setJob(ExportJob $job);
}

1
app/Helpers/Collector/JournalCollector.php
View File

@ -503,6 +503,7 @@ class JournalCollector implements JournalCollectorInterface
public function withOpposingAccount(): JournalCollectorInterface
{
$this->joinOpposingTables();
return $this;
}

4
app/Helpers/Report/BalanceReportHelper.php
View File

@ -158,7 +158,9 @@ class BalanceReportHelper implements BalanceReportHelperInterface
foreach ($accounts as $account) {
$balanceEntry = new BalanceEntry;
$balanceEntry->setAccount($account);
$spent = $this->budgetRepository->spentInPeriod(new Collection([$budgetLimit->budget]), new Collection([$account]), $budgetLimit->start_date, $budgetLimit->end_date);
$spent = $this->budgetRepository->spentInPeriod(
new Collection([$budgetLimit->budget]), new Collection([$account]), $budgetLimit->start_date, $budgetLimit->end_date
);
$balanceEntry->setSpent($spent);
$line->addBalanceEntry($balanceEntry);
}

3
app/Helpers/Report/ReportHelper.php
View File

@ -16,15 +16,12 @@ namespace FireflyIII\Helpers\Report;
use Carbon\Carbon;
use FireflyIII\Helpers\Collection\Bill as BillCollection;
use FireflyIII\Helpers\Collection\BillLine;
use FireflyIII\Helpers\Collection\Category as CategoryCollection;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Helpers\FiscalHelperInterface;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Category;
use FireflyIII\Models\Transaction;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use Illuminate\Support\Collection;
/**

1
app/Helpers/Report/ReportHelperInterface.php
View File

@ -15,7 +15,6 @@ namespace FireflyIII\Helpers\Report;
use Carbon\Carbon;
use FireflyIII\Helpers\Collection\Bill as BillCollection;
use FireflyIII\Helpers\Collection\Category as CategoryCollection;
use FireflyIII\Helpers\Collection\Expense;
use FireflyIII\Helpers\Collection\Income;
use Illuminate\Support\Collection;

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

@ -23,7 +23,6 @@ use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Route;
use Session;
use View;

72
app/Http/Controllers/ReportController.php
View File

@ -98,42 +98,6 @@ class ReportController extends Controller
}
/**
* @param Collection $accounts
* @param Collection $tags
* @param Carbon $start
* @param Carbon $end
*
* @return string
*/
public function tagReport(Collection $accounts, Collection $tags, Carbon $start, Carbon $end)
{
if ($end < $start) {
return view('error')->with('message', trans('firefly.end_after_start_date'));
}
if ($start < session('first')) {
$start = session('first');
}
View::share(
'subTitle', trans(
'firefly.report_tag',
[
'start' => $start->formatLocalized($this->monthFormat),
'end' => $end->formatLocalized($this->monthFormat),
]
)
);
$generator = ReportGeneratorFactory::reportGenerator('Tag', $start, $end);
$generator->setAccounts($accounts);
$generator->setTags($tags);
$result = $generator->generate();
return $result;
}
/**
* @param Collection $accounts
* @param Collection $budgets
@ -357,6 +321,42 @@ class ReportController extends Controller
return redirect($uri);
}
/**
* @param Collection $accounts
* @param Collection $tags
* @param Carbon $start
* @param Carbon $end
*
* @return string
*/
public function tagReport(Collection $accounts, Collection $tags, Carbon $start, Carbon $end)
{
if ($end < $start) {
return view('error')->with('message', trans('firefly.end_after_start_date'));
}
if ($start < session('first')) {
$start = session('first');
}
View::share(
'subTitle', trans(
'firefly.report_tag',
[
'start' => $start->formatLocalized($this->monthFormat),
'end' => $end->formatLocalized($this->monthFormat),
]
)
);
$generator = ReportGeneratorFactory::reportGenerator('Tag', $start, $end);
$generator->setAccounts($accounts);
$generator->setTags($tags);
$result = $generator->generate();
return $result;
}
/**
* @return string
*/

1
app/Http/Middleware/Range.php
View File

@ -17,7 +17,6 @@ use Amount;
use App;
use Carbon\Carbon;
use Closure;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Http\Request;

1
app/Http/Middleware/StartFireflySession.php
View File

@ -14,7 +14,6 @@ namespace FireflyIII\Http\Middleware;
use Illuminate\Http\Request;
use Illuminate\Session\Middleware\StartSession;
use Illuminate\Session\SessionManager;
use Log;
/**
* Class StartFireflySession

4
app/Http/Middleware/VerifyCsrfToken.php
View File

@ -12,9 +12,10 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Middleware;
use Carbon\Carbon;
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
use Symfony\Component\HttpFoundation\Cookie;
use Carbon\Carbon;
/**
* Class VerifyCsrfToken
*
@ -37,6 +38,7 @@ class VerifyCsrfToken extends BaseVerifier
*
* @param \Illuminate\Http\Request $request
* @param \Symfony\Component\HttpFoundation\Response $response
*
* @return \Symfony\Component\HttpFoundation\Response
*/
protected function addCookieToResponse($request, $response)

1
app/Http/Requests/TagFormRequest.php
View File

@ -12,7 +12,6 @@
declare(strict_types = 1);
namespace FireflyIII\Http\Requests;
use Carbon\Carbon;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
/**

2
app/Providers/PiggyBankServiceProvider.php
View File

@ -14,7 +14,6 @@ declare(strict_types = 1);
namespace FireflyIII\Providers;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepository;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use Illuminate\Foundation\Application;
@ -53,6 +52,7 @@ class PiggyBankServiceProvider extends ServiceProvider
if ($app->auth->check()) {
$repository->setUser(auth()->user());
}
return $repository;
}
);

1
app/Providers/RuleServiceProvider.php
View File

@ -51,6 +51,7 @@ class RuleServiceProvider extends ServiceProvider
if ($app->auth->check()) {
$repository->setUser(auth()->user());
}
return $repository;
}
);

16
app/Repositories/Currency/CurrencyRepository.php
View File

@ -30,14 +30,6 @@ class CurrencyRepository implements CurrencyRepositoryInterface
/** @var User */
private $user;
/**
* @param User $user
*/
public function setUser(User $user)
{
$this->user = $user;
}
/**
* @param TransactionCurrency $currency
*
@ -186,6 +178,14 @@ class CurrencyRepository implements CurrencyRepositoryInterface
return $preferred;
}
/**
* @param User $user
*/
public function setUser(User $user)
{
$this->user = $user;
}
/**
* @param array $data
*

16
app/Repositories/Journal/JournalRepository.php
View File

@ -43,14 +43,6 @@ class JournalRepository implements JournalRepositoryInterface
/** @var array */
private $validMetaFields = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date', 'internal_reference', 'notes'];
/**
* @param User $user
*/
public function setUser(User $user)
{
$this->user = $user;
}
/**
* @param TransactionJournal $journal
* @param TransactionType $type
@ -143,6 +135,14 @@ class JournalRepository implements JournalRepositoryInterface
return TransactionType::orderBy('type', 'ASC')->get();
}
/**
* @param User $user
*/
public function setUser(User $user)
{
$this->user = $user;
}
/**
* @param array $data
*

92
app/Repositories/Tag/TagRepository.php
View File

@ -34,14 +34,6 @@ class TagRepository implements TagRepositoryInterface
/** @var User */
private $user;
/**
* @param User $user
*/
public function setUser(User $user)
{
$this->user = $user;
}
/**
*
* @param TransactionJournal $journal
@ -88,6 +80,25 @@ class TagRepository implements TagRepositoryInterface
return true;
}
/**
* @param Tag $tag
* @param Carbon $start
* @param Carbon $end
*
* @return string
*/
public function earnedInPeriod(Tag $tag, Carbon $start, Carbon $end): string
{
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
$collector->setUser($this->user);
$collector->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setAllAssetAccounts()->setTag($tag);
$set = $collector->getJournals();
$sum = strval($set->sum('transaction_amount'));
return $sum;
}
/**
* @param int $tagId
*
@ -167,6 +178,33 @@ class TagRepository implements TagRepositoryInterface
return new Carbon;
}
/**
* @param User $user
*/
public function setUser(User $user)
{
$this->user = $user;
}
/**
* @param Tag $tag
* @param Carbon $start
* @param Carbon $end
*
* @return string
*/
public function spentInPeriod(Tag $tag, Carbon $start, Carbon $end): string
{
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
$collector->setUser($this->user);
$collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setAllAssetAccounts()->setTag($tag);
$set = $collector->getJournals();
$sum = strval($set->sum('transaction_amount'));
return $sum;
}
/**
* @param array $data
*
@ -383,42 +421,4 @@ class TagRepository implements TagRepositoryInterface
return false;
}
/**
* @param Tag $tag
* @param Carbon $start
* @param Carbon $end
*
* @return string
*/
public function earnedInPeriod(Tag $tag, Carbon $start, Carbon $end): string
{
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
$collector->setUser($this->user);
$collector->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setAllAssetAccounts()->setTag($tag);
$set = $collector->getJournals();
$sum = strval($set->sum('transaction_amount'));
return $sum;
}
/**
* @param Tag $tag
* @param Carbon $start
* @param Carbon $end
*
* @return string
*/
public function spentInPeriod(Tag $tag, Carbon $start, Carbon $end): string
{
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
$collector->setUser($this->user);
$collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setAllAssetAccounts()->setTag($tag);
$set = $collector->getJournals();
$sum = strval($set->sum('transaction_amount'));
return $sum;
}
}

1
app/Rules/Triggers/AbstractTrigger.php
View File

@ -75,7 +75,6 @@ class AbstractTrigger
}
/**
* @param RuleTrigger $trigger
* @param TransactionJournal $journal

10
app/Support/Search/SearchInterface.php
View File

@ -30,11 +30,6 @@ interface SearchInterface
*/
public function searchAccounts(array $words): Collection;
/**
* @param User $user
*/
public function setUser(User $user);
/**
* @param array $words
*
@ -63,4 +58,9 @@ interface SearchInterface
* @return Collection
*/
public function searchTransactions(array $words): Collection;
/**
* @param User $user
*/
public function setUser(User $user);
}