#393 - fix coding style, excluding tests/

Author: jpahullo

classes/local/status.php

@@ -16,6 +16,8 @@
 
 namespace tool_mergeusers\local;
 
+// phpcs:disable moodle.Commenting.InlineComment.DocBlock
+
 /**
  * Status enum for user merging process.
  *

lang/en/tool_mergeusers.php

@@ -70,11 +70,6 @@
 $string['logok'] = 'Here are the queries that have been sent to the DB:';
 $string['mergedbyuseridonlog'] = 'Merged by';
 $string['mergeusers'] = 'Merge user accounts';
-$string['messageprovider:mergeusers_completion'] = 'Notification when user merge process is completed';
-$string['message:mergeusers_success_subject'] = 'User merge completed successfully';
-$string['message:mergeusers_success_body'] = 'The merge of user {$a->fromuser} (ID: {$a->fromuserid}) into {$a->touser} (ID: {$a->touserid}) has been completed successfully.';
-$string['message:mergeusers_error_subject'] = 'User merge completed with errors';
-$string['message:mergeusers_error_body'] = 'The merge of user {$a->fromuser} (ID: {$a->fromuserid}) into {$a->touser} (ID: {$a->touserid}) has been completed with errors. Please review the merge logs for details.';
 $string['mergeusers:mergeusers'] = 'Merge user accounts';
 $string['mergeusers:view'] = 'Merge User Accounts';
 $string['mergeusers:viewlog'] = 'View merge logs';
@@ -84,10 +79,10 @@
 $string['mergeusersadvanced_help'] = 'Here you can enter the below fields if you know exactly what users that you want to merge.<br /><br /> Click the "search" button in order to verify/confirm that the input entered are in fact users.';
 $string['mergeusersqueued'] = 'Merge queued!<br/>Between {$a->fromuser}<br/>and {$a->touser}.<br/>It will run during the next cron execution. You will see the results on {$a->logid}.';
 $string['merging'] = 'Merged';
-$string['message:mergeusers_error_body'] = 'The merge of user {$a->fromuser} into {$a->touser} has been completed with errors. Please review the merge {$a->logid} for details.';
-$string['message:mergeusers_error_subject'] = '[Merge Users] Merge completed with errors';
-$string['message:mergeusers_success_body'] = 'The merge of user {$a->fromuser} into {$a->touser} has been completed successfully. Please review the merge {$a->logid} for details.';
-$string['message:mergeusers_success_subject'] = '[Merge Users] Merge completed successfully';
+$string['message:mergeusers_error_body'] = 'The merge of user {$a->fromuser} (ID: {$a->fromuserid}) into {$a->touser} (ID: {$a->touserid}) has been completed with errors. Please review the merge logs for details.';
+$string['message:mergeusers_error_subject'] = 'User merge completed with errors';
+$string['message:mergeusers_success_body'] = 'The merge of user {$a->fromuser} (ID: {$a->fromuserid}) into {$a->touser} (ID: {$a->touserid}) has been completed successfully.';
+$string['message:mergeusers_success_subject'] = 'User merge completed successfully';
 $string['messageprovider:mergeusers_completion'] = 'Notification when user merge process is completed';
 $string['newuser'] = 'User to keep';
 $string['newuserid'] = 'User ID to be kept';