From 437f8f3e2dad835edf4738c3c2f26238017f0095 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Mon, 24 May 2021 16:21:00 +0100
Subject: [PATCH 1/2] Fix PHP TypeError

    Fatal error: Uncaught TypeError: vsprintf(): Argument #2 ($values) must be of type array, int given in /srv/www/vendor/squizlabs/php_codesniffer/src/Files/File.php:1056
    Stack trace:
    #0 /srv/www/vendor/squizlabs/php_codesniffer/src/Files/File.php(1056): vsprintf('Direct throw of...', 531)
    #1 /srv/www/vendor/squizlabs/php_codesniffer/src/Files/File.php(706): PHP_CodeSniffer\Files\File->addMessage(false, 'Direct throw of...', 67, 4, 'FoundDirectThro...', 531, 8, false)
    #2 /srv/www/vendor/magento/magento-coding-standard/Magento2/Sniffs/Exceptions/DirectThrowSniff.php(48): PHP_CodeSniffer\Files\File->addWarning('Direct throw of...', 526, 'FoundDirectThro...', 531)
    #3 /srv/www/vendor/squizlabs/php_codesniffer/src/Files/File.php(498): Magento2\Sniffs\Exceptions\DirectThrowSniff->process(Object(PHP_CodeSniffer\Files\LocalFile), 526)
    #4 /srv/www/vendor/squizlabs/php_codesniffer/src/Files/LocalFile.php(92): PHP_CodeSniffer\Files\File->process()
    #5 /srv/www/vendor/squizlabs/php_codesniffer/src/Runner.php(630): PHP_CodeSniffer\Files\LocalFile->process()
    #6 /srv/www/vendor/squizlabs/php_codesniffer/src/Runner.php(434): PHP_CodeSniffer\Runner->processFile(Object(PHP_CodeSniffer\Files\LocalFile))
    #7 /srv/www/vendor/squizlabs/php_codesniffer/src/Runner.php(114): PHP_CodeSniffer\Runner->run()
    #8 /srv/www/vendor/squizlabs/php_codesniffer/bin/phpcs(18): PHP_CodeSniffer\Runner->runPHPCS()
    #9 {main}
      thrown in /srv/www/vendor/squizlabs/php_codesniffer/src/Files/File.php on line 1056
---
 Magento2/Sniffs/Exceptions/DirectThrowSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
index 9612d84c..d5ce80c1 100644
--- a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
+++ b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
@@ -48,7 +48,7 @@ public function process(File $phpcsFile, $stackPtr)
                 $this->warningMessage,
                 $stackPtr,
                 $this->warningCode,
-                $posOfException
+                [$posOfException]
             );
         }
     }

From 9901dcffbb32a48d051b7bc9fdf1613367f250c8 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Mon, 24 May 2021 16:23:05 +0100
Subject: [PATCH 2/2] Make argument type clearer

---
 Magento2/Sniffs/Legacy/MageEntitySniff.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Magento2/Sniffs/Legacy/MageEntitySniff.php b/Magento2/Sniffs/Legacy/MageEntitySniff.php
index 13bc8beb..637c3b1c 100644
--- a/Magento2/Sniffs/Legacy/MageEntitySniff.php
+++ b/Magento2/Sniffs/Legacy/MageEntitySniff.php
@@ -77,7 +77,7 @@ public function process(File $phpcsFile, $stackPtr)
                 return;
             }
             $entityName = $tokens[$stackPtr]['content'];
-            $error = [$entityName . $tokens[$oldPosition]['content']];
+            $error = $entityName . $tokens[$oldPosition]['content'];
         } else {
             $oldPosition = $stackPtr;
             $stackPtr = $phpcsFile->findNext(T_STRING, $oldPosition + 1, null, false, null, true);
@@ -85,14 +85,14 @@ public function process(File $phpcsFile, $stackPtr)
                 return;
             }
             $entityName = $tokens[$stackPtr]['content'];
-            $error = [$tokens[$oldPosition]['content'] . ' ' . $entityName];
+            $error = $tokens[$oldPosition]['content'] . ' ' . $entityName;
         }
         if ($entityName === $this->legacyEntity || $this->isPrefixLegacy($entityName)) {
             $phpcsFile->addError(
                 $this->errorMessage,
                 $stackPtr,
                 $this->errorCode,
-                $error
+                [$error]
             );
         }
     }