Skip to content

Commit 5e08ad8

Browse files
Merge branch '9.2'
2 parents cd4b129 + 0f89e2c commit 5e08ad8

38 files changed

+58
-57
lines changed

.psalm/baseline.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,17 @@
3636
<code>waiting()</code>
3737
</UndefinedFunction>
3838
</file>
39+
<file src="src/Data/ProcessedCodeCoverageData.php">
40+
<PossiblyNullArgument occurrences="1">
41+
<code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]['hit']</code>
42+
</PossiblyNullArgument>
43+
<PossiblyNullArrayAccess occurrences="1">
44+
<code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
45+
</PossiblyNullArrayAccess>
46+
<PossiblyNullArrayAssignment occurrences="1">
47+
<code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
48+
</PossiblyNullArrayAssignment>
49+
</file>
3950
<file src="src/Driver/XdebugDriver.php">
4051
<UndefinedConstant occurrences="5">
4152
<code>XDEBUG_CC_BRANCH_CHECK</code>
@@ -79,17 +90,6 @@
7990
<code>$position</code>
8091
</PropertyNotSetInConstructor>
8192
</file>
82-
<file src="src/ProcessedCodeCoverageData.php">
83-
<PossiblyNullArgument occurrences="1">
84-
<code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]['hit']</code>
85-
</PossiblyNullArgument>
86-
<PossiblyNullArrayAccess occurrences="1">
87-
<code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
88-
</PossiblyNullArrayAccess>
89-
<PossiblyNullArrayAssignment occurrences="1">
90-
<code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
91-
</PossiblyNullArrayAssignment>
92-
</file>
9393
<file src="src/Report/Html/Renderer.php">
9494
<InvalidScalarArgument occurrences="1"/>
9595
</file>

src/CodeCoverage.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
use PHPUnit\Framework\TestCase;
2626
use PHPUnit\Runner\PhptTestCase;
2727
use ReflectionClass;
28+
use SebastianBergmann\CodeCoverage\Data\ProcessedCodeCoverageData;
29+
use SebastianBergmann\CodeCoverage\Data\RawCodeCoverageData;
2830
use SebastianBergmann\CodeCoverage\Driver\Driver;
2931
use SebastianBergmann\CodeCoverage\Node\Builder;
3032
use SebastianBergmann\CodeCoverage\Node\Directory;

src/ProcessedCodeCoverageData.php renamed to src/Data/ProcessedCodeCoverageData.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.
99
*/
10-
namespace SebastianBergmann\CodeCoverage;
10+
namespace SebastianBergmann\CodeCoverage\Data;
1111

1212
use function array_key_exists;
1313
use function array_keys;

src/RawCodeCoverageData.php renamed to src/Data/RawCodeCoverageData.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.
99
*/
10-
namespace SebastianBergmann\CodeCoverage;
10+
namespace SebastianBergmann\CodeCoverage\Data;
1111

1212
use function array_diff;
1313
use function array_diff_key;

src/Driver/Driver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
use function sprintf;
1313
use SebastianBergmann\CodeCoverage\BranchAndPathCoverageNotSupportedException;
14+
use SebastianBergmann\CodeCoverage\Data\RawCodeCoverageData;
1415
use SebastianBergmann\CodeCoverage\DeadCodeDetectionNotSupportedException;
15-
use SebastianBergmann\CodeCoverage\RawCodeCoverageData;
1616

1717
/**
1818
* @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage

src/Driver/PcovDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
use function pcov\stop;
1919
use function pcov\waiting;
2020
use function phpversion;
21+
use SebastianBergmann\CodeCoverage\Data\RawCodeCoverageData;
2122
use SebastianBergmann\CodeCoverage\Filter;
22-
use SebastianBergmann\CodeCoverage\RawCodeCoverageData;
2323

2424
/**
2525
* @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage

src/Driver/PhpdbgDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use function phpdbg_end_oplog;
1919
use function phpdbg_get_executable;
2020
use function phpdbg_start_oplog;
21-
use SebastianBergmann\CodeCoverage\RawCodeCoverageData;
21+
use SebastianBergmann\CodeCoverage\Data\RawCodeCoverageData;
2222

2323
/**
2424
* @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage

src/Driver/XdebugDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
use function xdebug_set_filter;
2727
use function xdebug_start_code_coverage;
2828
use function xdebug_stop_code_coverage;
29+
use SebastianBergmann\CodeCoverage\Data\RawCodeCoverageData;
2930
use SebastianBergmann\CodeCoverage\Filter;
30-
use SebastianBergmann\CodeCoverage\RawCodeCoverageData;
3131

3232
/**
3333
* @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage

src/Exception/DirectoryCouldNotBeCreatedException.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.
99
*/
10-
namespace SebastianBergmann\CodeCoverage;
10+
namespace SebastianBergmann\CodeCoverage\Util;
1111

1212
use RuntimeException;
13+
use SebastianBergmann\CodeCoverage\Exception;
1314

1415
final class DirectoryCouldNotBeCreatedException extends RuntimeException implements Exception
1516
{

src/Node/AbstractNode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use function str_replace;
1515
use function substr;
1616
use Countable;
17-
use SebastianBergmann\CodeCoverage\Percentage;
17+
use SebastianBergmann\CodeCoverage\Util\Percentage;
1818

1919
/**
2020
* @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage

0 commit comments

Comments
 (0)