B2B-582: Update history log messages for Order Approvals

 - test updates

Author: cspruiell

dev/tests/integration/testsuite/Magento/Framework/Mail/EmailMessageTest.php

@@ -13,7 +13,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Class EmailMessageTest
+ * Test Email Messages
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class EmailMessageTest extends TestCase

dev/tests/static/testsuite/Magento/Test/Integrity/Phrase/ArgumentsTest.php

@@ -102,11 +102,17 @@ private function checkArgumentMismatch($phrase, &$incorrectNumberOfArgumentsErro
             // count all occurrences of sprintf placeholders
             preg_match_all('/%\b([sducoxXbgGeEfF])\b/', $phrase['phrase'], $sprintfMatches);
             if (count($sprintfMatches[0]) > count(array_unique($sprintfMatches[0]))) {
-                $placeholderCount = $placeholderCount + count($sprintfMatches[0]) - count(array_unique($sprintfMatches[0]));
+                $placeholderCount = $placeholderCount +
+                    count($sprintfMatches[0]) - count(array_unique($sprintfMatches[0]));
             }
 
-            // Check for zend placeholders %placeholder% and sprintf placeholders
-            if (preg_match_all('/%\b(([sducoxXbgGeEfF])\b|([A-Za-z]+)%)/', $phrase['phrase'], $placeHolders, PREG_OFFSET_CAPTURE)) {
+            // Check for zend placeholders %placeholder% and sprintf placeholders and remove from the count
+            if (preg_match_all(
+                '/%\b(([sducoxXbgGeEfF])\b|([A-Za-z]+)%)/',
+                $phrase['phrase'],
+                $placeHolders,
+                PREG_OFFSET_CAPTURE
+            )) {
                 foreach ($placeHolders[0] as $ph) {
                     // Check if char after placeholder is not a digit or letter
                     $charAfterPh = $phrase['phrase'][$ph[1] + strlen($ph[0])];