kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 09:22:33 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup and refactoring.

Browse Source
This commit is contained in:
James Cole
2017-06-05 08:31:22 +02:00
parent 1dec270907
commit 64831b4c86
17 changed files with 769 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/JsonController.php
View File

@@ -142,10 +142,9 @@ class JsonController extends Controller
}
/**
* @param AccountTaskerInterface $accountTasker
* @param AccountRepositoryInterface $repository
*
* @return \Illuminate\Http\JsonResponse
* @internal param AccountTaskerInterface $accountTasker
* @internal param AccountRepositoryInterface $repository
*
*/
public function boxIn()
@@ -178,10 +177,10 @@ class JsonController extends Controller
}
/**
* @param AccountTaskerInterface $accountTasker
* @param AccountRepositoryInterface $repository
*
* @return \Symfony\Component\HttpFoundation\Response
* @internal param AccountTaskerInterface $accountTasker
* @internal param AccountRepositoryInterface $repository
*
*/
public function boxOut()
{

6
app/Http/Controllers/Transaction/MassController.php
View File

@@ -23,6 +23,7 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalUpdateInterface;
use Illuminate\Support\Collection;
use Preferences;
use Session;
@@ -203,11 +204,10 @@ class MassController extends Controller
*
* @return mixed
*/
public function update(MassEditJournalRequest $request, JournalRepositoryInterface $repository)
public function update(MassEditJournalRequest $request, JournalRepositoryInterface $repository, JournalUpdateInterface $updater)
{
$journalIds = $request->get('journals');
$count = 0;
if (is_array($journalIds)) {
foreach ($journalIds as $journalId) {
$journal = $repository->find(intval($journalId));
@@ -251,7 +251,7 @@ class MassController extends Controller
'tags' => $tags,
];
// call repository update function.
$repository->update($journal, $data);
$updater->update($journal, $data);
$count++;
}

6
app/Http/Controllers/Transaction/SingleController.php
View File

@@ -27,6 +27,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalUpdateInterface;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use Log;
use Preferences;
@@ -366,11 +367,12 @@ class SingleController extends Controller
/**
* @param JournalFormRequest $request
* @param JournalRepositoryInterface $repository
* @param JournalUpdateInterface $updater
* @param TransactionJournal $journal
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, TransactionJournal $journal)
public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, JournalUpdateInterface $updater, TransactionJournal $journal)
{
// @codeCoverageIgnoreStart
if ($this->isOpeningBalance($journal)) {
@@ -379,7 +381,7 @@ class SingleController extends Controller
// @codeCoverageIgnoreEnd
$data = $request->getJournalData();
$journal = $repository->update($journal, $data);
$journal = $updater->update($journal, $data);
/** @var array $files */
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
$this->attachments->saveAttachmentsForModel($journal, $files);

6
app/Http/Controllers/Transaction/SplitController.php
View File

@@ -25,6 +25,7 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalTaskerInterface;
use FireflyIII\Repositories\Journal\JournalUpdateInterface;
use Illuminate\Http\Request;
use Log;
use Preferences;
@@ -124,18 +125,19 @@ class SplitController extends Controller
/**
* @param Request $request
* @param JournalRepositoryInterface $repository
* @param JournalUpdateInterface $updater
* @param TransactionJournal $journal
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update(Request $request, JournalRepositoryInterface $repository, TransactionJournal $journal)
public function update(Request $request, JournalRepositoryInterface $repository, JournalUpdateInterface $updater, TransactionJournal $journal)
{
if ($this->isOpeningBalance($journal)) {
return $this->redirectToAccount($journal);
}
$data = $this->arrayFromInput($request);
$journal = $repository->updateSplitJournal($journal, $data);
$journal = $updater->updateSplitJournal($journal, $data);
/** @var array $files */
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
// save attachments: