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;

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();
 

Doc Comments +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
     /**
      * Check if any candidates have reached the quota and can be elected
      *
-     * @param  array  $candidates 	Array of active candidates to check
+     * @param  Candidate[]  $candidates 	Array of active candidates to check
      * @return bool 				Whether any candidates were changed to elected
      */
     protected function checkCandidates(array $candidates): bool
@@ -347,7 +347,7 @@ 
     /**
      * Check if ballot is valid
      *
-     * @param  Ballot $Ballot  Ballot to test
+     * @param  Ballot $ballot  Ballot to test
      * @return bool             True if valid, false if invalid
      */
     public function checkBallotValidity(Ballot $ballot): bool

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
         foreach ($this->ballots as $i => $ballot)
         {
             $this->logger->debug("Processing ballot $i in stage 1",
-                ['ballot' => $ballot,]
+                ['ballot' => $ballot, ]
             );
 
             $this->allocateVotes($ballot);