michaelcullum / voting-system

src/Michaelc/Voting/STV/VoteHandler.php

Indentation +29 added lines, -29 removed lines

@@ -53,16 +53,16 @@ 
      */
     public function run()
     {
-    	$this->firstStep();
+        $this->firstStep();
 
         $candidates = $this->election->getActiveCandidates();
 
         while ($electedCandidates < $this->election->getWinners())
         {
-	    	if (!$this->checkCandidates($candidates))
-	    	{
-	    		$this->eliminateCandidates($candidates);
-	    	}
+            if (!$this->checkCandidates($candidates))
+            {
+                $this->eliminateCandidates($candidates);
+            }
         }
 
         return $this->election->getElectedCandidates();
@@ -91,7 +91,7 @@ 
      */
     protected function checkCandidates(array &$candidates): bool
     {
-    	foreach ($candidates as $i => $candidate)
+        foreach ($candidates as $i => $candidate)
         {
             if ($candidate->getVotes() >= $this->quota)
             {
@@ -119,8 +119,8 @@ 
 
         if ($candidate !== null)
         {
-	        $this->election->getCandidate($candidate->getId())->addVotes($weight);
-	        $ballot->setLevelUsed(($step - 1));
+            $this->election->getCandidate($candidate->getId())->addVotes($weight);
+            $ballot->setLevelUsed(($step - 1));
         }
 
         return $ballot;
@@ -136,16 +136,16 @@ 
      */
     protected function transferSurplusVotes(float $surplus, Candidate $candidate)
     {
-    	$totalVotes = $candiate->getVotes();
-    	$candidateId = $candidate->getId();
+        $totalVotes = $candiate->getVotes();
+        $candidateId = $candidate->getId();
 
-    	foreach ($this->ballots as $i => $ballot)
-    	{
-        	if ($ballot->getLastChoice()->getId() == $candidateId)
-        	{
-		        $this->allocateVotes($ballot, $surplus, $totalVotes);
-        	}
-    	}
+        foreach ($this->ballots as $i => $ballot)
+        {
+            if ($ballot->getLastChoice()->getId() == $candidateId)
+            {
+                $this->allocateVotes($ballot, $surplus, $totalVotes);
+            }
+        }
 
         return;
     }
@@ -159,14 +159,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()->getId() == $candidateId)
-        	{
-		        $this->allocateVotes($ballot);
-        	}
+            if ($ballot->getLastChoice()->getId() == $candidateId)
+            {
+                $this->allocateVotes($ballot);
+            }
         }
 
         return;
@@ -190,8 +190,8 @@ 
 
         if ($this->electedCandidates < $this->election->getWinnersCount())
         {
-        	$surplus = $candidate->getVotes() - $this->quota;
-        	$this->transferVotes($surplus, $candidate);
+            $surplus = $candidate->getVotes() - $this->quota;
+            $this->transferVotes($surplus, $candidate);
         }
 
         return;
@@ -206,9 +206,9 @@ 
      */
     protected function eliminateCandidates(array &$candidates): int
     {
-    	$minimum = 0;
+        $minimum = 0;
 
-    	foreach ($candidates as $i => $candidate)
+        foreach ($candidates as $i => $candidate)
         {
             if ($candidate->getVotes() > $minimum)
             {
@@ -224,8 +224,8 @@ 
 
         foreach($minimumCandidates as $minimumCandidate)
         {
-        	$this->transferEliminatedVotes($minimumCandidate);
-        	$minimumCandidate->setState(Candidate::DEFEATED);
+            $this->transferEliminatedVotes($minimumCandidate);
+            $minimumCandidate->setState(Candidate::DEFEATED);
         }
 
         return count($minimumCandidates);

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,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();
@@ -222,7 +222,7 @@ 
             }
         }
 
-        foreach($minimumCandidates as $minimumCandidate)
+        foreach ($minimumCandidates as $minimumCandidate)
         {
         	$this->transferEliminatedVotes($minimumCandidate);
         	$minimumCandidate->setState(Candidate::DEFEATED);

Braces +1 added lines, -2 removed lines

@@ -215,8 +215,7 @@
                 $minimum = $candidate->getVotes();
                 unset($minimumCandidates);
                 $minimumCandidates[] = $candidate;
-            }
-            elseif ($candidate->getVotes() == $minimum)
+            } elseif ($candidate->getVotes() == $minimum)
             {
                 $minimumCandidates[] = $candidate;
             }