Merge branch '9.2'

Author: sebastianbergmann

ChangeLog.md

@@ -19,6 +19,12 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 * This component is no longer supported on PHP 7.3 and PHP 7.4
 * This component no longer supports Xdebug 2
 
+## [9.2.15] - 2022-MM-DD
+
+### Fixed
+
+* [#885](https://github.com/sebastianbergmann/php-code-coverage/issues/885): Files that have only `\r` (CR, 0x0d) EOL characters are not handled correctly
+
 ## [9.2.14] - 2022-02-28
 
 ### Fixed
@@ -409,6 +415,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 * This component is no longer supported on PHP 7.1
 
 [10.0.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2...master
+[9.2.15]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.14...9.2
 [9.2.14]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.13...9.2.14
 [9.2.13]: https://github.com/sebastianbergmann/php-code-coverage/compare/c011a0b6aaa4acd2f39b7f51fb4ad4442b6ec631...9.2.13
 [9.2.12]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.11...c011a0b6aaa4acd2f39b7f51fb4ad4442b6ec631

src/StaticAnalysis/ParsingFileAnalyser.php

@@ -13,6 +13,7 @@
 use function assert;
 use function file_get_contents;
 use function is_array;
+use function max;
 use function sprintf;
 use function substr_count;
 use function token_get_all;
@@ -111,7 +112,7 @@ private function analyse(string $filename): void
         }
 
         $source      = file_get_contents($filename);
-        $linesOfCode = substr_count($source, "\n");
+        $linesOfCode = max(substr_count($source, "\n") + 1, substr_count($source, "\r") + 1);
 
         if ($linesOfCode === 0 && !empty($source)) {
             $linesOfCode = 1;

tests/_files/BankAccount-clover-line.xml

@@ -18,8 +18,8 @@
       <line num="27" type="method" name="withdrawMoney" visibility="public" complexity="1" crap="1" count="2"/>
       <line num="29" type="stmt" count="2"/>
       <line num="31" type="stmt" count="1"/>
-      <metrics loc="34" ncloc="34" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="5" elements="13" coveredelements="8"/>
+      <metrics loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="5" elements="13" coveredelements="8"/>
     </file>
-    <metrics files="1" loc="34" ncloc="34" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="5" elements="13" coveredelements="8"/>
+    <metrics files="1" loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="5" elements="13" coveredelements="8"/>
   </project>
 </coverage>

tests/_files/BankAccount-clover-path.xml

@@ -18,8 +18,8 @@
       <line num="27" type="method" name="withdrawMoney" visibility="public" complexity="1" crap="1" count="2"/>
       <line num="29" type="stmt" count="2"/>
       <line num="31" type="stmt" count="1"/>
-      <metrics loc="34" ncloc="34" classes="1" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="9" coveredstatements="5" elements="20" coveredelements="11"/>
+      <metrics loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="9" coveredstatements="5" elements="20" coveredelements="11"/>
     </file>
-    <metrics files="1" loc="34" ncloc="34" classes="1" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="9" coveredstatements="5" elements="20" coveredelements="11"/>
+    <metrics files="1" loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="9" coveredstatements="5" elements="20" coveredelements="11"/>
   </project>
 </coverage>

tests/_files/Report/XML/CoverageForBankAccount/BankAccount.php.xml

@@ -2,7 +2,7 @@
 <phpunit xmlns="https://schema.phpunit.de/coverage/1.0">
   <file name="BankAccount.php" path="%e">
     <totals>
-      <lines total="34" comments="0" code="34" executable="9" executed="5" percent="55.56"/>
+      <lines total="35" comments="0" code="35" executable="9" executed="5" percent="55.56"/>
       <methods count="4" tested="3" percent="75.00"/>
       <functions count="0" tested="0" percent="0"/>
       <classes count="1" tested="0" percent="0.00"/>

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

@@ -13,15 +13,15 @@
     </tests>
     <directory name="%s">
       <totals>
-        <lines total="34" comments="0" code="34" executable="9" executed="5" percent="55.56"/>
+        <lines total="35" comments="0" code="35" executable="9" executed="5" percent="55.56"/>
         <methods count="4" tested="3" percent="75.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="BankAccount.php" href="BankAccount.php.xml">
         <totals>
-          <lines total="34" comments="0" code="34" executable="9" executed="5" percent="55.56"/>
+          <lines total="35" comments="0" code="35" executable="9" executed="5" percent="55.56"/>
           <methods count="4" tested="3" percent="75.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="9" code="28" executable="1" executed="1" percent="100.00"/>
+        <lines total="38" comments="9" code="29" executable="1" executed="1" percent="100.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="9" code="28" executable="1" executed="1" percent="100.00"/>
+          <lines total="38" comments="9" code="29" executable="1" executed="1" percent="100.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="9" code="28" executable="1" executed="1" percent="100.00"/>
+      <lines total="38" comments="9" code="29" executable="1" executed="1" percent="100.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/PHP80AndBelow/CoverageForClassWithAnonymousFunction/index.xml

@@ -10,15 +10,15 @@
     </tests>
     <directory name="%s">
       <totals>
-        <lines total="19" comments="1" code="18" executable="5" executed="5" percent="100.00"/>
+        <lines total="20" comments="1" code="19" executable="5" executed="5" percent="100.00"/>
         <methods count="1" tested="1" percent="100.00"/>
         <functions count="0" tested="0" percent="0"/>
         <classes count="1" tested="1" percent="100.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="1" code="18" executable="5" executed="5" percent="100.00"/>
+          <lines total="20" comments="1" code="19" executable="5" executed="5" percent="100.00"/>
           <methods count="1" tested="1" percent="100.00"/>
           <functions count="0" tested="0" percent="0"/>
           <classes count="1" tested="1" percent="100.00"/>

tests/_files/Report/XML/PHP80AndBelow/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="1" code="18" executable="5" executed="5" percent="100.00"/>
+      <lines total="20" comments="1" code="19" executable="5" executed="5" percent="100.00"/>
       <methods count="1" tested="1" percent="100.00"/>
       <functions count="0" tested="0" percent="0"/>
       <classes count="1" tested="1" percent="100.00"/>