kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Improve tests.

Browse Source
This commit is contained in:
James Cole
2018-12-17 07:09:44 +01:00
parent 89942ee49c
commit 454b3ebd97
19 changed files with 494 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/BillController.php
View File

@@ -196,7 +196,11 @@ class BillController extends Controller
$parameters = new ParameterBag();
$parameters->set('start', $start);
$parameters->set('end', $end);
$transformer = new BillTransformer($parameters);
/** @var BillTransformer $transformer */
$transformer = app(BillTransformer::class);
$transformer->setParameters($parameters);
/** @var Collection $bills */
$bills = $paginator->getCollection()->map(
function (Bill $bill) use ($transformer) {
@@ -294,7 +298,12 @@ class BillController extends Controller
$parameters = new ParameterBag();
$parameters->set('start', $start);
$parameters->set('end', $end);
$resource = new Item($bill, new BillTransformer($parameters), 'bill');
/** @var BillTransformer $transformer */
$transformer = app(BillTransformer::class);
$transformer->setParameters($parameters);
$resource = new Item($bill, $transformer, 'bill');
$object = $manager->createData($resource)->toArray();
$object['data']['currency'] = $bill->transactionCurrency;

17
app/Http/Controllers/PiggyBankController.php
View File

@@ -244,9 +244,15 @@ class PiggyBankController extends Controller
// transform piggies using the transformer:
$parameters = new ParameterBag;
$parameters->set('end', $end);
$transformed = new Collection;
$transformer = new PiggyBankTransformer(new ParameterBag);
$accountTransformer = new AccountTransformer($parameters);
$transformed = new Collection;
/** @var PiggyBankTransformer $transformer */
$transformer = app(PiggyBankTransformer::class);
$transformer->setParameters(new ParameterBag);
/** @var AccountTransformer $accountTransformer */
$accountTransformer = app(AccountTransformer::class);
$accountTransformer->setParameters($parameters);
/** @var PiggyBank $piggy */
foreach ($collection as $piggy) {
$array = $transformer->transform($piggy);
@@ -435,7 +441,10 @@ class PiggyBankController extends Controller
// transform piggies using the transformer:
$parameters = new ParameterBag;
$parameters->set('end', $end);
$transformer = new PiggyBankTransformer(new ParameterBag);
/** @var PiggyBankTransformer $transformer */
$transformer = app(PiggyBankTransformer::class);
$transformer->setParameters($parameters);
$piggy = $transformer->transform($piggyBank);
$events = $this->piggyRepos->getEvents($piggyBank);
$subTitle = $piggyBank->name;

5
app/Http/Controllers/Recurring/EditController.php
View File

@@ -81,7 +81,10 @@ class EditController extends Controller
*/
public function edit(Request $request, Recurrence $recurrence)
{
$transformer = new RecurrenceTransformer(new ParameterBag);
/** @var RecurrenceTransformer $transformer */
$transformer = app(RecurrenceTransformer::class);
$transformer->setParameters(new ParameterBag);
$array = $transformer->transform($recurrence);
$budgets = app('expandedform')->makeSelectListWithEmpty($this->budgets->getActiveBudgets());

10
app/Http/Controllers/Recurring/IndexController.php
View File

@@ -86,7 +86,10 @@ class IndexController extends Controller
/** @var Collection $recurrences */
$recurrences = $collection->slice(($page - 1) * $pageSize, $pageSize);
$transformer = new RecurrenceTransformer(new ParameterBag);
/** @var RecurrenceTransformer $transformer */
$transformer = app(RecurrenceTransformer::class);
$transformer->setParameters(new ParameterBag);
$recurring = [];
/** @var Recurrence $recurrence */
foreach ($recurrences as $recurrence) {
@@ -114,7 +117,10 @@ class IndexController extends Controller
*/
public function show(Recurrence $recurrence)
{
$transformer = new RecurrenceTransformer(new ParameterBag);
/** @var RecurrenceTransformer $transformer */
$transformer = app(RecurrenceTransformer::class);
$transformer->setParameters(new ParameterBag);
$array = $transformer->transform($recurrence);
$transactions = $this->recurring->getTransactions($recurrence);

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

@@ -142,7 +142,10 @@ class MassController extends Controller
$this->rememberPreviousUri('transactions.mass-edit.uri');
$transformer = new TransactionTransformer(new ParameterBag);
/** @var TransactionTransformer $transformer */
$transformer = app(TransactionTransformer::class);
$transformer->setParameters(new ParameterBag);
/** @var TransactionCollectorInterface $collector */
$collector = app(TransactionCollectorInterface::class);
$collector->setUser($user);

6
app/Http/Controllers/TransactionController.php
View File

@@ -253,7 +253,11 @@ class TransactionController extends Controller
$collector->setJournals(new Collection([$journal]));
$set = $collector->getTransactions();
$transactions = [];
$transformer = new TransactionTransformer(new ParameterBag);
/** @var TransactionTransformer $transformer */
$transformer = app(TransactionTransformer::class);
$transformer->setParameters(new ParameterBag);
/** @var Transaction $transaction */
foreach ($set as $transaction) {
$transactions[] = $transformer->transform($transaction);

2
app/Http/Requests/SplitJournalFormRequest.php
View File

@@ -95,7 +95,7 @@ class SplitJournalFormRequest extends Request
'foreign_currency_code' => null,
'reconciled' => false,
'identifier' => $index,
'currency_id' => (int)$transaction['transaction_currency_id'],
'currency_id' => (int)$transaction['currency_id'],
'currency_code' => null,
'description' => $transaction['transaction_description'] ?? '',
'amount' => $transaction['amount'] ?? '',