mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-22 12:11:19 +00:00
PHP7 compatible function definitions.
This commit is contained in:
@@ -32,5 +32,5 @@ interface ActionInterface
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function act(TransactionJournal $journal);
|
||||
public function act(TransactionJournal $journal): bool;
|
||||
}
|
||||
|
@@ -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]);
|
||||
|
@@ -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();
|
||||
|
@@ -40,7 +40,7 @@ class ClearBudget implements ActionInterface
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function act(TransactionJournal $journal)
|
||||
public function act(TransactionJournal $journal): bool
|
||||
{
|
||||
$journal->budgets()->detach();
|
||||
|
||||
|
@@ -40,7 +40,7 @@ class ClearCategory implements ActionInterface
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function act(TransactionJournal $journal)
|
||||
public function act(TransactionJournal $journal): bool
|
||||
{
|
||||
$journal->categories()->detach();
|
||||
|
||||
|
@@ -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();
|
||||
|
@@ -39,7 +39,7 @@ class RemoveAllTags implements ActionInterface
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function act(TransactionJournal $journal)
|
||||
public function act(TransactionJournal $journal): bool
|
||||
{
|
||||
$journal->tags()->detach();
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -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');
|
||||
|
@@ -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]);
|
||||
|
@@ -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();
|
||||
|
@@ -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:
|
||||
|
@@ -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;
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -43,5 +43,5 @@ interface TriggerInterface
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function triggered(TransactionJournal $journal);
|
||||
public function triggered(TransactionJournal $journal): bool;
|
||||
}
|
||||
|
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user