From e2bbbceda08adc2aed7ba7a3339e1f77b65b86c5 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 25 Jul 2021 21:28:55 +0200
Subject: [PATCH] Generic/One*PerFile sniffs: efficiency tweak

Each of these sniffs would start walking the rest of the file from the token next to the OO keyword to the end of the file in search of the next (class/interface/trait) keyword.

As nested OO structure declarations (with the exception of anonymous classes, but those are outside the realm of these sniffs) are not supported in PHP, we can make these sniffs a lot faster by starting the search _after_ the scope closer for the current OO structure.
---
 .../Generic/Sniffs/Files/OneClassPerFileSniff.php         | 8 +++++++-
 .../Generic/Sniffs/Files/OneInterfacePerFileSniff.php     | 8 +++++++-
 .../Sniffs/Files/OneObjectStructurePerFileSniff.php       | 8 +++++++-
 .../Generic/Sniffs/Files/OneTraitPerFileSniff.php         | 8 +++++++-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php b/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php
index 9bcc00c1c2..52d5d84c74 100644
--- 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
index f7cfa8d30b..9a6f5bccd5 100644
--- 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
index d9d71b6996..b2565c2bdc 100644
--- a/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php
@@ -43,7 +43,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
index dd97da85b4..7ae523f70e 100644
--- 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');