Merge branch 'feature/2027-pear-validfunctionname-fix-uninitialized-o…

…ffset-error' of https://github.com/jrfnl/PHP_CodeSniffer
squizlabs · Jun 1, 2018 · 46fc938 · 46fc938
2 parents a73f45c + a285842
commit 46fc938
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -232,6 +232,7 @@ protected function processTokenOutsideScope(File $phpcsFile, $stackPtr)
         if ($packagePart !== '') {
             // Check that each new word starts with a capital.
             $nameBits = explode('_', $packagePart);
+            $nameBits = array_filter($nameBits);
             foreach ($nameBits as $bit) {
                 if ($bit{0} !== strtoupper($bit{0})) {
                     $newPackagePart = '';

diff --git a/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.inc b/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
@@ -229,3 +229,5 @@ $a new class {
     function __myFunction() {}
     function __my_function() {}
 }
+
+function send_system_email__to_user($body, $recipient){}
diff --git a/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php
@@ -138,6 +138,7 @@ public function getErrorList()
             227 => 1,
             229 => 1,
             230 => 2,
+            233 => 2,
         ];
 
     }//end getErrorList()