Code clean up.

This commit is contained in:
James Cole
2017-11-15 12:25:49 +01:00
parent 57dcdfa0c4
commit ffca858b8d
476 changed files with 2055 additions and 4181 deletions

View File

@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\TransactionRules\Triggers;
@@ -28,13 +27,10 @@ use FireflyIII\Models\TransactionJournal;
use Log;
/**
* Class CategoryIs
*
* @package FireflyIII\TransactionRules\Triggers
* Class CategoryIs.
*/
final class CategoryIs extends AbstractTrigger implements TriggerInterface
{
/**
* 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
@@ -53,7 +49,7 @@ final class CategoryIs extends AbstractTrigger implements TriggerInterface
*/
public static function willMatchEverything($value = null)
{
if (!is_null($value)) {
if (null !== $value) {
return false;
}
Log::error(sprintf('Cannot use %s with a null value.', self::class));
@@ -69,7 +65,7 @@ final class CategoryIs extends AbstractTrigger implements TriggerInterface
public function triggered(TransactionJournal $journal): bool
{
$category = $journal->categories()->first();
if (!is_null($category)) {
if (null !== $category) {
$name = strtolower($category->name);
// match on journal:
if ($name === strtolower($this->triggerValue)) {
@@ -79,12 +75,12 @@ final class CategoryIs extends AbstractTrigger implements TriggerInterface
}
}
if (is_null($category)) {
if (null === $category) {
// perhaps transactions have this category?
/** @var Transaction $transaction */
foreach ($journal->transactions as $transaction) {
$category = $transaction->categories()->first();
if (!is_null($category)) {
if (null !== $category) {
$name = strtolower($category->name);
if ($name === strtolower($this->triggerValue)) {
Log::debug(