Skip to content

Fix executable lines analysis #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fix executable lines analysis #949

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b6d7e8
Fix executable lines analysis
mvorisek Nov 11, 2022
c7a7d43
Fix else is not executable
mvorisek Nov 11, 2022
ff6b391
Test binary concat the same as binary plus
mvorisek Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
246 changes: 150 additions & 96 deletions src/StaticAnalysis/ExecutableLinesFindingVisitor.php
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions tests/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1353,7 +1353,6 @@ protected function getExpectedLineCoverageDataArrayForBankAccount(): array
],
13 => [],
14 => [],
15 => [],
16 => [],
22 => [
0 => 'BankAccountTest::testBalanceCannotBecomeNegative2',
Expand Down Expand Up @@ -1384,7 +1383,6 @@ protected function getExpectedLineCoverageDataArrayForBankAccountInReverseOrder(
],
13 => [],
14 => [],
15 => [],
16 => [],
22 => [
0 => 'BankAccountTest::testBalanceCannotBecomeNegative2',
Expand Down
7 changes: 3 additions & 4 deletions tests/_files/BankAccount-clover-line.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,22 @@
<project timestamp="%i" name="BankAccount">
<file name="%s%eBankAccount.php">
<class name="BankAccount" namespace="global">
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="5" elements="13" coveredelements="8"/>
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="5" elements="12" coveredelements="8"/>
</class>
<line num="6" type="method" name="getBalance" visibility="public" complexity="1" crap="1" count="2"/>
<line num="8" type="stmt" count="2"/>
<line num="11" type="method" name="setBalance" visibility="protected" complexity="2" crap="6" count="0"/>
<line num="13" type="stmt" count="0"/>
<line num="14" type="stmt" count="0"/>
<line num="15" type="stmt" count="0"/>
<line num="16" type="stmt" count="0"/>
<line num="20" type="method" name="depositMoney" visibility="public" complexity="1" crap="1" count="2"/>
<line num="22" type="stmt" count="2"/>
<line num="24" type="stmt" count="1"/>
<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="35" ncloc="35" 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="8" coveredstatements="5" elements="12" coveredelements="8"/>
</file>
<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"/>
<metrics files="1" loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="5" elements="12" coveredelements="8"/>
</project>
</coverage>
7 changes: 3 additions & 4 deletions tests/_files/BankAccount-clover-path.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,22 @@
<project timestamp="%i" name="BankAccount">
<file name="%s%eBankAccount.php">
<class name="BankAccount" namespace="global">
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="9" coveredstatements="5" elements="20" coveredelements="11"/>
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="8" coveredstatements="5" elements="19" coveredelements="11"/>
</class>
<line num="6" type="method" name="getBalance" visibility="public" complexity="1" crap="1" count="2"/>
<line num="8" type="stmt" count="2"/>
<line num="11" type="method" name="setBalance" visibility="protected" complexity="2" crap="6" count="0"/>
<line num="13" type="stmt" count="0"/>
<line num="14" type="stmt" count="0"/>
<line num="15" type="stmt" count="0"/>
<line num="16" type="stmt" count="0"/>
<line num="20" type="method" name="depositMoney" visibility="public" complexity="1" crap="1" count="2"/>
<line num="22" type="stmt" count="2"/>
<line num="24" type="stmt" count="1"/>
<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="35" ncloc="35" 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="8" coveredstatements="5" elements="19" coveredelements="11"/>
</file>
<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"/>
<metrics files="1" loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="8" coveredstatements="5" elements="19" coveredelements="11"/>
</project>
</coverage>
8 changes: 3 additions & 5 deletions tests/_files/BankAccount-cobertura-line.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
<coverage line-rate="0.55555555555556" branch-rate="0" lines-covered="5" lines-valid="9" branches-covered="0" branches-valid="0" complexity="5" version="0.4" timestamp="%i">
<coverage line-rate="0.625" branch-rate="0" lines-covered="5" lines-valid="8" branches-covered="0" branches-valid="0" complexity="5" version="0.4" timestamp="%i">
<sources>
<source>%s</source>
</sources>
<packages>
<package name="BankAccount.php" line-rate="0.55555555555556" branch-rate="0" complexity="5">
<package name="BankAccount.php" line-rate="0.625" branch-rate="0" complexity="5">
<classes>
<class name="BankAccount" filename="BankAccount.php" line-rate="0.55555555555556" branch-rate="0" complexity="5">
<class name="BankAccount" filename="BankAccount.php" line-rate="0.625" branch-rate="0" complexity="5">
<methods>
<method name="getBalance" signature="" line-rate="1" branch-rate="0" complexity="1">
<lines>
Expand All @@ -18,7 +18,6 @@
<lines>
<line number="13" hits="0"/>
<line number="14" hits="0"/>
<line number="15" hits="0"/>
<line number="16" hits="0"/>
</lines>
</method>
Expand All @@ -39,7 +38,6 @@
<line number="8" hits="2"/>
<line number="13" hits="0"/>
<line number="14" hits="0"/>
<line number="15" hits="0"/>
<line number="16" hits="0"/>
<line number="22" hits="2"/>
<line number="24" hits="1"/>
Expand Down
8 changes: 3 additions & 5 deletions tests/_files/BankAccount-cobertura-path.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
<coverage line-rate="0.55555555555556" branch-rate="0.42857142857143" lines-covered="5" lines-valid="9" branches-covered="3" branches-valid="7" complexity="5" version="0.4" timestamp="%i">
<coverage line-rate="0.625" branch-rate="0.42857142857143" lines-covered="5" lines-valid="8" branches-covered="3" branches-valid="7" complexity="5" version="0.4" timestamp="%i">
<sources>
<source>%s</source>
</sources>
<packages>
<package name="BankAccount.php" line-rate="0.55555555555556" branch-rate="0.42857142857143" complexity="5">
<package name="BankAccount.php" line-rate="0.625" branch-rate="0.42857142857143" complexity="5">
<classes>
<class name="BankAccount" filename="BankAccount.php" line-rate="0.55555555555556" branch-rate="0.42857142857143" complexity="5">
<class name="BankAccount" filename="BankAccount.php" line-rate="0.625" branch-rate="0.42857142857143" complexity="5">
<methods>
<method name="getBalance" signature="" line-rate="1" branch-rate="1" complexity="1">
<lines>
Expand All @@ -18,7 +18,6 @@
<lines>
<line number="13" hits="0"/>
<line number="14" hits="0"/>
<line number="15" hits="0"/>
<line number="16" hits="0"/>
</lines>
</method>
Expand All @@ -39,7 +38,6 @@
<line number="8" hits="2"/>
<line number="13" hits="0"/>
<line number="14" hits="0"/>
<line number="15" hits="0"/>
<line number="16" hits="0"/>
<line number="22" hits="2"/>
<line number="24" hits="1"/>
Expand Down
4 changes: 2 additions & 2 deletions tests/_files/BankAccount-text-line.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Code Coverage Report:
Summary:
Classes: 0.00% (0/1)
Methods: 75.00% (3/4)
Lines: 55.56% (5/9)
Lines: 62.50% (5/8)

BankAccount
Methods: 75.00% ( 3/ 4) Lines: 55.56% ( 5/ 9)
Methods: 75.00% ( 3/ 4) Lines: 62.50% ( 5/ 8)
4 changes: 2 additions & 2 deletions tests/_files/BankAccount-text-path.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Code Coverage Report:
Methods: 75.00% (3/4)
Paths: 60.00% (3/5)
Branches: 42.86% (3/7)
Lines: 55.56% (5/9)
Lines: 62.50% (5/8)

BankAccount
Methods: 75.00% ( 3/ 4) Paths: 60.00% ( 3/ 5) Branches: 42.86% ( 3/ 7) Lines: 55.56% ( 5/ 9)
Methods: 75.00% ( 3/ 4) Paths: 60.00% ( 3/ 5) Branches: 42.86% ( 3/ 7) Lines: 62.50% ( 5/ 8)
2 changes: 1 addition & 1 deletion tests/_files/BankAccount-text-summary.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
Code Coverage Report Summary:
Classes: 0.00% (0/1)
Methods: 75.00% (3/4)
Lines: 55.56% (5/9)
Lines: 62.50% (5/8)

4 changes: 2 additions & 2 deletions tests/_files/BankAccountWithUncovered-text-line.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Code Coverage Report:
Summary:
Classes: 0.00% (0/2)
Methods: 37.50% (3/8)
Lines: 27.78% (5/18)
Lines: 31.25% (5/16)

BankAccount
Methods: 75.00% ( 3/ 4) Lines: 55.56% ( 5/ 9)
Methods: 75.00% ( 3/ 4) Lines: 62.50% ( 5/ 8)
4 changes: 2 additions & 2 deletions tests/_files/BankAccountWithoutUncovered-text-line.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Code Coverage Report:
Summary:
Classes: 0.00% (0/1)
Methods: 75.00% (3/4)
Lines: 55.56% (5/9)
Lines: 62.50% (5/8)

BankAccount
Methods: 75.00% ( 3/ 4) Lines: 55.56% ( 5/ 9)
Methods: 75.00% ( 3/ 4) Lines: 62.50% ( 5/ 8)
4 changes: 2 additions & 2 deletions tests/_files/NamespacedBankAccount-text.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Code Coverage Report:
Summary:
Classes: 0.00% (0/1)
Methods: 75.00% (3/4)
Lines: 55.56% (5/9)
Lines: 62.50% (5/8)

SomeNamespace\BankAccount
Methods: ( 0/ 0) Lines: ( 0/ 0)
SomeNamespace\BankAccountTrait
Methods: 75.00% ( 3/ 4) Lines: 55.56% ( 5/ 9)
Methods: 75.00% ( 3/ 4) Lines: 62.50% ( 5/ 8)
22 changes: 11 additions & 11 deletions tests/_files/Report/HTML/CoverageForBankAccount/BankAccount.php.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
<tr>
<td class="warning">Total</td>
<td class="warning big"> <div class="progress">
<div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
<span class="sr-only">55.56% covered (warning)</span>
<div class="progress-bar bg-warning" role="progressbar" aria-valuenow="62.50" aria-valuemin="0" aria-valuemax="100" style="width: 62.50%">
<span class="sr-only">62.50% covered (warning)</span>
</div>
</div>
</td>
<td class="warning small"><div align="right">55.56%</div></td>
<td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
<td class="warning small"><div align="right">62.50%</div></td>
<td class="warning small"><div align="right">5&nbsp;/&nbsp;8</div></td>
<td class="warning big"> <div class="progress">
<div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
<span class="sr-only">75.00% covered (warning)</span>
Expand All @@ -73,13 +73,13 @@
<tr>
<td class="warning">BankAccount</td>
<td class="warning big"> <div class="progress">
<div class="progress-bar bg-warning" role="progressbar" aria-valuenow="55.56" aria-valuemin="0" aria-valuemax="100" style="width: 55.56%">
<span class="sr-only">55.56% covered (warning)</span>
<div class="progress-bar bg-warning" role="progressbar" aria-valuenow="62.50" aria-valuemin="0" aria-valuemax="100" style="width: 62.50%">
<span class="sr-only">62.50% covered (warning)</span>
</div>
</div>
</td>
<td class="warning small"><div align="right">55.56%</div></td>
<td class="warning small"><div align="right">5&nbsp;/&nbsp;9</div></td>
<td class="warning small"><div align="right">62.50%</div></td>
<td class="warning small"><div align="right">5&nbsp;/&nbsp;8</div></td>
<td class="warning big"> <div class="progress">
<div class="progress-bar bg-warning" role="progressbar" aria-valuenow="75.00" aria-valuemin="0" aria-valuemax="100" style="width: 75.00%">
<span class="sr-only">75.00% covered (warning)</span>
Expand All @@ -88,7 +88,7 @@
</td>
<td class="warning small"><div align="right">75.00%</div></td>
<td class="warning small"><div align="right">3&nbsp;/&nbsp;4</div></td>
<td class="warning small">7.19</td>
<td class="warning small">6.32</td>
<td class="danger big"> <div class="progress">
<div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
<span class="sr-only">0.00% covered (danger)</span>
Expand Down Expand Up @@ -130,7 +130,7 @@
</div>
</td>
<td class="danger small"><div align="right">0.00%</div></td>
<td class="danger small"><div align="right">0&nbsp;/&nbsp;4</div></td>
<td class="danger small"><div align="right">0&nbsp;/&nbsp;3</div></td>
<td class="danger big"> <div class="progress">
<div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
<span class="sr-only">0.00% covered (danger)</span>
Expand Down Expand Up @@ -207,7 +207,7 @@
<tr class=" d-flex"><td class="col-1 text-right"><a id="12" href="#12">12</a></td><td class="col-11 codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">{</span></td></tr>
<tr class="danger d-flex"><td class="col-1 text-right"><a id="13" href="#13">13</a></td><td class="col-11 codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">if</span><span class="default">&nbsp;</span><span class="keyword">(</span><span class="default">$balance</span><span class="default">&nbsp;</span><span class="default">&gt;=</span><span class="default">&nbsp;</span><span class="default">0</span><span class="keyword">)</span><span class="default">&nbsp;</span><span class="keyword">{</span></td></tr>
<tr class="danger d-flex"><td class="col-1 text-right"><a id="14" href="#14">14</a></td><td class="col-11 codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="default">$this</span><span class="default">-&gt;</span><span class="default">balance</span><span class="default">&nbsp;</span><span class="keyword">=</span><span class="default">&nbsp;</span><span class="default">$balance</span><span class="keyword">;</span></td></tr>
<tr class="danger d-flex"><td class="col-1 text-right"><a id="15" href="#15">15</a></td><td class="col-11 codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">}</span><span class="default">&nbsp;</span><span class="keyword">else</span><span class="default">&nbsp;</span><span class="keyword">{</span></td></tr>
<tr class=" d-flex"><td class="col-1 text-right"><a id="15" href="#15">15</a></td><td class="col-11 codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">}</span><span class="default">&nbsp;</span><span class="keyword">else</span><span class="default">&nbsp;</span><span class="keyword">{</span></td></tr>
<tr class="danger d-flex"><td class="col-1 text-right"><a id="16" href="#16">16</a></td><td class="col-11 codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">throw</span><span class="default">&nbsp;</span><span class="keyword">new</span><span class="default">&nbsp;</span><span class="default">RuntimeException</span><span class="keyword">;</span></td></tr>
<tr class=" d-flex"><td class="col-1 text-right"><a id="17" href="#17">17</a></td><td class="col-11 codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">}</span></td></tr>
<tr class=" d-flex"><td class="col-1 text-right"><a id="18" href="#18">18</a></td><td class="col-11 codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">}</span></td></tr>
Expand Down
8 changes: 4 additions & 4 deletions tests/_files/Report/HTML/CoverageForBankAccount/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ <h3>Insufficient Coverage</h3>
</tr>
</thead>
<tbody>
<tr><td><a href="BankAccount.php.html#2">BankAccount</a></td><td class="text-right">55%</td></tr>
<tr><td><a href="BankAccount.php.html#2">BankAccount</a></td><td class="text-right">62%</td></tr>

</tbody>
</table>
Expand All @@ -74,7 +74,7 @@ <h3>Project Risks</h3>
</tr>
</thead>
<tbody>
<tr><td><a href="BankAccount.php.html#2">BankAccount</a></td><td class="text-right">7</td></tr>
<tr><td><a href="BankAccount.php.html#2">BankAccount</a></td><td class="text-right">6</td></tr>

</tbody>
</table>
Expand Down Expand Up @@ -158,7 +158,7 @@ <h3>Project Risks</h3>
.yAxis.tickFormat(d3.format('d'));

d3.select('#classCoverageDistribution svg')
.datum(getCoverageDistributionData([0,0,0,0,0,0,1,0,0,0,0,0], "Class Coverage"))
.datum(getCoverageDistributionData([0,0,0,0,0,0,0,1,0,0,0,0], "Class Coverage"))
.transition().duration(500).call(chart);

nv.utils.windowResize(chart.update);
Expand Down Expand Up @@ -226,7 +226,7 @@ <h3>Project Risks</h3>
chart.yAxis.axisLabel('Cyclomatic Complexity');

d3.select('#classComplexity svg')
.datum(getComplexityData([[55.555555555556,5,"<a href=\"BankAccount.php.html#2\">BankAccount<\/a>"]], 'Class Complexity'))
.datum(getComplexityData([[62.5,5,"<a href=\"BankAccount.php.html#2\">BankAccount<\/a>"]], 'Class Complexity'))
.transition()
.duration(500)
.call(chart);
Expand Down
Loading