diff --git a/src/Api/Jobs/AcceptUserRegistrationJob.php b/src/Api/Jobs/AcceptUserRegistrationJob.php index e1717c15..cbb57566 100644 --- a/src/Api/Jobs/AcceptUserRegistrationJob.php +++ b/src/Api/Jobs/AcceptUserRegistrationJob.php @@ -8,7 +8,7 @@ class AcceptUserRegistrationJob extends AbstractUserJob $user->staffConfirmed = true; UserModel::save($user); - LogHelper::log('{user} confirmed {subject}\'s account', [ + Logger::log('{user} confirmed {subject}\'s account', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'subject' => TextHelper::reprUser($user)]); } diff --git a/src/Api/Jobs/ActivateUserEmailJob.php b/src/Api/Jobs/ActivateUserEmailJob.php index c47feec0..5f1210dd 100644 --- a/src/Api/Jobs/ActivateUserEmailJob.php +++ b/src/Api/Jobs/ActivateUserEmailJob.php @@ -33,7 +33,7 @@ class ActivateUserEmailJob extends AbstractJob TokenModel::save($token); UserModel::save($user); - LogHelper::log('{subject} just activated account', [ + Logger::log('{subject} just activated account', [ 'subject' => TextHelper::reprUser($user)]); return $user; diff --git a/src/Api/Jobs/AddCommentJob.php b/src/Api/Jobs/AddCommentJob.php index 504421a9..52a49c62 100644 --- a/src/Api/Jobs/AddCommentJob.php +++ b/src/Api/Jobs/AddCommentJob.php @@ -14,7 +14,7 @@ class AddCommentJob extends AbstractJob $comment->text = $text; CommentModel::save($comment); - LogHelper::log('{user} commented on {post}', [ + Logger::log('{user} commented on {post}', [ 'user' => TextHelper::reprUser($user), 'post' => TextHelper::reprPost($comment->getPost()->id)]); diff --git a/src/Api/Jobs/AddPostJob.php b/src/Api/Jobs/AddPostJob.php index 7a77b3e1..dee29c2c 100644 --- a/src/Api/Jobs/AddPostJob.php +++ b/src/Api/Jobs/AddPostJob.php @@ -6,7 +6,7 @@ class AddPostJob extends AbstractJob public function execute() { $post = PostModel::spawn(); - LogHelper::bufferChanges(); + Logger::bufferChanges(); //basic stuff $anonymous = $this->getArgument(self::ANONYMOUS); @@ -34,10 +34,10 @@ class AddPostJob extends AbstractJob PostModel::save($post); //clean edit log - LogHelper::setBuffer([]); + Logger::setBuffer([]); //log - LogHelper::log('{user} added {post} (tags: {tags}, safety: {safety}, source: {source})', [ + Logger::log('{user} added {post} (tags: {tags}, safety: {safety}, source: {source})', [ 'user' => ($anonymous and !getConfig()->misc->logAnonymousUploads) ? TextHelper::reprUser(UserModel::getAnonymousName()) : TextHelper::reprUser(Auth::getCurrentUser()), @@ -47,7 +47,7 @@ class AddPostJob extends AbstractJob 'source' => $post->source]); //finish - LogHelper::flush(); + Logger::flush(); return $post; } diff --git a/src/Api/Jobs/AddUserJob.php b/src/Api/Jobs/AddUserJob.php index 688e56da..36188e13 100644 --- a/src/Api/Jobs/AddUserJob.php +++ b/src/Api/Jobs/AddUserJob.php @@ -18,11 +18,11 @@ class AddUserJob extends AbstractJob ? AccessRank::Admin : AccessRank::Registered; - LogHelper::bufferChanges(); + Logger::bufferChanges(); Api::disablePrivilegeChecking(); Api::run((new EditUserJob)->skipSaving(), $arguments); Api::enablePrivilegeChecking(); - LogHelper::setBuffer([]); + Logger::setBuffer([]); if ($firstUser) $user->confirmEmail(); @@ -30,10 +30,10 @@ class AddUserJob extends AbstractJob //save the user to db if everything went okay UserModel::save($user); - LogHelper::log('{subject} just signed up', [ + Logger::log('{subject} just signed up', [ 'subject' => TextHelper::reprUser($user)]); - LogHelper::flush(); + Logger::flush(); return $user; } diff --git a/src/Api/Jobs/DeleteCommentJob.php b/src/Api/Jobs/DeleteCommentJob.php index 5e1532a8..00ed5da2 100644 --- a/src/Api/Jobs/DeleteCommentJob.php +++ b/src/Api/Jobs/DeleteCommentJob.php @@ -14,7 +14,7 @@ class DeleteCommentJob extends AbstractJob CommentModel::remove($this->comment); - LogHelper::log('{user} removed comment from {post}', [ + Logger::log('{user} removed comment from {post}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post)]); } diff --git a/src/Api/Jobs/DeletePostJob.php b/src/Api/Jobs/DeletePostJob.php index 85e2bc49..5f4cef37 100644 --- a/src/Api/Jobs/DeletePostJob.php +++ b/src/Api/Jobs/DeletePostJob.php @@ -7,7 +7,7 @@ class DeletePostJob extends AbstractPostJob PostModel::remove($post); - LogHelper::log('{user} deleted {post}', [ + Logger::log('{user} deleted {post}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post)]); } diff --git a/src/Api/Jobs/DeleteUserJob.php b/src/Api/Jobs/DeleteUserJob.php index 80f27d20..e4219b50 100644 --- a/src/Api/Jobs/DeleteUserJob.php +++ b/src/Api/Jobs/DeleteUserJob.php @@ -8,7 +8,7 @@ class DeleteUserJob extends AbstractUserJob $name = $user->name; UserModel::remove($user); - LogHelper::log('{user} removed {subject}\'s account', [ + Logger::log('{user} removed {subject}\'s account', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'subject' => TextHelper::reprUser($name)]); } diff --git a/src/Api/Jobs/EditCommentJob.php b/src/Api/Jobs/EditCommentJob.php index 2c98fdec..7daa110c 100644 --- a/src/Api/Jobs/EditCommentJob.php +++ b/src/Api/Jobs/EditCommentJob.php @@ -16,7 +16,7 @@ class EditCommentJob extends AbstractJob $comment->text = CommentModel::validateText($this->getArgument(self::TEXT)); CommentModel::save($comment); - LogHelper::log('{user} edited comment in {post}', [ + Logger::log('{user} edited comment in {post}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($comment->getPost())]); diff --git a/src/Api/Jobs/EditPostContentJob.php b/src/Api/Jobs/EditPostContentJob.php index 46e2c056..239e0032 100644 --- a/src/Api/Jobs/EditPostContentJob.php +++ b/src/Api/Jobs/EditPostContentJob.php @@ -13,7 +13,7 @@ class EditPostContentJob extends AbstractPostEditJob if (!$this->skipSaving) PostModel::save($post); - LogHelper::log('{user} changed contents of {post}', [ + Logger::log('{user} changed contents of {post}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post)]); diff --git a/src/Api/Jobs/EditPostJob.php b/src/Api/Jobs/EditPostJob.php index dc8230de..59dd938b 100644 --- a/src/Api/Jobs/EditPostJob.php +++ b/src/Api/Jobs/EditPostJob.php @@ -5,7 +5,7 @@ class EditPostJob extends AbstractPostEditJob { $post = $this->post; - LogHelper::bufferChanges(); + Logger::bufferChanges(); $subJobs = [ @@ -37,7 +37,7 @@ class EditPostJob extends AbstractPostEditJob if (!$this->skipSaving) PostModel::save($post); - LogHelper::flush(); + Logger::flush(); return $post; } } diff --git a/src/Api/Jobs/EditPostRelationsJob.php b/src/Api/Jobs/EditPostRelationsJob.php index a8134aa9..76b261b7 100644 --- a/src/Api/Jobs/EditPostRelationsJob.php +++ b/src/Api/Jobs/EditPostRelationsJob.php @@ -17,7 +17,7 @@ class EditPostRelationsJob extends AbstractPostEditJob foreach (array_diff($oldRelatedIds, $newRelatedIds) as $post2id) { - LogHelper::log('{user} removed relation between {post} and {post2}', [ + Logger::log('{user} removed relation between {post} and {post2}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post), 'post2' => TextHelper::reprPost($post2id)]); @@ -25,7 +25,7 @@ class EditPostRelationsJob extends AbstractPostEditJob foreach (array_diff($newRelatedIds, $oldRelatedIds) as $post2id) { - LogHelper::log('{user} added relation between {post} and {post2}', [ + Logger::log('{user} added relation between {post} and {post2}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post), 'post2' => TextHelper::reprPost($post2id)]); diff --git a/src/Api/Jobs/EditPostSafetyJob.php b/src/Api/Jobs/EditPostSafetyJob.php index a41c9b6a..2322e212 100644 --- a/src/Api/Jobs/EditPostSafetyJob.php +++ b/src/Api/Jobs/EditPostSafetyJob.php @@ -16,7 +16,7 @@ class EditPostSafetyJob extends AbstractPostEditJob if ($oldSafety != $newSafety) { - LogHelper::log('{user} changed safety of {post} to {safety}', [ + Logger::log('{user} changed safety of {post} to {safety}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post), 'safety' => $post->getSafety()->toString()]); diff --git a/src/Api/Jobs/EditPostSourceJob.php b/src/Api/Jobs/EditPostSourceJob.php index 14ca0037..864453bf 100644 --- a/src/Api/Jobs/EditPostSourceJob.php +++ b/src/Api/Jobs/EditPostSourceJob.php @@ -16,7 +16,7 @@ class EditPostSourceJob extends AbstractPostEditJob if ($oldSource != $newSource) { - LogHelper::log('{user} changed source of {post} to {source}', [ + Logger::log('{user} changed source of {post} to {source}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post), 'source' => $post->source]); diff --git a/src/Api/Jobs/EditPostTagsJob.php b/src/Api/Jobs/EditPostTagsJob.php index f9994329..ef064f66 100644 --- a/src/Api/Jobs/EditPostTagsJob.php +++ b/src/Api/Jobs/EditPostTagsJob.php @@ -18,7 +18,7 @@ class EditPostTagsJob extends AbstractPostEditJob foreach (array_diff($oldTags, $newTags) as $tag) { - LogHelper::log('{user} untagged {post} with {tag}', [ + Logger::log('{user} untagged {post} with {tag}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post), 'tag' => TextHelper::reprTag($tag)]); @@ -26,7 +26,7 @@ class EditPostTagsJob extends AbstractPostEditJob foreach (array_diff($newTags, $oldTags) as $tag) { - LogHelper::log('{user} tagged {post} with {tag}', [ + Logger::log('{user} tagged {post} with {tag}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post), 'tag' => TextHelper::reprTag($tag)]); diff --git a/src/Api/Jobs/EditPostThumbJob.php b/src/Api/Jobs/EditPostThumbJob.php index af2cf9a1..e314bd96 100644 --- a/src/Api/Jobs/EditPostThumbJob.php +++ b/src/Api/Jobs/EditPostThumbJob.php @@ -13,7 +13,7 @@ class EditPostThumbJob extends AbstractPostEditJob if (!$this->skipSaving) PostModel::save($post); - LogHelper::log('{user} changed thumb of {post}', [ + Logger::log('{user} changed thumb of {post}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post)]); diff --git a/src/Api/Jobs/EditPostUrlJob.php b/src/Api/Jobs/EditPostUrlJob.php index 0817152f..cd2869f8 100644 --- a/src/Api/Jobs/EditPostUrlJob.php +++ b/src/Api/Jobs/EditPostUrlJob.php @@ -13,7 +13,7 @@ class EditPostUrlJob extends AbstractPostEditJob if (!$this->skipSaving) PostModel::save($post); - LogHelper::log('{user} changed contents of {post}', [ + Logger::log('{user} changed contents of {post}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post)]); diff --git a/src/Api/Jobs/EditUserAccessRankJob.php b/src/Api/Jobs/EditUserAccessRankJob.php index 357b6805..13596081 100644 --- a/src/Api/Jobs/EditUserAccessRankJob.php +++ b/src/Api/Jobs/EditUserAccessRankJob.php @@ -17,7 +17,7 @@ class EditUserAccessRankJob extends AbstractUserEditJob if (!$this->skipSaving) UserModel::save($user); - LogHelper::log('{user} changed {subject}\'s access rank to {rank}', [ + Logger::log('{user} changed {subject}\'s access rank to {rank}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'subject' => TextHelper::reprUser($user), 'rank' => $newAccessRank->toString()]); diff --git a/src/Api/Jobs/EditUserEmailJob.php b/src/Api/Jobs/EditUserEmailJob.php index ad49331d..875644be 100644 --- a/src/Api/Jobs/EditUserEmailJob.php +++ b/src/Api/Jobs/EditUserEmailJob.php @@ -32,7 +32,7 @@ class EditUserEmailJob extends AbstractUserEditJob if (!$this->skipSaving) UserModel::save($user); - LogHelper::log('{user} changed {subject}\'s e-mail to {mail}', [ + Logger::log('{user} changed {subject}\'s e-mail to {mail}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'subject' => TextHelper::reprUser($user), 'mail' => $newEmail]); diff --git a/src/Api/Jobs/EditUserJob.php b/src/Api/Jobs/EditUserJob.php index b778ba9a..501c9fa1 100644 --- a/src/Api/Jobs/EditUserJob.php +++ b/src/Api/Jobs/EditUserJob.php @@ -36,7 +36,7 @@ class EditUserJob extends AbstractUserEditJob { $user = $this->user; - LogHelper::bufferChanges(); + Logger::bufferChanges(); foreach ($this->subJobs as $subJob) { @@ -57,7 +57,7 @@ class EditUserJob extends AbstractUserEditJob if (!$this->skipSaving) UserModel::save($user); - LogHelper::flush(); + Logger::flush(); return $user; } diff --git a/src/Api/Jobs/EditUserNameJob.php b/src/Api/Jobs/EditUserNameJob.php index 5c23ef7a..55680ab1 100644 --- a/src/Api/Jobs/EditUserNameJob.php +++ b/src/Api/Jobs/EditUserNameJob.php @@ -18,7 +18,7 @@ class EditUserNameJob extends AbstractUserEditJob if (!$this->skipSaving) UserModel::save($user); - LogHelper::log('{user} renamed {old} to {new}', [ + Logger::log('{user} renamed {old} to {new}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'old' => TextHelper::reprUser($oldName), 'new' => TextHelper::reprUser($newName)]); diff --git a/src/Api/Jobs/EditUserPasswordJob.php b/src/Api/Jobs/EditUserPasswordJob.php index 3958a14a..ad0604f1 100644 --- a/src/Api/Jobs/EditUserPasswordJob.php +++ b/src/Api/Jobs/EditUserPasswordJob.php @@ -18,7 +18,7 @@ class EditUserPasswordJob extends AbstractUserEditJob if (!$this->skipSaving) UserModel::save($user); - LogHelper::log('{user} changed {subject}\'s password', [ + Logger::log('{user} changed {subject}\'s password', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'subject' => TextHelper::reprUser($user)]); diff --git a/src/Api/Jobs/FeaturePostJob.php b/src/Api/Jobs/FeaturePostJob.php index 5af7afa7..b1dfd43a 100644 --- a/src/Api/Jobs/FeaturePostJob.php +++ b/src/Api/Jobs/FeaturePostJob.php @@ -9,7 +9,7 @@ class FeaturePostJob extends AbstractPostJob PropertyModel::set(PropertyModel::FeaturedPostDate, time()); PropertyModel::set(PropertyModel::FeaturedPostUserName, Auth::getCurrentUser()->name); - LogHelper::log('{user} featured {post} on main page', [ + Logger::log('{user} featured {post} on main page', [ 'user' => TextHelper::reprPost(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post)]); diff --git a/src/Api/Jobs/FlagPostJob.php b/src/Api/Jobs/FlagPostJob.php index c09e716f..83d6ac67 100644 --- a/src/Api/Jobs/FlagPostJob.php +++ b/src/Api/Jobs/FlagPostJob.php @@ -12,7 +12,7 @@ class FlagPostJob extends AbstractPostJob $flagged []= $key; SessionHelper::set('flagged', $flagged); - LogHelper::log('{user} flagged {post} for moderator attention', [ + Logger::log('{user} flagged {post} for moderator attention', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post)]); diff --git a/src/Api/Jobs/FlagUserJob.php b/src/Api/Jobs/FlagUserJob.php index 74365e19..d969bf9c 100644 --- a/src/Api/Jobs/FlagUserJob.php +++ b/src/Api/Jobs/FlagUserJob.php @@ -12,7 +12,7 @@ class FlagUserJob extends AbstractUserJob $flagged []= $key; SessionHelper::set('flagged', $flagged); - LogHelper::log('{user} flagged {subject} for moderator attention', [ + Logger::log('{user} flagged {subject} for moderator attention', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'subject' => TextHelper::reprUser($user)]); diff --git a/src/Api/Jobs/MergeTagsJob.php b/src/Api/Jobs/MergeTagsJob.php index b76c8b4e..8f1871b7 100644 --- a/src/Api/Jobs/MergeTagsJob.php +++ b/src/Api/Jobs/MergeTagsJob.php @@ -12,7 +12,7 @@ class MergeTagsJob extends AbstractJob TagModel::removeUnused(); TagModel::merge($sourceTag, $targetTag); - LogHelper::log('{user} merged {source} with {target}', [ + Logger::log('{user} merged {source} with {target}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'source' => TextHelper::reprTag($sourceTag), 'target' => TextHelper::reprTag($targetTag)]); diff --git a/src/Api/Jobs/PasswordResetJob.php b/src/Api/Jobs/PasswordResetJob.php index 266818fc..88c5f60b 100644 --- a/src/Api/Jobs/PasswordResetJob.php +++ b/src/Api/Jobs/PasswordResetJob.php @@ -35,7 +35,7 @@ class PasswordResetJob extends AbstractJob TokenModel::save($token); UserModel::save($user); - LogHelper::log('{subject} just reset password', [ + Logger::log('{subject} just reset password', [ 'subject' => TextHelper::reprUser($user)]); $x = new StdClass; diff --git a/src/Api/Jobs/RenameTagsJob.php b/src/Api/Jobs/RenameTagsJob.php index 87d3209b..a8af9476 100644 --- a/src/Api/Jobs/RenameTagsJob.php +++ b/src/Api/Jobs/RenameTagsJob.php @@ -12,7 +12,7 @@ class RenameTagsJob extends AbstractJob TagModel::removeUnused(); TagModel::rename($sourceTag, $targetTag); - LogHelper::log('{user} renamed {source} to {target}', [ + Logger::log('{user} renamed {source} to {target}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'source' => TextHelper::reprTag($sourceTag), 'target' => TextHelper::reprTag($targetTag)]); diff --git a/src/Api/Jobs/TogglePostTagJob.php b/src/Api/Jobs/TogglePostTagJob.php index 3ba88e91..4baacae2 100644 --- a/src/Api/Jobs/TogglePostTagJob.php +++ b/src/Api/Jobs/TogglePostTagJob.php @@ -34,14 +34,14 @@ class TogglePostTagJob extends AbstractPostJob if ($enable) { - LogHelper::log('{user} tagged {post} with {tag}', [ + Logger::log('{user} tagged {post} with {tag}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post), 'tag' => TextHelper::reprTag($tag)]); } else { - LogHelper::log('{user} untagged {post} with {tag}', [ + Logger::log('{user} untagged {post} with {tag}', [ 'user' => TextHelper::reprUser(Auth::getCurrentUser()), 'post' => TextHelper::reprPost($post), 'tag' => TextHelper::reprTag($tag)]); diff --git a/src/Api/Jobs/TogglePostVisibilityJob.php b/src/Api/Jobs/TogglePostVisibilityJob.php index 6338920c..2d0e3478 100644 --- a/src/Api/Jobs/TogglePostVisibilityJob.php +++ b/src/Api/Jobs/TogglePostVisibilityJob.php @@ -9,7 +9,7 @@ class TogglePostVisibilityJob extends AbstractPostJob $post->setHidden(!$visible); PostModel::save($post); - LogHelper::log( + Logger::log( $visible ? '{user} unhidden {post}' : '{user} hidden {post}', [ diff --git a/src/Api/Jobs/ToggleUserBanJob.php b/src/Api/Jobs/ToggleUserBanJob.php index 1c68d142..c4ff5241 100644 --- a/src/Api/Jobs/ToggleUserBanJob.php +++ b/src/Api/Jobs/ToggleUserBanJob.php @@ -9,7 +9,7 @@ class ToggleUserBanJob extends AbstractUserJob $user->banned = $banned; UserModel::save($user); - LogHelper::log( + Logger::log( $banned ? '{user} banned {subject}' : '{user} unbanned {subject}', [ diff --git a/src/LogEvent.php b/src/LogEvent.php new file mode 100644 index 00000000..0797bed3 --- /dev/null +++ b/src/LogEvent.php @@ -0,0 +1,30 @@ +timestamp = time(); + $this->text = $text; + $this->ip = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '0.0.0.0'; + $this->tokens = $tokens; + } + + public function getText() + { + return TextHelper::replaceTokens($this->text, $this->tokens); + } + + public function getFullText() + { + $date = date('Y-m-d H:i:s', $this->timestamp); + $ip = $this->ip; + $text = $this->getText(); + $line = sprintf('[%s] %s: %s', $date, $ip, $text); + return $line; + } +} diff --git a/src/Helpers/LogHelper.php b/src/Logger.php similarity index 63% rename from src/Helpers/LogHelper.php rename to src/Logger.php index 6f434744..6dd9b947 100644 --- a/src/Helpers/LogHelper.php +++ b/src/Logger.php @@ -1,5 +1,5 @@ timestamp = time(); - $this->text = $text; - $this->ip = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '0.0.0.0'; - $this->tokens = $tokens; - } - - public function getText() - { - return TextHelper::replaceTokens($this->text, $this->tokens); - } - - public function getFullText() - { - $date = date('Y-m-d H:i:s', $this->timestamp); - $ip = $this->ip; - $text = $this->getText(); - $line = sprintf('[%s] %s: %s', $date, $ip, $text); - return $line; - } -} - -LogHelper::init(); +Logger::init(); diff --git a/src/Mailer.php b/src/Mailer.php index d9853def..245468a0 100644 --- a/src/Mailer.php +++ b/src/Mailer.php @@ -44,7 +44,7 @@ class Mailer self::$mailCounter ++; - LogHelper::log('Sending e-mail with subject "{subject}" to {mail}', [ + Logger::log('Sending e-mail with subject "{subject}" to {mail}', [ 'subject' => $subject, 'mail' => $recipientEmail]); }