Apply strcspn / strspn optimization to the rest of PhpFileCleaner

staabm · staabm · commit 5b528a26fe7e · 2026-05-05T14:08:04.000+02:00
diff --git a/src/Reflection/BetterReflection/SourceLocator/PhpFileCleaner.php b/src/Reflection/BetterReflection/SourceLocator/PhpFileCleaner.php
@@ -9,6 +9,7 @@
 use function preg_quote;
 use function strcspn;
 use function strlen;
+use function strspn;
 use function substr;
 
 /**
@@ -205,8 +206,13 @@ private function consumeString(string $delimiter): string
 
 	private function skipString(string $delimiter): void
 	{
+		$rejectChars = '\\' . $delimiter;
 		$this->index += 1;
 		while ($this->index < $this->len) {
+			$this->index += strcspn($this->contents, $rejectChars, $this->index);
+			if ($this->index >= $this->len) {
+				break;
+			}
 			if ($this->contents[$this->index] === '\\' && ($this->peek('\\') || $this->peek($delimiter))) {
 				$this->index += 2;
 				continue;
@@ -223,7 +229,9 @@ private function skipComment(): void
 	{
 		$this->index += 2;
 		while ($this->index < $this->len) {
-			if ($this->contents[$this->index] === '*' && $this->peek('/')) {
+			$this->index += strcspn($this->contents, '*', $this->index);
+
+			if ($this->peek('/')) {
 				$this->index += 2;
 				break;
 			}
@@ -234,12 +242,7 @@ private function skipComment(): void
 
 	private function skipToNewline(): void
 	{
-		while ($this->index < $this->len) {
-			if (in_array($this->contents[$this->index], ["\r", "\n"], true)) {
-				return;
-			}
-			$this->index += 1;
-		}
+		$this->index += strcspn($this->contents, "\r\n", $this->index);
 	}
 
 	private function skipHeredoc(string $delimiter): void
@@ -267,16 +270,10 @@ private function skipHeredoc(string $delimiter): void
 			}
 
 			// skip the rest of the line
-			while ($this->index < $this->len) {
-				$this->skipToNewline();
-
-				// skip newlines
-				while ($this->index < $this->len && ($this->contents[$this->index] === "\r" || $this->contents[$this->index] === "\n")) {
-					$this->index += 1;
-				}
+			$this->skipToNewline();
 
-				break;
-			}
+			// skip newlines
+			$this->index += strspn($this->contents, "\r\n", $this->index);
 		}
 	}
 
