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

Cleaning up

Browse Source
This commit is contained in:
James Cole
2015-05-17 10:10:58 +02:00
parent 6b8194261f
commit beedf7d780
10 changed files with 11 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Kernel.php
View File

@@ -26,6 +26,8 @@ class Kernel extends ConsoleKernel
* *
* @param \Illuminate\Console\Scheduling\Schedule $schedule * @param \Illuminate\Console\Scheduling\Schedule $schedule
* *
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*
* @return void * @return void
*/ */
protected function schedule(Schedule $schedule) protected function schedule(Schedule $schedule)

1
app/Exceptions/Handler.php
View File

@@ -27,6 +27,7 @@ class Handler extends ExceptionHandler
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
* @param \Exception $e * @param \Exception $e
* @SuppressWarnings(PHPMD.ShortVariable)
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */

36
app/Handlers/Events/JournalDeletedHandler.php
View File

@@ -1,36 +0,0 @@
<?php namespace FireflyIII\Handlers\Events;
use FireflyIII\Events\JournalDeleted;
/**
* Class JournalDeletedHandler
*
* @codeCoverageIgnore
* @package FireflyIII\Handlers\Events
*/
class JournalDeletedHandler
{
/**
* Create the event handler.
*
*/
public function __construct()
{
//
}
/**
* Handle the event.
*
* @param JournalDeleted $event
*
* @return void
*/
public function handle(JournalDeleted $event)
{
//
}
}

2
app/Helpers/Reminders/ReminderHelper.php
View File

@@ -68,6 +68,8 @@ class ReminderHelper implements ReminderHelperInterface
* *
* @param PiggyBank $piggyBank * @param PiggyBank $piggyBank
* *
* @param Carbon $date
*
* @return mixed * @return mixed
*/ */
public function createReminders(PiggyBank $piggyBank, Carbon $date) public function createReminders(PiggyBank $piggyBank, Carbon $date)

2
app/Helpers/Reminders/ReminderHelperInterface.php
View File

@@ -56,6 +56,8 @@ interface ReminderHelperInterface
* *
* @param PiggyBank $piggyBank * @param PiggyBank $piggyBank
* *
* @param Carbon $date
*
* @return mixed * @return mixed
*/ */
public function createReminders(PiggyBank $piggyBank, Carbon $date); public function createReminders(PiggyBank $piggyBank, Carbon $date);

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

@@ -32,7 +32,6 @@ class ReportHelper implements ReportHelperInterface
/** /**
* @param ReportQueryInterface $query * @param ReportQueryInterface $query
* *
* @internal param ReportHelperInterface $helper
*/ */
public function __construct(ReportQueryInterface $query) public function __construct(ReportQueryInterface $query)
{ {

69
app/Repositories/PiggyBank/PiggyBankRepository.php
View File

@@ -19,57 +19,6 @@ use Navigation;
class PiggyBankRepository implements PiggyBankRepositoryInterface class PiggyBankRepository implements PiggyBankRepositoryInterface
{ {
/**
*
* Based on the piggy bank, the reminder-setting and
* other variables this method tries to divide the piggy bank into equal parts. Each is
* accommodated by a reminder (if everything goes to plan).
*
* @param PiggyBankRepetition $repetition
*
* @return Collection
*/
public function calculateParts(PiggyBankRepetition $repetition)
{
/** @var PiggyBank $piggyBank */
$piggyBank = $repetition->piggyBank()->first();
$bars = new Collection;
$currentStart = clone $repetition->startdate;
if (is_null($piggyBank->reminder)) {
$entry = ['repetition' => $repetition, 'amountPerBar' => floatval($piggyBank->targetamount),
'currentAmount' => floatval($repetition->currentamount), 'cumulativeAmount' => floatval($piggyBank->targetamount),
'startDate' => clone $repetition->startdate, 'targetDate' => clone $repetition->targetdate];
$bars->push($this->createPiggyBankPart($entry));
return $bars;
}
while ($currentStart < $repetition->targetdate) {
$currentTarget = Navigation::endOfX($currentStart, $piggyBank->reminder, $repetition->targetdate);
$entry = ['repetition' => $repetition, 'amountPerBar' => null, 'currentAmount' => floatval($repetition->currentamount),
'cumulativeAmount' => null, 'startDate' => $currentStart, 'targetDate' => $currentTarget];
$bars->push($this->createPiggyBankPart($entry));
$currentStart = clone $currentTarget;
$currentStart->addDay();
}
$amountPerBar = floatval($piggyBank->targetamount) / $bars->count();
$cumulative = $amountPerBar;
/** @var PiggyBankPart $bar */
foreach ($bars as $index => $bar) {
$bar->setAmountPerBar($amountPerBar);
$bar->setCumulativeAmount($cumulative);
if ($bars->count() - 1 == $index) {
$bar->setCumulativeAmount($piggyBank->targetamount);
}
$cumulative += $amountPerBar;
}
return $bars;
}
/** /**
* @param PiggyBank $piggyBank * @param PiggyBank $piggyBank
* @param $amount * @param $amount
@@ -83,24 +32,6 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
return true; return true;
} }
/**
* @param array $data
*
* @return PiggyBankPart
*/
public function createPiggyBankPart(array $data)
{
$part = new PiggyBankPart;
$part->setRepetition($data['repetition']);
$part->setAmountPerBar($data['amountPerBar']);
$part->setCurrentamount($data['currentAmount']);
$part->setCumulativeAmount($data['cumulativeAmount']);
$part->setStartdate($data['startDate']);
$part->setTargetdate($data['targetDate']);
return $part;
}
/** /**
* @param PiggyBank $piggyBank * @param PiggyBank $piggyBank
* *

19
app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
View File

@@ -14,18 +14,6 @@ use Illuminate\Support\Collection;
interface PiggyBankRepositoryInterface interface PiggyBankRepositoryInterface
{ {
/**
*
* Based on the piggy bank, the reminder-setting and
* other variables this method tries to divide the piggy bank into equal parts. Each is
* accommodated by a reminder (if everything goes to plan).
*
* @param PiggyBankRepetition $repetition
*
* @return Collection
*/
public function calculateParts(PiggyBankRepetition $repetition);
/** /**
* @return Collection * @return Collection
*/ */
@@ -38,13 +26,6 @@ interface PiggyBankRepositoryInterface
*/ */
public function getEvents(PiggyBank $piggyBank); public function getEvents(PiggyBank $piggyBank);
/**
* @param array $data
*
* @return PiggyBankPart
*/
public function createPiggyBankPart(array $data);
/** /**
* @param PiggyBank $piggyBank * @param PiggyBank $piggyBank
* @param $amount * @param $amount

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

@@ -18,6 +18,8 @@ class TagRepository implements TagRepositoryInterface
{ {
/** /**
* @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five.
*
* @param TransactionJournal $journal * @param TransactionJournal $journal
* @param Tag $tag * @param Tag $tag
* *

3
app/Validation/FireflyValidator.php
View File

@@ -29,10 +29,11 @@ class FireflyValidator extends Validator
* @param array $rules * @param array $rules
* @param array $messages * @param array $messages
* @param array $customAttributes * @param array $customAttributes
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/ */
public function __construct(TranslatorInterface $translator, array $data, array $rules, array $messages = [], array $customAttributes = []) public function __construct(TranslatorInterface $translator, array $data, array $rules, array $messages = [], array $customAttributes = [])
{ {
parent::__construct($translator, $data, $rules, $messages); parent::__construct($translator, $data, $rules, $messages, $customAttributes);
} }
/** /**