Merge branch '11.0'

Author: sebastianbergmann

.phive/phars.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="php-cs-fixer" version="^3.70" installed="3.84.0" location="./tools/php-cs-fixer" copy="true"/>
-  <phar name="composer" version="^2.8" installed="2.8.10" location="./tools/composer" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.86" installed="3.86.0" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="composer" version="^2.8" installed="2.8.11" location="./tools/composer" copy="true"/>
 </phive>

phpstan.neon

@@ -1,10 +1,13 @@
 parameters:
     level: 5
+
     paths:
         - src
         - tests/tests
         - tests/bootstrap.php
 
+    resultCachePath: %tmpDir%/php-code-coverage-12.3.php
+
     checkTooWideReturnTypesInProtectedAndPublicMethods: true
     reportAlwaysTrueInLastCondition: true
     reportPossiblyNonexistentConstantArrayOffset: true

src/CodeCoverage.php

@@ -418,15 +418,15 @@ private function applyCoversAndUsesFilter(RawCodeCoverageData $rawData, array|fa
 
     private function applyFilter(RawCodeCoverageData $data): void
     {
-        if ($this->filter->isEmpty()) {
-            return;
-        }
-
-        foreach (array_keys($data->lineCoverage()) as $filename) {
-            if ($this->filter->isExcluded($filename)) {
-                $data->removeCoverageDataForFile($filename);
+        if (!$this->filter->isEmpty()) {
+            foreach (array_keys($data->lineCoverage()) as $filename) {
+                if ($this->filter->isExcluded($filename)) {
+                    $data->removeCoverageDataForFile($filename);
+                }
             }
         }
+
+        $data->skipEmptyLines();
     }
 
     private function applyExecutableLinesFilter(RawCodeCoverageData $data): void

src/Data/RawCodeCoverageData.php

@@ -104,8 +104,6 @@ private function __construct(array $lineCoverage, array $functionCoverage)
     {
         $this->lineCoverage     = $lineCoverage;
         $this->functionCoverage = $functionCoverage;
-
-        $this->skipEmptyLines();
     }
 
     public function clear(): void
@@ -252,7 +250,7 @@ public function removeCoverageDataForLines(string $filename, array $lines): void
      *
      * @see https://github.com/sebastianbergmann/php-code-coverage/issues/799
      */
-    private function skipEmptyLines(): void
+    public function skipEmptyLines(): void
     {
         foreach ($this->lineCoverage as $filename => $coverage) {
             foreach ($this->getEmptyLinesForFile($filename) as $emptyLine) {

tests/tests/Data/RawCodeCoverageDataTest.php

@@ -327,6 +327,8 @@ public function testCoverageForFileWithInlineAnnotations(): void
             ],
         );
 
+        $coverage->skipEmptyLines();
+
         $this->assertEquals(
             [
                 13 => -1,

tools/.phpstan/composer.json

@@ -1,10 +1,10 @@
 {
     "require-dev": {
-        "phpstan/phpstan": "^2.1.21",
+        "phpstan/phpstan": "^2.1.22",
         "phpstan/extension-installer": "^1.4.3",
         "phpstan/phpstan-strict-rules": "^2.0.6",
         "tomasvotruba/type-coverage": "^2.0.2",
-        "ergebnis/phpstan-rules": "^2.10.5"
+        "ergebnis/phpstan-rules": "^2.11.0"
     },
     "config": {
         "allow-plugins": {

tools/.phpstan/composer.lock

@@ -9,5 +9,6 @@
     'TomasVotruba\\TypeCoverage\\' => array($vendorDir . '/tomasvotruba/type-coverage/src'),
     'PHPStan\\ExtensionInstaller\\' => array($vendorDir . '/phpstan/extension-installer/src'),
     'PHPStan\\' => array($vendorDir . '/phpstan/phpstan-strict-rules/src'),
+    'Nette\\' => array($vendorDir . '/nette/utils/src'),
     'Ergebnis\\PHPStan\\Rules\\' => array($vendorDir . '/ergebnis/phpstan-rules/src'),
 );

tools/.phpstan/vendor/composer/autoload_psr4.php

@@ -20,6 +20,10 @@ class ComposerStaticInitf9e7218f71d5874b5632927df4f72bd7
             'PHPStan\\ExtensionInstaller\\' => 27,
             'PHPStan\\' => 8,
         ),
+        'N' => 
+        array (
+            'Nette\\' => 6,
+        ),
         'E' => 
         array (
             'Ergebnis\\PHPStan\\Rules\\' => 23,
@@ -39,6 +43,10 @@ class ComposerStaticInitf9e7218f71d5874b5632927df4f72bd7
         array (
             0 => __DIR__ . '/..' . '/phpstan/phpstan-strict-rules/src',
         ),
+        'Nette\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/nette/utils/src',
+        ),
         'Ergebnis\\PHPStan\\Rules\\' => 
         array (
             0 => __DIR__ . '/..' . '/ergebnis/phpstan-rules/src',