WIP introduce tstring() in place of impl. and expl. string casts

Author: staabm

src/CodeCoverage/Util/Tokenizer.php

@@ -76,7 +76,7 @@ private function tname(array $tokens, $idx) {
 
         if ($tconst === T_REQUIRE || $tconst === T_REQUIRE_ONCE || $tconst === T_INCLUDE || $tconst === T_INCLUDE_ONCE) {
             if ($this->tconst(tokens[$idx+2]) === T_CONSTANT_ENCAPSED_STRING) {
-                return trim($tokens[$idx+2], "'\"");
+                return trim($this->tstring($tokens[$idx+2]), "'\"");
             }
             return null;
         }
@@ -88,10 +88,10 @@ private function tname(array $tokens, $idx) {
                 $tclass = $this->tclass($token);
 
                 if ($tconst === T_STRING) {
-                    $name = (string)$token;
+                    $name = $this->tstring($token);
                     break;
                 } elseif ($tconst === T_STRING && $tclass === 'PHP_Token_AMPERSAND' && $this->tconst($tokens[$i+1]) === T_STRING) {
-                    $name = (string)$tokens[$i+1];
+                    $name = $this->tstring($tokens[$i+1]);
                     break;
                 } elseif ($tclass === 'PHP_Token_OPEN_BRACKET') {
                     $name = 'anonymous function';
@@ -117,15 +117,15 @@ private function tname(array $tokens, $idx) {
         }
 
         if ($tconst === T_CLASS || $tconst === T_TRAIT) {
-            return (string) $tokens[$idx + 2];
+            return $this->tstring($tokens[$idx + 2]);
         }
 
         if ($tconst === T_NAMESPACE) {
-            $namespace = (string)$tokens[$idx+2];
+            $namespace = $this->tstring($tokens[$idx+2]);
 
             for ($i = $idx + 3;; $i += 2) {
                 if (isset($tokens[$i]) && $this->tconst($tokens[$i]) === T_NS_SEPARATOR) {
-                    $namespace .= '\\' . $tokens[$i+1];
+                    $namespace .= '\\' . $this->tstring($tokens[$i+1]);
                 } else {
                     break;
                 }
@@ -135,6 +135,13 @@ private function tname(array $tokens, $idx) {
         }
     }
 
+    private function tstring($token) {
+        if (is_array($token)) {
+            return $token[1];
+        }
+        return $token;
+    }
+
     /**
      * @return string
      */
@@ -166,10 +173,10 @@ private function getParent(array $tokens, $i) {
         $parent = false;
         if ($this->tconst($tokens[$i+4]) === T_EXTENDS) {
             $ci         = $i + 6;
-            $className = (string)$tokens[$ci];
+            $className = $this->tstring($tokens[$ci]);
 
             while (isset($tokens[$ci+1]) && !($this->tconst($tokens[$ci+1]) === T_WHITESPACE)) {
-                $className .= (string)$tokens[++$ci];
+                $className .= $this->tstring($tokens[++$ci]);
             }
 
             $parent = $className;
@@ -191,7 +198,7 @@ private function getInterfaces(array $tokens, $i) {
                 $ii++;
 
                 if ($this->tconst($tokens[$ii]) === T_STRING) {
-                    $interfaces[] = (string)$tokens[$ii];
+                    $interfaces[] = $this->tstring($tokens[$ii]);
                 }
             }
         }
@@ -261,7 +268,7 @@ private function getDocblock(array $tokens, $idx) {
                 break;
             }
 
-            return (string)$token;
+            return $this->tstring($token);
         }
     }
 
@@ -389,7 +396,7 @@ private function getSignature(array $tokens, $idx)
         while (isset($tokens[$i]) && $tclass = $this->tclass($tokens[$i]) &&
                $tclass !== 'PHP_Token_OPEN_CURLY' &&
                $tclass !== 'PHP_Token_SEMICOLON') {
-            $signature .= $tokens[$i++];
+            $signature .= $this->tstring($tokens[$i++]);
         }
 
         $signature = trim($signature);