Removed all constructors from all triggers.

This commit is contained in:
James Cole 2016-02-17 20:09:03 +01:00
parent 05b7a610ef
commit 694447e66c
19 changed files with 98 additions and 296 deletions

View File

@ -0,0 +1,81 @@
<?php
/**
* AbstractTrigger.php
* Copyright (C) 2016 Sander Dorigo
*
* This software may be modified and distributed under the terms
* of the MIT license. See the LICENSE file for details.
*/
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
/**
* This class will be magical!
*
* Class AbstractTrigger
*
* @package FireflyIII\Rules\Triggers
*/
class AbstractTrigger
{
/** @var string */
protected $checkValue;
/** @var TransactionJournal */
protected $journal;
/** @var RuleTrigger */
protected $trigger;
/** @var string */
protected $triggerValue;
/**
* AbstractTrigger constructor.
*/
private function __construct()
{
}
/**
* @param RuleTrigger $trigger
*
* @return AbstractTrigger
*/
public static function makeFromTrigger(RuleTrigger $trigger)
{
$self = new self;
$self->trigger = $trigger;
$self->triggerValue = $trigger->trigger_value;
return $self;
}
/**
* @param RuleTrigger $trigger
* @param TransactionJournal $journal
*/
public static function makeFromTriggerAndJournal(RuleTrigger $trigger, TransactionJournal $journal)
{
$self = new self;
$self->trigger = $trigger;
$self->triggerValue = $trigger->trigger_value;
$self->journal = $journal;
}
/**
* @param string $triggerValue
*
* @return AbstractTrigger
*/
public static function makeFromTriggerValue(string $triggerValue)
{
$self = new self;
$self->triggerValue = $triggerValue;
return $self;
}
}

View File

@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -20,23 +19,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class AmountExactly implements TriggerInterface
class AmountExactly extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -20,24 +19,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class AmountLess implements TriggerInterface
class AmountLess extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -20,24 +19,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class AmountMore implements TriggerInterface
class AmountMore extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -20,24 +19,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class DescriptionContains implements TriggerInterface
class DescriptionContains extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -10,7 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -19,24 +18,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class DescriptionEnds implements TriggerInterface
class DescriptionEnds extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -10,7 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -19,24 +18,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class DescriptionIs implements TriggerInterface
class DescriptionIs extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -10,7 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -19,24 +18,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class DescriptionStarts implements TriggerInterface
class DescriptionStarts extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -10,7 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -19,24 +18,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class FromAccountContains implements TriggerInterface
class FromAccountContains extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -10,7 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -19,24 +18,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class FromAccountEnds implements TriggerInterface
class FromAccountEnds extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -10,7 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -19,24 +18,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class FromAccountIs implements TriggerInterface
class FromAccountIs extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -10,7 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -19,24 +18,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class FromAccountStarts implements TriggerInterface
class FromAccountStarts extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -10,7 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -19,24 +18,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class ToAccountContains implements TriggerInterface
class ToAccountContains extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -10,7 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -19,24 +18,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class ToAccountEnds implements TriggerInterface
class ToAccountEnds extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -10,7 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -19,24 +18,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class ToAccountIs implements TriggerInterface
class ToAccountIs extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -10,7 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -19,24 +18,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class ToAccountStarts implements TriggerInterface
class ToAccountStarts extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -10,7 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -19,24 +18,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class TransactionType implements TriggerInterface
class TransactionType extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples

View File

@ -10,7 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
/**
@ -20,12 +19,6 @@ use FireflyIII\Models\TransactionJournal;
*/
interface TriggerInterface
{
// /**
// * TriggerInterface constructor.
// *
// * @param RuleTrigger $trigger
// */
// public function __construct(RuleTrigger $trigger);
/**
* A trigger is said to "match anything", or match any given transaction,

View File

@ -10,7 +10,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionJournal;
use Log;
@ -19,25 +18,9 @@ use Log;
*
* @package FireflyIII\Rules\Triggers
*/
class UserAction implements TriggerInterface
class UserAction extends AbstractTrigger implements TriggerInterface
{
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
}
/**
* A trigger is said to "match anything", or match any given transaction,
* when the trigger value is very vague or has no restrictions. Easy examples