@@ -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; |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | /** |
119 | 119 | * Check if any candidates have reached the quota and can be elected |
120 | 120 | * |
121 | - * @param array $candidates Array of active candidates to check |
|
121 | + * @param Candidate[] $candidates Array of active candidates to check |
|
122 | 122 | * @return bool Whether any candidates were changed to elected |
123 | 123 | */ |
124 | 124 | protected function checkCandidates(array $candidates): bool |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | /** |
348 | 348 | * Check if ballot is valid |
349 | 349 | * |
350 | - * @param Ballot $Ballot Ballot to test |
|
350 | + * @param Ballot $ballot Ballot to test |
|
351 | 351 | * @return bool True if valid, false if invalid |
352 | 352 | */ |
353 | 353 | public function checkBallotValidity(Ballot $ballot): bool |