php-token-stream counts CLOC differently than before

Author: sebastianbergmann

tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/index.xml

@@ -10,15 +10,15 @@
     </tests>
     <directory name="%s">
       <totals>
-        <lines total="19" comments="2" code="17" executable="9" executed="8" percent="88.89"/>
+        <lines total="19" comments="1" code="18" executable="9" executed="8" percent="88.89"/>
         <methods count="1" tested="0" percent="0.00"/>
         <functions count="0" tested="0" percent="0"/>
         <classes count="1" tested="0" percent="0.00"/>
         <traits count="0" tested="0" percent="0"/>
       </totals>
       <file name="source_with_class_and_anonymous_function.php" href="source_with_class_and_anonymous_function.php.xml">
         <totals>
-          <lines total="19" comments="2" code="17" executable="9" executed="8" percent="88.89"/>
+          <lines total="19" comments="1" code="18" executable="9" executed="8" percent="88.89"/>
           <methods count="1" tested="0" percent="0.00"/>
           <functions count="0" tested="0" percent="0"/>
           <classes count="1" tested="0" percent="0.00"/>

tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.xml

@@ -2,7 +2,7 @@
 <phpunit xmlns="https://schema.phpunit.de/coverage/1.0">
   <file name="source_with_class_and_anonymous_function.php" path="%e">
     <totals>
-      <lines total="19" comments="2" code="17" executable="9" executed="8" percent="88.89"/>
+      <lines total="19" comments="1" code="18" executable="9" executed="8" percent="88.89"/>
       <methods count="1" tested="0" percent="0.00"/>
       <functions count="0" tested="0" percent="0"/>
       <classes count="1" tested="0" percent="0.00"/>

tests/_files/Report/XML/CoverageForFileWithIgnoredLines/index.xml

@@ -10,15 +10,15 @@
     </tests>
     <directory name="%s">
       <totals>
-        <lines total="37" comments="12" code="25" executable="2" executed="1" percent="50.00"/>
+        <lines total="37" comments="6" code="31" executable="2" executed="1" percent="50.00"/>
         <methods count="0" tested="0" percent="0"/>
         <functions count="1" tested="1" percent="100.00"/>
         <classes count="0" tested="0" percent="0"/>
         <traits count="0" tested="0" percent="0"/>
       </totals>
       <file name="source_with_ignore.php" href="source_with_ignore.php.xml">
         <totals>
-          <lines total="37" comments="12" code="25" executable="2" executed="1" percent="50.00"/>
+          <lines total="37" comments="6" code="31" executable="2" executed="1" percent="50.00"/>
           <methods count="0" tested="0" percent="0"/>
           <functions count="1" tested="1" percent="100.00"/>
           <classes count="0" tested="0" percent="0"/>

tests/_files/Report/XML/CoverageForFileWithIgnoredLines/source_with_ignore.php.xml

@@ -2,7 +2,7 @@
 <phpunit xmlns="https://schema.phpunit.de/coverage/1.0">
   <file name="source_with_ignore.php" path="%e">
     <totals>
-      <lines total="37" comments="12" code="25" executable="2" executed="1" percent="50.00"/>
+      <lines total="37" comments="6" code="31" executable="2" executed="1" percent="50.00"/>
       <methods count="0" tested="0" percent="0"/>
       <functions count="1" tested="1" percent="100.00"/>
       <classes count="0" tested="0" percent="0"/>

tests/_files/class-with-anonymous-function-clover.xml

@@ -15,8 +15,8 @@
       <line num="14" type="stmt" count="1"/>
       <line num="17" type="stmt" count="1"/>
       <line num="18" type="stmt" count="1"/>
-      <metrics loc="19" ncloc="17" classes="1" methods="1" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="8" elements="10" coveredelements="8"/>
+      <metrics loc="19" ncloc="18" classes="1" methods="1" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="8" elements="10" coveredelements="8"/>
     </file>
-    <metrics files="1" loc="19" ncloc="17" classes="1" methods="1" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="8" elements="10" coveredelements="8"/>
+    <metrics files="1" loc="19" ncloc="18" classes="1" methods="1" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="8" elements="10" coveredelements="8"/>
   </project>
 </coverage>

tests/_files/ignored-lines-clover.xml

@@ -10,8 +10,8 @@
       </class>
       <line num="2" type="stmt" count="1"/>
       <line num="6" type="stmt" count="0"/>
-      <metrics loc="37" ncloc="25" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
+      <metrics loc="37" ncloc="31" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
     </file>
-    <metrics files="1" loc="37" ncloc="25" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
+    <metrics files="1" loc="37" ncloc="31" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
   </project>
 </coverage>