Merge branch 'feature/generic-one-oo-perfile-sniff-efficiency-tweak' of

https://github.com/jrfnl/PHP_CodeSniffer
squizlabs · May 31, 2022 · 5e27199 · 5e27199
2 parents f88fcbc + e2bbbce
commit 5e27199
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php
@@ -39,7 +39,13 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $nextClass = $phpcsFile->findNext($this->register(), ($stackPtr + 1));
+        $tokens = $phpcsFile->getTokens();
+        $start  = ($stackPtr + 1);
+        if (isset($tokens[$stackPtr]['scope_closer']) === true) {
+            $start = ($tokens[$stackPtr]['scope_closer'] + 1);
+        }
+
+        $nextClass = $phpcsFile->findNext($this->register(), $start);
         if ($nextClass !== false) {
             $error = 'Only one class is allowed in a file';
             $phpcsFile->addError($error, $nextClass, 'MultipleFound');

diff --git a/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php
@@ -39,7 +39,13 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $nextInterface = $phpcsFile->findNext($this->register(), ($stackPtr + 1));
+        $tokens = $phpcsFile->getTokens();
+        $start  = ($stackPtr + 1);
+        if (isset($tokens[$stackPtr]['scope_closer']) === true) {
+            $start = ($tokens[$stackPtr]['scope_closer'] + 1);
+        }
+
+        $nextInterface = $phpcsFile->findNext($this->register(), $start);
         if ($nextInterface !== false) {
             $error = 'Only one interface is allowed in a file';
             $phpcsFile->addError($error, $nextInterface, 'MultipleFound');

diff --git a/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php
@@ -44,7 +44,13 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $nextClass = $phpcsFile->findNext($this->register(), ($stackPtr + 1));
+        $tokens = $phpcsFile->getTokens();
+        $start  = ($stackPtr + 1);
+        if (isset($tokens[$stackPtr]['scope_closer']) === true) {
+            $start = ($tokens[$stackPtr]['scope_closer'] + 1);
+        }
+
+        $nextClass = $phpcsFile->findNext($this->register(), $start);
         if ($nextClass !== false) {
             $error = 'Only one object structure is allowed in a file';
             $phpcsFile->addError($error, $nextClass, 'MultipleFound');

diff --git a/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php
@@ -39,7 +39,13 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $nextClass = $phpcsFile->findNext($this->register(), ($stackPtr + 1));
+        $tokens = $phpcsFile->getTokens();
+        $start  = ($stackPtr + 1);
+        if (isset($tokens[$stackPtr]['scope_closer']) === true) {
+            $start = ($tokens[$stackPtr]['scope_closer'] + 1);
+        }
+
+        $nextClass = $phpcsFile->findNext($this->register(), $start);
         if ($nextClass !== false) {
             $error = 'Only one trait is allowed in a file';
             $phpcsFile->addError($error, $nextClass, 'MultipleFound');