Basic logging for willMatchEverything #322

This commit is contained in:
James Cole 2016-09-21 20:30:09 +02:00
parent d221ea68d0
commit a31b4ccf01
18 changed files with 108 additions and 14 deletions

View File

@ -8,14 +8,13 @@ declare(strict_types = 1);
* of the MIT license. See the LICENSE file for details. * of the MIT license. See the LICENSE file for details.
*/ */
declare(strict_types = 1);
namespace FireflyIII\Rules\Factory; namespace FireflyIII\Rules\Factory;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Rules\Actions\ActionInterface; use FireflyIII\Rules\Actions\ActionInterface;
use FireflyIII\Support\Domain; use FireflyIII\Support\Domain;
use Log;
/** /**
* Interface ActionInterface * Interface ActionInterface
@ -39,6 +38,7 @@ class ActionFactory
public static function getAction(RuleAction $action): ActionInterface public static function getAction(RuleAction $action): ActionInterface
{ {
$class = self::getActionClass($action->action_type); $class = self::getActionClass($action->action_type);
Log::debug(sprintf('self::getActionClass("%s") = "%s"', $action->action_type, $class));
return new $class($action); return new $class($action);
} }

View File

@ -46,6 +46,9 @@ class TriggerFactory
$class = self::getTriggerClass($triggerType); $class = self::getTriggerClass($triggerType);
$obj = $class::makeFromTriggerValue($trigger->trigger_value); $obj = $class::makeFromTriggerValue($trigger->trigger_value);
Log::debug(sprintf('self::getTriggerClass("%s") = "%s"', $triggerType, $class));
Log::debug(sprintf('%s::makeFromTriggerValue(%s) = object of class "%s"', $class, $trigger->trigger_value, get_class($obj)));
return $obj; return $obj;
} }

View File

@ -13,6 +13,7 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class AmountExactly * Class AmountExactly
@ -43,6 +44,7 @@ final class AmountExactly extends AbstractTrigger implements TriggerInterface
if (!is_null($value)) { if (!is_null($value)) {
return false; return false;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -13,6 +13,7 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class AmountLess * Class AmountLess
@ -43,6 +44,7 @@ final class AmountLess extends AbstractTrigger implements TriggerInterface
if (!is_null($value)) { if (!is_null($value)) {
return false; return false;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -13,6 +13,7 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class AmountMore * Class AmountMore
@ -41,9 +42,16 @@ final class AmountMore extends AbstractTrigger implements TriggerInterface
public static function willMatchEverything($value = null) public static function willMatchEverything($value = null)
{ {
if (!is_null($value)) { if (!is_null($value)) {
return bccomp('0', strval($value)) === 0; $res = bccomp('0', strval($value)) === 0;
if ($res === true) {
Log::error(sprintf('Cannot use %s with a value equal to 0.', self::class));
}
return $res;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -13,6 +13,7 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class DescriptionContains * Class DescriptionContains
@ -41,9 +42,16 @@ final class DescriptionContains extends AbstractTrigger implements TriggerInterf
public static function willMatchEverything($value = null) public static function willMatchEverything($value = null)
{ {
if (!is_null($value)) { if (!is_null($value)) {
return strval($value) === ''; $res = strval($value) === '';
if ($res === true) {
Log::error(sprintf('Cannot use %s with "" as a value.', self::class));
}
return $res;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -12,6 +12,7 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class DescriptionEnds * Class DescriptionEnds
@ -40,9 +41,16 @@ final class DescriptionEnds extends AbstractTrigger implements TriggerInterface
public static function willMatchEverything($value = null) public static function willMatchEverything($value = null)
{ {
if (!is_null($value)) { if (!is_null($value)) {
return strval($value) === ''; $res = strval($value) === '';
if ($res === true) {
Log::error(sprintf('Cannot use %s with "" as a value.', self::class));
}
return $res;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -12,6 +12,7 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class DescriptionIs * Class DescriptionIs
@ -43,6 +44,8 @@ final class DescriptionIs extends AbstractTrigger implements TriggerInterface
return false; return false;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -12,6 +12,7 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class DescriptionStarts * Class DescriptionStarts
@ -40,9 +41,16 @@ final class DescriptionStarts extends AbstractTrigger implements TriggerInterfac
public static function willMatchEverything($value = null) public static function willMatchEverything($value = null)
{ {
if (!is_null($value)) { if (!is_null($value)) {
return strval($value) === ''; $res = strval($value) === '';
if ($res === true) {
Log::error(sprintf('Cannot use %s with "" as a value.', self::class));
}
return $res;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -13,6 +13,7 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class FromAccountContains * Class FromAccountContains
@ -41,8 +42,14 @@ final class FromAccountContains extends AbstractTrigger implements TriggerInterf
public static function willMatchEverything($value = null) public static function willMatchEverything($value = null)
{ {
if (!is_null($value)) { if (!is_null($value)) {
return strval($value) === ''; $res = strval($value) === '';
if ($res === true) {
Log::error(sprintf('Cannot use %s with "" as a value.', self::class));
}
return $res;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -13,6 +13,7 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class FromAccountEnds * Class FromAccountEnds
@ -41,8 +42,14 @@ final class FromAccountEnds extends AbstractTrigger implements TriggerInterface
public static function willMatchEverything($value = null) public static function willMatchEverything($value = null)
{ {
if (!is_null($value)) { if (!is_null($value)) {
return strval($value) === ''; $res = strval($value) === '';
if ($res === true) {
Log::error(sprintf('Cannot use %s with "" as a value.', self::class));
}
return $res;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -13,7 +13,7 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class FromAccountIs * Class FromAccountIs
* *
@ -43,6 +43,7 @@ final class FromAccountIs extends AbstractTrigger implements TriggerInterface
if (!is_null($value)) { if (!is_null($value)) {
return false; return false;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -13,6 +13,7 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class FromAccountStarts * Class FromAccountStarts
@ -41,8 +42,14 @@ final class FromAccountStarts extends AbstractTrigger implements TriggerInterfac
public static function willMatchEverything($value = null) public static function willMatchEverything($value = null)
{ {
if (!is_null($value)) { if (!is_null($value)) {
return strval($value) === ''; $res = strval($value) === '';
if ($res === true) {
Log::error(sprintf('Cannot use %s with "" as a value.', self::class));
}
return $res;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -13,6 +13,7 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class ToAccountContains * Class ToAccountContains
@ -41,8 +42,14 @@ final class ToAccountContains extends AbstractTrigger implements TriggerInterfac
public static function willMatchEverything($value = null) public static function willMatchEverything($value = null)
{ {
if (!is_null($value)) { if (!is_null($value)) {
return strval($value) === ''; $res = strval($value) === '';
if ($res === true) {
Log::error(sprintf('Cannot use %s with "" as a value.', self::class));
}
return $res;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -13,6 +13,7 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class ToAccountEnds * Class ToAccountEnds
@ -41,8 +42,14 @@ final class ToAccountEnds extends AbstractTrigger implements TriggerInterface
public static function willMatchEverything($value = null) public static function willMatchEverything($value = null)
{ {
if (!is_null($value)) { if (!is_null($value)) {
return strval($value) === ''; $res = strval($value) === '';
if ($res === true) {
Log::error(sprintf('Cannot use %s with "" as a value.', self::class));
}
return $res;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -13,6 +13,7 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class ToAccountIs * Class ToAccountIs
@ -41,8 +42,14 @@ final class ToAccountIs extends AbstractTrigger implements TriggerInterface
public static function willMatchEverything($value = null) public static function willMatchEverything($value = null)
{ {
if (!is_null($value)) { if (!is_null($value)) {
return false; $res = strval($value) === '';
if ($res === true) {
Log::error(sprintf('Cannot use %s with "" as a value.', self::class));
}
return $res;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -13,6 +13,7 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class ToAccountStarts * Class ToAccountStarts
@ -41,8 +42,14 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface
public static function willMatchEverything($value = null) public static function willMatchEverything($value = null)
{ {
if (!is_null($value)) { if (!is_null($value)) {
return strval($value) === ''; $res = strval($value) === '';
if ($res === true) {
Log::error(sprintf('Cannot use %s with "" as a value.', self::class));
}
return $res;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }

View File

@ -12,6 +12,7 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class TransactionType * Class TransactionType
@ -42,6 +43,7 @@ final class TransactionType extends AbstractTrigger implements TriggerInterface
if (!is_null($value)) { if (!is_null($value)) {
return false; return false;
} }
Log::error(sprintf('Cannot use %s with a null value.', self::class));
return true; return true;
} }