Merge remote-tracking branch 'origin/2.4-develop' into 2.4-develop-pr32

Author: zakdma

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

@@ -99,9 +99,20 @@ private function checkArgumentMismatch($phrase, &$incorrectNumberOfArgumentsErro
     {
         if (preg_match_all('/%(\w+)/', $phrase['phrase'], $matches) || $phrase['arguments']) {
             $placeholderCount = count(array_unique($matches[1]));
+            // 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]));
+            }
 
-            // Check for zend placeholders %placeholder% and sprintf placeholder %s
-            if (preg_match_all('/%((s)|([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])];