michaelcullum / voting-system

src/AppBundle/Controller/UserController.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 
         return $this->render(
             'user/index.html.twig',
-            ['votes' => $votes, 'user' => $user,]
+            ['votes' => $votes, 'user' => $user, ]
         );
     }
 

src/Michaelc/Voting/STV/VoteHandler.php

Indentation +15 added lines, -15 removed lines

@@ -144,16 +144,16 @@ 
      */
     protected function transferSurplusVotes(float $surplus, Candidate $candidate)
     {
-    	$totalVotes = $candidate->getVotes();
-    	$candidateId = $candidate->getId();
+        $totalVotes = $candidate->getVotes();
+        $candidateId = $candidate->getId();
 
-    	foreach ($this->ballots as $i => $ballot)
-    	{
-        	if ($ballot->getLastChoice() == $candidateId)
-        	{
-		        $this->allocateVotes($ballot, $surplus, $totalVotes);
-        	}
-    	}
+        foreach ($this->ballots as $i => $ballot)
+        {
+            if ($ballot->getLastChoice() == $candidateId)
+            {
+                $this->allocateVotes($ballot, $surplus, $totalVotes);
+            }
+        }
 
         return;
     }
@@ -167,14 +167,14 @@ 
      */
     protected function transferEliminatedVotes(Candidate $candidate)
     {
-    	$candidateId = $candidate->getId();
+        $candidateId = $candidate->getId();
 
-    	foreach ($this->ballots as $i => $ballot)
+        foreach ($this->ballots as $i => $ballot)
         {
-        	if ($ballot->getLastChoice() == $candidateId)
-        	{
-		        $this->allocateVotes($ballot);
-        	}
+            if ($ballot->getLastChoice() == $candidateId)
+            {
+                $this->allocateVotes($ballot);
+            }
         }
 
         return;

Spacing +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
      *                          	candidate votes)
      * @return Ballot 	The same ballot passed in modified
      */
-    protected function allocateVotes(Ballot &$ballot, float $multiplier = 1.0, float $divisor = 1.0): Ballot
+    protected function allocateVotes(Ballot & $ballot, float $multiplier = 1.0, float $divisor = 1.0): Ballot
     {
         $weight = $ballot->setWeight(($ballot->getWeight() * $multiplier) / $divisor);
         $candidate = $ballot->getNextChoice();
@@ -265,7 +265,7 @@ 
      * @param  Ballot &$Ballot  Ballot to test
      * @return bool             True if valid, false if invalid
      */
-    private function checkBallotValidity(Ballot &$Ballot): bool
+    private function checkBallotValidity(Ballot & $Ballot): bool
     {
         if (count($ballot->getRanking()) > $this->election->getCandidateCount())
         {

Braces +2 added lines, -4 removed lines

@@ -224,8 +224,7 @@ 
                 $minimum = $candidate->getVotes();
                 unset($minimumCandidates);
                 $minimumCandidates[] = $candidate;
-            }
-            elseif ($candidate->getVotes() == $minimum)
+            } elseif ($candidate->getVotes() == $minimum)
             {
                 $minimumCandidates[] = $candidate;
             }
@@ -270,8 +269,7 @@ 
         if (count($ballot->getRanking()) > $this->election->getCandidateCount())
         {
             return false;
-        }
-        else
+        } else
         {
             $candidateIds = $this->election->getCandidateIds();