Remove PrivateNoUnderscore since it's ancient and nobody writes php like that

Author: simPod

src/Cdn77/Sniffs/NamingConventions/ValidVariableNameSniff.php

@@ -144,18 +144,13 @@ protected function processMemberVar(File $phpcsFile, $stackPtr): void
         $public = ($memberProps['scope'] !== 'private');
         $errorData = [$varName];
 
-        if ($public === true) {
-            if (strpos($varName, '_') === 0) {
-                $error = '%s member variable "%s" must not contain a leading underscore';
-                $data = [
-                    ucfirst($memberProps['scope']),
-                    $errorData[0],
-                ];
-                $phpcsFile->addError($error, $stackPtr, 'PublicHasUnderscore', $data);
-            }
-        } elseif (strpos($varName, '_') !== 0) {
-            $error = 'Private member variable "%s" must contain a leading underscore';
-            $phpcsFile->addError($error, $stackPtr, 'PrivateNoUnderscore', $errorData);
+        if (($public === true) && strpos($varName, '_') === 0) {
+            $error = '%s member variable "%s" must not contain a leading underscore';
+            $data = [
+                ucfirst($memberProps['scope']),
+                $errorData[0],
+            ];
+            $phpcsFile->addError($error, $stackPtr, 'PublicHasUnderscore', $data);
         }
 
         // Remove a potential underscore prefix for testing CamelCaps.

tests/Sniffs/NamingConventions/ValidVariableNameSniffTest.php

@@ -17,7 +17,6 @@ class ValidVariableNameSniffTest extends TestCase
     public const CODE_NOT_CAMEL_CAPS = 'NotCamelCaps';
     public const CODE_MEMBER_NOT_CAMEL_CAPS = 'MemberNotCamelCaps';
     public const CODE_PUBLIC_HAS_UNDERSCORE = 'PublicHasUnderscore';
-    public const CODE_PRIVATE_NO_UNDERSCORE = 'PrivateNoUnderscore';
     public const CODE_STRING_NOT_CAMEL_CAPS = 'StringNotCamelCaps';
 
     public function testErrors(): void
@@ -34,7 +33,6 @@ public function testErrors(): void
             20 => self::CODE_MEMBER_NOT_CAMEL_CAPS,
             22 => self::CODE_PUBLIC_HAS_UNDERSCORE,
             25 => self::CODE_MEMBER_NOT_CAMEL_CAPS,
-            27 => self::CODE_PRIVATE_NO_UNDERSCORE,
             31 => self::CODE_NOT_CAMEL_CAPS,
             33 => self::CODE_NOT_CAMEL_CAPS,
             36 => self::CODE_STRING_NOT_CAMEL_CAPS,
@@ -52,10 +50,6 @@ public function testErrors(): void
             106 => self::CODE_PUBLIC_HAS_UNDERSCORE,
             107 => self::CODE_PUBLIC_HAS_UNDERSCORE,
             108 => self::CODE_PUBLIC_HAS_UNDERSCORE,
-            111 => self::CODE_PRIVATE_NO_UNDERSCORE,
-            112 => self::CODE_PRIVATE_NO_UNDERSCORE,
-            113 => self::CODE_PRIVATE_NO_UNDERSCORE,
-            114 => self::CODE_PRIVATE_NO_UNDERSCORE,
             123 => self::CODE_PUBLIC_HAS_UNDERSCORE,
             138 => self::CODE_NOT_CAMEL_CAPS,
             141 => self::CODE_NOT_CAMEL_CAPS,
@@ -79,6 +73,6 @@ public function testErrors(): void
             }
         }
 
-        self::assertSame(38, $file->getErrorCount());
+        self::assertSame(33, $file->getErrorCount());
     }
 }