Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

# Conflicts:
#	.ci/php-cs-fixer/composer.lock

app/TransactionRules/Expressions/ActionExpressionLanguageProvider.php

@@ -60,6 +60,7 @@ class ActionExpressionLanguageProvider implements ExpressionFunctionProviderInte
 
             ExpressionFunction::fromPhp('substr'),
             ExpressionFunction::fromPhp('strlen'),
+            ExpressionFunction::fromPhp('strpos'),
         ];
     }
 }