Skip to content

Commit f59f6ac

Browse files
mvoriseksebastianbergmann
mvorisek
authored and
sebastianbergmann
committed
Fix else is not executable
1 parent 2bda882 commit f59f6ac

24 files changed

+94
-105
lines changed

‎src/StaticAnalysis/ExecutableLinesFindingVisitor.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
use PhpParser\Node\Stmt\Continue_;
3434
use PhpParser\Node\Stmt\Do_;
3535
use PhpParser\Node\Stmt\Echo_;
36-
use PhpParser\Node\Stmt\Else_;
3736
use PhpParser\Node\Stmt\ElseIf_;
3837
use PhpParser\Node\Stmt\Expression;
3938
use PhpParser\Node\Stmt\For_;
@@ -316,7 +315,6 @@ private function isExecutable(Node $node): bool
316315
$node instanceof Do_ ||
317316
$node instanceof Echo_ ||
318317
$node instanceof ElseIf_ ||
319-
$node instanceof Else_ ||
320318
$node instanceof Encapsed ||
321319
$node instanceof Expression ||
322320
$node instanceof For_ ||

‎tests/TestCase.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,7 +1353,6 @@ protected function getExpectedLineCoverageDataArrayForBankAccount(): array
13531353
],
13541354
13 => [],
13551355
14 => [],
1356-
15 => [],
13571356
16 => [],
13581357
22 => [
13591358
0 => 'BankAccountTest::testBalanceCannotBecomeNegative2',
@@ -1384,7 +1383,6 @@ protected function getExpectedLineCoverageDataArrayForBankAccountInReverseOrder(
13841383
],
13851384
13 => [],
13861385
14 => [],
1387-
15 => [],
13881386
16 => [],
13891387
22 => [
13901388
0 => 'BankAccountTest::testBalanceCannotBecomeNegative2',

‎tests/_files/BankAccount-clover-line.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,22 @@
33
<project timestamp="%i" name="BankAccount">
44
<file name="%s%eBankAccount.php">
55
<class name="BankAccount" namespace="global">
6-
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="5" elements="13" coveredelements="8"/>
6+
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="5" elements="12" coveredelements="8"/>
77
</class>
88
<line num="6" type="method" name="getBalance" visibility="public" complexity="1" crap="1" count="2"/>
99
<line num="8" type="stmt" count="2"/>
1010
<line num="11" type="method" name="setBalance" visibility="protected" complexity="2" crap="6" count="0"/>
1111
<line num="13" type="stmt" count="0"/>
1212
<line num="14" type="stmt" count="0"/>
13-
<line num="15" type="stmt" count="0"/>
1413
<line num="16" type="stmt" count="0"/>
1514
<line num="20" type="method" name="depositMoney" visibility="public" complexity="1" crap="1" count="2"/>
1615
<line num="22" type="stmt" count="2"/>
1716
<line num="24" type="stmt" count="1"/>
1817
<line num="27" type="method" name="withdrawMoney" visibility="public" complexity="1" crap="1" count="2"/>
1918
<line num="29" type="stmt" count="2"/>
2019
<line num="31" type="stmt" count="1"/>
21-
<metrics loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="5" elements="13" coveredelements="8"/>
20+
<metrics loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="5" elements="12" coveredelements="8"/>
2221
</file>
23-
<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"/>
22+
<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"/>
2423
</project>
2524
</coverage>

‎tests/_files/BankAccount-clover-path.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,22 @@
33
<project timestamp="%i" name="BankAccount">
44
<file name="%s%eBankAccount.php">
55
<class name="BankAccount" namespace="global">
6-
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="9" coveredstatements="5" elements="20" coveredelements="11"/>
6+
<metrics complexity="5" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="8" coveredstatements="5" elements="19" coveredelements="11"/>
77
</class>
88
<line num="6" type="method" name="getBalance" visibility="public" complexity="1" crap="1" count="2"/>
99
<line num="8" type="stmt" count="2"/>
1010
<line num="11" type="method" name="setBalance" visibility="protected" complexity="2" crap="6" count="0"/>
1111
<line num="13" type="stmt" count="0"/>
1212
<line num="14" type="stmt" count="0"/>
13-
<line num="15" type="stmt" count="0"/>
1413
<line num="16" type="stmt" count="0"/>
1514
<line num="20" type="method" name="depositMoney" visibility="public" complexity="1" crap="1" count="2"/>
1615
<line num="22" type="stmt" count="2"/>
1716
<line num="24" type="stmt" count="1"/>
1817
<line num="27" type="method" name="withdrawMoney" visibility="public" complexity="1" crap="1" count="2"/>
1918
<line num="29" type="stmt" count="2"/>
2019
<line num="31" type="stmt" count="1"/>
21-
<metrics loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="9" coveredstatements="5" elements="20" coveredelements="11"/>
20+
<metrics loc="35" ncloc="35" classes="1" methods="4" coveredmethods="3" conditionals="7" coveredconditionals="3" statements="8" coveredstatements="5" elements="19" coveredelements="11"/>
2221
</file>
23-
<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"/>
22+
<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"/>
2423
</project>
2524
</coverage>

‎tests/_files/BankAccount-cobertura-line.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
3-
<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">
3+
<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">
44
<sources>
55
<source>%s</source>
66
</sources>
77
<packages>
8-
<package name="BankAccount.php" line-rate="0.55555555555556" branch-rate="0" complexity="5">
8+
<package name="BankAccount.php" line-rate="0.625" branch-rate="0" complexity="5">
99
<classes>
10-
<class name="BankAccount" filename="BankAccount.php" line-rate="0.55555555555556" branch-rate="0" complexity="5">
10+
<class name="BankAccount" filename="BankAccount.php" line-rate="0.625" branch-rate="0" complexity="5">
1111
<methods>
1212
<method name="getBalance" signature="" line-rate="1" branch-rate="0" complexity="1">
1313
<lines>
@@ -18,7 +18,6 @@
1818
<lines>
1919
<line number="13" hits="0"/>
2020
<line number="14" hits="0"/>
21-
<line number="15" hits="0"/>
2221
<line number="16" hits="0"/>
2322
</lines>
2423
</method>
@@ -39,7 +38,6 @@
3938
<line number="8" hits="2"/>
4039
<line number="13" hits="0"/>
4140
<line number="14" hits="0"/>
42-
<line number="15" hits="0"/>
4341
<line number="16" hits="0"/>
4442
<line number="22" hits="2"/>
4543
<line number="24" hits="1"/>

‎tests/_files/BankAccount-cobertura-path.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
3-
<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">
3+
<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">
44
<sources>
55
<source>%s</source>
66
</sources>
77
<packages>
8-
<package name="BankAccount.php" line-rate="0.55555555555556" branch-rate="0.42857142857143" complexity="5">
8+
<package name="BankAccount.php" line-rate="0.625" branch-rate="0.42857142857143" complexity="5">
99
<classes>
10-
<class name="BankAccount" filename="BankAccount.php" line-rate="0.55555555555556" branch-rate="0.42857142857143" complexity="5">
10+
<class name="BankAccount" filename="BankAccount.php" line-rate="0.625" branch-rate="0.42857142857143" complexity="5">
1111
<methods>
1212
<method name="getBalance" signature="" line-rate="1" branch-rate="1" complexity="1">
1313
<lines>
@@ -18,7 +18,6 @@
1818
<lines>
1919
<line number="13" hits="0"/>
2020
<line number="14" hits="0"/>
21-
<line number="15" hits="0"/>
2221
<line number="16" hits="0"/>
2322
</lines>
2423
</method>
@@ -39,7 +38,6 @@
3938
<line number="8" hits="2"/>
4039
<line number="13" hits="0"/>
4140
<line number="14" hits="0"/>
42-
<line number="15" hits="0"/>
4341
<line number="16" hits="0"/>
4442
<line number="22" hits="2"/>
4543
<line number="24" hits="1"/>

‎tests/_files/BankAccount-text-line.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Code Coverage Report:
66
Summary:
77
Classes: 0.00% (0/1)
88
Methods: 75.00% (3/4)
9-
Lines: 55.56% (5/9)
9+
Lines: 62.50% (5/8)
1010

1111
BankAccount
12-
Methods: 75.00% ( 3/ 4) Lines: 55.56% ( 5/ 9)
12+
Methods: 75.00% ( 3/ 4) Lines: 62.50% ( 5/ 8)

‎tests/_files/BankAccount-text-path.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Code Coverage Report:
88
Methods: 75.00% (3/4)
99
Paths: 60.00% (3/5)
1010
Branches: 42.86% (3/7)
11-
Lines: 55.56% (5/9)
11+
Lines: 62.50% (5/8)
1212

1313
BankAccount
14-
Methods: 75.00% ( 3/ 4) Paths: 60.00% ( 3/ 5) Branches: 42.86% ( 3/ 7) Lines: 55.56% ( 5/ 9)
14+
Methods: 75.00% ( 3/ 4) Paths: 60.00% ( 3/ 5) Branches: 42.86% ( 3/ 7) Lines: 62.50% ( 5/ 8)

‎tests/_files/BankAccount-text-summary.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
Code Coverage Report Summary:
44
Classes: 0.00% (0/1)
55
Methods: 75.00% (3/4)
6-
Lines: 55.56% (5/9)
6+
Lines: 62.50% (5/8)
77

‎tests/_files/BankAccountWithUncovered-text-line.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Code Coverage Report:
66
Summary:
77
Classes: 0.00% (0/2)
88
Methods: 37.50% (3/8)
9-
Lines: 27.78% (5/18)
9+
Lines: 31.25% (5/16)
1010

1111
BankAccount
12-
Methods: 75.00% ( 3/ 4) Lines: 55.56% ( 5/ 9)
12+
Methods: 75.00% ( 3/ 4) Lines: 62.50% ( 5/ 8)

0 commit comments

Comments
 (0)