Merge pull request microsoft#157 from andwur/php72-count

roblourens · web-flow · commit c812b148e10d · 2017-06-18T20:11:27.000-07:00
Fix use of count() on a string value
diff --git a/src/PhpTokenizer.php b/src/PhpTokenizer.php
@@ -75,7 +75,7 @@ public static function getTokensArrayFromContent(
             $pos += $strlen;
 
             if ($parseContext !== null && !$passedPrefix) {
-                $passedPrefix = \count($prefix) < $pos;
+                $passedPrefix = \strlen($prefix) < $pos;
                 if ($passedPrefix) {
                     $fullStart = $start = $pos = $initialPos;
                 }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public static function getTokensArrayFromContent(`
`75`	`75`	`$pos += $strlen;`
`76`	`76`
`77`	`77`	`if ($parseContext !== null && !$passedPrefix) {`
`78`		`- $passedPrefix = \count($prefix) < $pos;`
	`78`	`+ $passedPrefix = \strlen($prefix) < $pos;`
`79`	`79`	`if ($passedPrefix) {`
`80`	`80`	`$fullStart = $start = $pos = $initialPos;`
`81`	`81`	`}`