Skip to content

Commit ffd7f5e

Browse files
committed
WIP simplified $token->getLine() for the current token
1 parent 3f53e89 commit ffd7f5e

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/CodeCoverage/Util/Tokenizer.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ private function getInterfaces(array $tokens, $i) {
129129
}
130130

131131
public function tokenize() {
132+
$line = 1;
132133
$sourceCode = file_get_contents($this->filename);
133134
$tokens = token_get_all($sourceCode);
134135
$numTokens = count($tokens);
@@ -159,7 +160,7 @@ public function tokenize() {
159160
'interfaces'=> $this->getInterfaces($tokens, $i),
160161
'keywords' => $this->getKeywords($tokens, $i),
161162
'docblock' => $token->getDocblock(),
162-
'startLine' => $token->getLine(),
163+
'startLine' => $line,
163164
'endLine' => $token->getEndLine(),
164165
'package' => $token->getPackage(),
165166
'file' => $this->filename
@@ -183,7 +184,7 @@ public function tokenize() {
183184
'keywords' => $this->getKeywords($tokens, $i),
184185
'visibility'=> $token->getVisibility(),
185186
'signature' => $token->getSignature(),
186-
'startLine' => $token->getLine(),
187+
'startLine' => $line,
187188
'endLine' => $token->getEndLine(),
188189
'ccn' => $token->getCCN(),
189190
'file' => $this->filename
@@ -204,15 +205,15 @@ public function tokenize() {
204205

205206
case 'PHP_Token_CLOSE_CURLY':
206207
if ($classEndLine !== false &&
207-
$classEndLine == $token->getLine()) {
208+
$classEndLine == $line) {
208209
$class = false;
209210
$classEndLine = false;
210211
} elseif ($traitEndLine !== false &&
211-
$traitEndLine == $token->getLine()) {
212+
$traitEndLine == $line) {
212213
$trait = false;
213214
$traitEndLine = false;
214215
} elseif ($interfaceEndLine !== false &&
215-
$interfaceEndLine == $token->getLine()) {
216+
$interfaceEndLine == $line) {
216217
$interface = false;
217218
$interfaceEndLine = false;
218219
}

0 commit comments

Comments
 (0)