PHP7 compatible function definitions.

This commit is contained in:
James Cole
2016-04-05 22:00:03 +02:00
parent b0b5d90976
commit 37fe2d22b0
56 changed files with 209 additions and 216 deletions

View File

@@ -32,5 +32,5 @@ interface ActionInterface
*
* @return bool
*/
public function act(TransactionJournal $journal);
public function act(TransactionJournal $journal): bool;
}

View File

@@ -42,7 +42,7 @@ class AddTag implements ActionInterface
*
* @return bool
*/
public function act(TransactionJournal $journal)
public function act(TransactionJournal $journal): bool
{
// journal has this tag maybe?
$tag = Tag::firstOrCreateEncrypted(['tag' => $this->action->action_value, 'user_id' => Auth::user()->id]);

View File

@@ -39,7 +39,7 @@ class AppendDescription implements ActionInterface
*
* @return bool
*/
public function act(TransactionJournal $journal)
public function act(TransactionJournal $journal): bool
{
$journal->description = $journal->description . $this->action->action_value;
$journal->save();

View File

@@ -40,7 +40,7 @@ class ClearBudget implements ActionInterface
*
* @return bool
*/
public function act(TransactionJournal $journal)
public function act(TransactionJournal $journal): bool
{
$journal->budgets()->detach();

View File

@@ -40,7 +40,7 @@ class ClearCategory implements ActionInterface
*
* @return bool
*/
public function act(TransactionJournal $journal)
public function act(TransactionJournal $journal): bool
{
$journal->categories()->detach();

View File

@@ -39,7 +39,7 @@ class PrependDescription implements ActionInterface
*
* @return bool
*/
public function act(TransactionJournal $journal)
public function act(TransactionJournal $journal): bool
{
$journal->description = $this->action->action_value . $journal->description;
$journal->save();

View File

@@ -39,7 +39,7 @@ class RemoveAllTags implements ActionInterface
*
* @return bool
*/
public function act(TransactionJournal $journal)
public function act(TransactionJournal $journal): bool
{
$journal->tags()->detach();

View File

@@ -42,7 +42,7 @@ class RemoveTag implements ActionInterface
*
* @return bool
*/
public function act(TransactionJournal $journal)
public function act(TransactionJournal $journal): bool
{
// if tag does not exist, no need to continue:
$name = $this->action->action_value;

View File

@@ -43,7 +43,7 @@ class SetBudget implements ActionInterface
*
* @return bool
*/
public function act(TransactionJournal $journal)
public function act(TransactionJournal $journal): bool
{
/** @var BudgetRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');

View File

@@ -43,7 +43,7 @@ class SetCategory implements ActionInterface
*
* @return bool
*/
public function act(TransactionJournal $journal)
public function act(TransactionJournal $journal): bool
{
$name = $this->action->action_value;
$category = Category::firstOrCreateEncrypted(['name' => $name, 'user_id' => Auth::user()->id]);

View File

@@ -39,7 +39,7 @@ class SetDescription implements ActionInterface
*
* @return bool
*/
public function act(TransactionJournal $journal)
public function act(TransactionJournal $journal): bool
{
$journal->description = $this->action->action_value;
$journal->save();

View File

@@ -117,7 +117,7 @@ final class Processor
*
* @return \FireflyIII\Models\Rule
*/
public function getRule()
public function getRule(): Rule
{
return $this->rule;
}
@@ -131,7 +131,7 @@ final class Processor
*
* @return bool
*/
public function handleTransactionJournal(TransactionJournal $journal)
public function handleTransactionJournal(TransactionJournal $journal): bool
{
$this->journal = $journal;
// get all triggers:

View File

@@ -115,7 +115,7 @@ class TransactionMatcher
*
* @return TransactionMatcher
*/
public function setLimit($limit): TransactionMatcher
public function setLimit(int $limit): TransactionMatcher
{
$this->limit = $limit;
@@ -135,7 +135,7 @@ class TransactionMatcher
*
* @return TransactionMatcher
*/
public function setRange($range): TransactionMatcher
public function setRange(int $range): TransactionMatcher
{
$this->range = $range;
@@ -156,7 +156,7 @@ class TransactionMatcher
*
* @return TransactionMatcher
*/
public function setTriggers($triggers): TransactionMatcher
public function setTriggers(array $triggers): TransactionMatcher
{
$this->triggers = $triggers;

View File

@@ -51,7 +51,7 @@ final class AmountExactly extends AbstractTrigger implements TriggerInterface
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$amount = $journal->destination_amount ?? TransactionJournal::amountPositive($journal);
$compare = $this->triggerValue;

View File

@@ -51,7 +51,7 @@ final class AmountLess extends AbstractTrigger implements TriggerInterface
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$amount = $journal->destination_amount ?? TransactionJournal::amountPositive($journal);
$compare = $this->triggerValue;

View File

@@ -51,7 +51,7 @@ final class AmountMore extends AbstractTrigger implements TriggerInterface
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$amount = $journal->destination_amount ?? TransactionJournal::amountPositive($journal);
$compare = $this->triggerValue;

View File

@@ -51,7 +51,7 @@ final class DescriptionContains extends AbstractTrigger implements TriggerInterf
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$search = strtolower($this->triggerValue);
$source = strtolower($journal->description);

View File

@@ -50,7 +50,7 @@ final class DescriptionEnds extends AbstractTrigger implements TriggerInterface
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$description = strtolower($journal->description);
$descriptionLength = strlen($description);

View File

@@ -50,7 +50,7 @@ final class DescriptionIs extends AbstractTrigger implements TriggerInterface
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$description = strtolower($journal->description);
$search = strtolower($this->triggerValue);

View File

@@ -50,7 +50,7 @@ final class DescriptionStarts extends AbstractTrigger implements TriggerInterfac
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$description = strtolower($journal->description);
$search = strtolower($this->triggerValue);

View File

@@ -50,7 +50,7 @@ final class FromAccountContains extends AbstractTrigger implements TriggerInterf
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$fromAccountName = strtolower($journal->source_account_name ?? TransactionJournal::sourceAccount($journal)->name);
$search = strtolower($this->triggerValue);

View File

@@ -50,7 +50,7 @@ final class FromAccountEnds extends AbstractTrigger implements TriggerInterface
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$name = strtolower($journal->source_account_name ?? TransactionJournal::sourceAccount($journal)->name);
$nameLength = strlen($name);

View File

@@ -50,7 +50,7 @@ final class FromAccountIs extends AbstractTrigger implements TriggerInterface
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$name = strtolower($journal->source_account_name ?? TransactionJournal::sourceAccount($journal)->name);
$search = strtolower($this->triggerValue);

View File

@@ -50,7 +50,7 @@ final class FromAccountStarts extends AbstractTrigger implements TriggerInterfac
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$name = strtolower($journal->source_account_name ?? TransactionJournal::sourceAccount($journal)->name);
$search = strtolower($this->triggerValue);

View File

@@ -50,7 +50,7 @@ final class ToAccountContains extends AbstractTrigger implements TriggerInterfac
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$toAccountName = strtolower($journal->destination_account_name ?? TransactionJournal::destinationAccount($journal)->name);
$search = strtolower($this->triggerValue);

View File

@@ -50,7 +50,7 @@ final class ToAccountEnds extends AbstractTrigger implements TriggerInterface
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$toAccountName = strtolower($journal->destination_account_name ?? TransactionJournal::destinationAccount($journal)->name);
$toAccountNameLength = strlen($toAccountName);

View File

@@ -50,7 +50,7 @@ final class ToAccountIs extends AbstractTrigger implements TriggerInterface
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$toAccountName = strtolower($journal->destination_account_name ?? TransactionJournal::destinationAccount($journal)->name);
$search = strtolower($this->triggerValue);

View File

@@ -50,7 +50,7 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$toAccountName = strtolower($journal->destination_account_name ?? TransactionJournal::destinationAccount($journal)->name);
$search = strtolower($this->triggerValue);

View File

@@ -50,7 +50,7 @@ final class TransactionType extends AbstractTrigger implements TriggerInterface
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
$type = !is_null($journal->transaction_type_type) ? $journal->transaction_type_type : strtolower($journal->transactionType->type);
$search = strtolower($this->triggerValue);

View File

@@ -43,5 +43,5 @@ interface TriggerInterface
*
* @return bool
*/
public function triggered(TransactionJournal $journal);
public function triggered(TransactionJournal $journal): bool;
}

View File

@@ -48,7 +48,7 @@ final class UserAction extends AbstractTrigger implements TriggerInterface
*
* @return bool
*/
public function triggered(TransactionJournal $journal)
public function triggered(TransactionJournal $journal): bool
{
return true;
}