@@ -144,16 +144,16 @@ discard block |
||
| 144 | 144 | */ |
| 145 | 145 | protected function transferSurplusVotes(float $surplus, Candidate $candidate) |
| 146 | 146 | { |
| 147 | - $totalVotes = $candidate->getVotes(); |
|
| 148 | - $candidateId = $candidate->getId(); |
|
| 147 | + $totalVotes = $candidate->getVotes(); |
|
| 148 | + $candidateId = $candidate->getId(); |
|
| 149 | 149 | |
| 150 | - foreach ($this->ballots as $i => $ballot) |
|
| 151 | - { |
|
| 152 | - if ($ballot->getLastChoice() == $candidateId) |
|
| 153 | - { |
|
| 154 | - $this->allocateVotes($ballot, $surplus, $totalVotes); |
|
| 155 | - } |
|
| 156 | - } |
|
| 150 | + foreach ($this->ballots as $i => $ballot) |
|
| 151 | + { |
|
| 152 | + if ($ballot->getLastChoice() == $candidateId) |
|
| 153 | + { |
|
| 154 | + $this->allocateVotes($ballot, $surplus, $totalVotes); |
|
| 155 | + } |
|
| 156 | + } |
|
| 157 | 157 | |
| 158 | 158 | return; |
| 159 | 159 | } |
@@ -167,14 +167,14 @@ discard block |
||
| 167 | 167 | */ |
| 168 | 168 | protected function transferEliminatedVotes(Candidate $candidate) |
| 169 | 169 | { |
| 170 | - $candidateId = $candidate->getId(); |
|
| 170 | + $candidateId = $candidate->getId(); |
|
| 171 | 171 | |
| 172 | - foreach ($this->ballots as $i => $ballot) |
|
| 172 | + foreach ($this->ballots as $i => $ballot) |
|
| 173 | 173 | { |
| 174 | - if ($ballot->getLastChoice() == $candidateId) |
|
| 175 | - { |
|
| 176 | - $this->allocateVotes($ballot); |
|
| 177 | - } |
|
| 174 | + if ($ballot->getLastChoice() == $candidateId) |
|
| 175 | + { |
|
| 176 | + $this->allocateVotes($ballot); |
|
| 177 | + } |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | return; |
@@ -224,8 +224,7 @@ discard block |
||
| 224 | 224 | $minimum = $candidate->getVotes(); |
| 225 | 225 | unset($minimumCandidates); |
| 226 | 226 | $minimumCandidates[] = $candidate; |
| 227 | - } |
|
| 228 | - elseif ($candidate->getVotes() == $minimum) |
|
| 227 | + } elseif ($candidate->getVotes() == $minimum) |
|
| 229 | 228 | { |
| 230 | 229 | $minimumCandidates[] = $candidate; |
| 231 | 230 | } |
@@ -270,8 +269,7 @@ discard block |
||
| 270 | 269 | if (count($ballot->getRanking()) > $this->election->getCandidateCount()) |
| 271 | 270 | { |
| 272 | 271 | return false; |
| 273 | - } |
|
| 274 | - else |
|
| 272 | + } else |
|
| 275 | 273 | { |
| 276 | 274 | $candidateIds = $this->election->getCandidateIds(); |
| 277 | 275 | |