From 4326b82ca1145e1f2c12acd41c1aaafd770613cb Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Mon, 24 Feb 2025 13:11:57 +0100 Subject: [PATCH 1/2] [CLEANUP] Avoid Hungarian notation in `ParserState` Part of #756 --- src/Parsing/ParserState.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Parsing/ParserState.php b/src/Parsing/ParserState.php index 000d4f98c..cb716e945 100644 --- a/src/Parsing/ParserState.php +++ b/src/Parsing/ParserState.php @@ -404,11 +404,11 @@ public function streql($string1, $string2, $caseInsensitive = true): bool } /** - * @param int $iAmount + * @param int $amount */ - public function backtrack($iAmount): void + public function backtrack($amount): void { - $this->currentPosition -= $iAmount; + $this->currentPosition -= $amount; } /** @@ -490,18 +490,18 @@ private function strsplit($string) } /** - * @param string $string - * @param string $sNeedle + * @param string $haystack + * @param string $needle * @param int $offset * * @return int|false */ - private function strpos($string, $sNeedle, $offset) + private function strpos($haystack, $needle, $offset) { if ($this->parserSettings->bMultibyteSupport) { - return \mb_strpos($string, $sNeedle, $offset, $this->charset); + return \mb_strpos($haystack, $needle, $offset, $this->charset); } else { - return \strpos($string, $sNeedle, $offset); + return \strpos($haystack, $needle, $offset); } } } From 734366bfa7dfb3eacde6c77ccceb6a019afbdcfd Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Mon, 24 Feb 2025 14:43:06 +0100 Subject: [PATCH 2/2] Changes suggested in code review --- src/Parsing/ParserState.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Parsing/ParserState.php b/src/Parsing/ParserState.php index cb716e945..67bf7ccd6 100644 --- a/src/Parsing/ParserState.php +++ b/src/Parsing/ParserState.php @@ -404,11 +404,11 @@ public function streql($string1, $string2, $caseInsensitive = true): bool } /** - * @param int $amount + * @param int $numberOfCharacters */ - public function backtrack($amount): void + public function backtrack($numberOfCharacters): void { - $this->currentPosition -= $amount; + $this->currentPosition -= $numberOfCharacters; } /**