BigBad / golfleague

app/library/Services/MatchService.php

Doc Comments +4 added lines, -1 removed lines

@@ -345,7 +345,7 @@ 
     /**
      * Method to get match from input Match data
      *
-     * @param mixed $matchdata
+     * @param mixed $matchid
      * @return JSON object
      */
     public function get($matchid)
@@ -356,6 +356,9 @@ 
 
 
 
+    /**
+     * @param string $key
+     */
     private function search($array, $key, $value)
     {
         $results = array();

Indentation +349 added lines, -349 removed lines

@@ -19,354 +19,354 @@
  */
 class MatchService
 {
-    // Containing our matchRepository to make all our database calls to
-    protected $matchRepo;
-
-    /**
-     * Loads our $matchRepo
-     *
-     * @param MatchRepository $matchRepo
-     * @return MatchService
-     */
-    public function __construct(MatchRoundRepository $matchRoundRepo,
-                                MatchRepository $matchRepo,
-                                PrizeMoney $prizeMoney,
-                                Player $player,
-                                Match $match,
-                                CtpRepository $ctp,
-                                Teammatch $teammatch,
-                                Dispatcher $events)
-    {
-        $this->matchRoundRepo = $matchRoundRepo;
-        $this->matchRepo = $matchRepo;
-        $this->prizeMoney = $prizeMoney;
-        $this->player = $player;
-        $this->match = $match;
-        $this->ctp = $ctp;
-        $this->teammatch = $teammatch;
-        $this->events = $events;
-    }
-
-    /**
-     * Method to create match from input Match data
-     *
-     * @param mixed $matchdata
-     * @return
-     */
-    public function create($matchdata)
-    {
-        $this->prizeMoney->setPurse($matchdata['purse']);
-
-        $matchdata['purse'] = number_format($matchdata['purse'], 2);
-        $matchdata['grossmoney'] = $this->prizeMoney->getlowScore();
-        $matchdata['netmoney'] = $this->prizeMoney->getlowScore();
-
-        //How many A and B players
-        $totalPlayers = 0;
-
-        $aPlayerCount = 0;
+	// Containing our matchRepository to make all our database calls to
+	protected $matchRepo;
+
+	/**
+	 * Loads our $matchRepo
+	 *
+	 * @param MatchRepository $matchRepo
+	 * @return MatchService
+	 */
+	public function __construct(MatchRoundRepository $matchRoundRepo,
+								MatchRepository $matchRepo,
+								PrizeMoney $prizeMoney,
+								Player $player,
+								Match $match,
+								CtpRepository $ctp,
+								Teammatch $teammatch,
+								Dispatcher $events)
+	{
+		$this->matchRoundRepo = $matchRoundRepo;
+		$this->matchRepo = $matchRepo;
+		$this->prizeMoney = $prizeMoney;
+		$this->player = $player;
+		$this->match = $match;
+		$this->ctp = $ctp;
+		$this->teammatch = $teammatch;
+		$this->events = $events;
+	}
+
+	/**
+	 * Method to create match from input Match data
+	 *
+	 * @param mixed $matchdata
+	 * @return
+	 */
+	public function create($matchdata)
+	{
+		$this->prizeMoney->setPurse($matchdata['purse']);
+
+		$matchdata['purse'] = number_format($matchdata['purse'], 2);
+		$matchdata['grossmoney'] = $this->prizeMoney->getlowScore();
+		$matchdata['netmoney'] = $this->prizeMoney->getlowScore();
+
+		//How many A and B players
+		$totalPlayers = 0;
+
+		$aPlayerCount = 0;
         
-        $bPlayerCount = 0;
-        foreach($matchdata['player'] as $player){
-            if ($player['level_id'] == '1'){
-                $aPlayerCount++;
-            }
-            else {
-                $bPlayerCount++;
-            }
-            $totalPlayers++;
-        }
-
-        //Calculate Skins money based on how many players in each group
-
-        $matchdata['skinsamoney'] = $this->prizeMoney->skinsGroupPot($matchdata['purse'], $totalPlayers, $aPlayerCount);
-        $matchdata['skinsbmoney'] = $this->prizeMoney->skinsGroupPot($matchdata['purse'], $totalPlayers, $bPlayerCount);
-        //check for carry over money and if there is add it to skins money
-        $carryOver = new CarryOver;
-        $carryOverMoney = $carryOver->calculate();
-        $matchdata['skinsamoney'] +=  $carryOverMoney[1];
-        $matchdata['skinsbmoney'] +=  $carryOverMoney[2];
-
-        //append current handicap and set winnings to 0 for each player
-        foreach ($matchdata['player'] as $key=>$player) {
-            //get each player's current handicap
-            $currentPlayer = $this->player->find($player['player_id']);
-            $matchdata['player'][$key]['handicap'] = $currentPlayer->handicap;
-            $matchdata['player'][$key]['winnings'] = 0;
-        }// End foreach
-
-        $matchid = $this->matchRepo->create($matchdata);
-        $matchdata['match_id'] = $matchid;
-        $this->events->fire('match.create', array($matchdata));  // MatchHandler and teamMatchHandler are listening...
-
-        // Run for team Matches
-        if($matchdata['matchType'] === 'team' || $matchdata['matchType'] === 'both'){
-
-            foreach ($matchdata['teamMatchUp1'] as $teamKey => $team){
-                $matchUp1[] = $this->search($matchdata['player'], 'team', $team);
-            }
-
-            //Save matchUp 1
-            $match1['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
-            $match1['team_id'] = $matchUp1[0][0]['team'];
-            $match1['player1'] = $matchUp1[0][0]['player_id'];
-            $match1['player2'] = $matchUp1[0][1]['player_id'];
-            $match1['opponent'] = $matchUp1[1][0]['team'];
-            $this->teammatch->create($match1); //save to match table
-
-            $match1['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
-            $match1['team_id'] = $matchUp1[1][0]['team'];
-            $match1['player1'] = $matchUp1[1][0]['player_id'];
-            $match1['player2'] = $matchUp1[1][1]['player_id'];
-            $match1['opponent'] = $matchUp1[0][0]['team'];
-            $this->teammatch->create($match1); //save to match table
-
-
-            foreach ($matchdata['teamMatchUp2'] as $teamKey => $team){
-                $matchUp2[] = $this->search($matchdata['player'], 'team', $team);
-            }
-
-            //Save matchUp 2
-            $match2['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
-            $match2['team_id'] = $matchUp2[0][0]['team'];
-            $match2['player1'] = $matchUp2[0][0]['player_id'];
-            $match2['player2'] = $matchUp2[0][1]['player_id'];
-            $match2['opponent'] = $matchUp2[1][0]['team'];
-            $this->teammatch->create($match2); //save to match table
-
-            $match2['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
-            $match2['team_id'] = $matchUp2[1][0]['team'];
-            $match2['player1'] = $matchUp2[1][0]['player_id'];
-            $match2['player2'] = $matchUp2[1][1]['player_id'];
-            $match2['opponent'] = $matchUp2[0][0]['team'];
-            $this->teammatch->create($match2); //save to match table
-
-
-            foreach ($matchdata['teamMatchUp3'] as $teamKey => $team){
-                $matchUp3[] = $this->search($matchdata['player'], 'team', $team);
-            }
-
-            //Save matchUp 3
-            $match3['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
-            $match3['team_id'] = $matchUp3[0][0]['team'];
-            $match3['player1'] = $matchUp3[0][0]['player_id'];
-            $match3['player2'] = $matchUp3[0][1]['player_id'];
-            $match3['opponent'] = $matchUp3[1][0]['team'];
-            $this->teammatch->create($match3); //save to match table
-
-            $match3['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
-            $match3['team_id'] = $matchUp3[1][0]['team'];
-            $match3['player1'] = $matchUp3[1][0]['player_id'];
-            $match3['player2'] = $matchUp3[1][1]['player_id'];
-            $match3['opponent'] = $matchUp3[0][0]['team'];
-            $this->teammatch->create($match3); //save to match table
-
-        }
-    }
-
-    public function finalize($matchdata)
-    {
-        // post CTP1 and CTP2
-        $ctp1 = array(
-            'match_id' => $matchdata['match'],
-            'player_id' => $matchdata['ctp1'],
-            'hole_id' => $matchdata['ctp1hole'],
-            'money' => $this->prizeMoney->getCtp()
-        );
-        $this->ctp->create($ctp1);
-        $ctp2 = array(
-            'match_id' => $matchdata['match'],
-            'player_id' => $matchdata['ctp2'],
-            'hole_id' => $matchdata['ctp2hole'],
-            'money' => $this->prizeMoney->getCtp()
-        );
-        $this->ctp->create($ctp2);
-
-        //calculate Gross winner and post to grossWinnersTable
-
-        $matchRound = $this->matchRoundRepo->getByMatch($matchdata['match']);
-
-
-        $lowGross = array();
-        foreach ($matchRound as $key => $match){
-            $lowGross[$match['player']->id] = $match['score'];
-        }
-        $arrayLowGross = array_keys($lowGross, min($lowGross));
-        foreach($arrayLowGross as $key => $lowgrossPlayer) {
-            $grossWinner = new Grosswinner;
-            $grossWinner->player_id = $lowgrossPlayer;
-            $grossWinner->match_id = $matchdata['match'];
-            $grossWinner->score = $lowGross[$lowgrossPlayer];
-            $grossWinner->money = $this->prizeMoney->getlowScore() / count($arrayLowGross);
-            $grossWinner->save();
-        }
-
-        //Calculate NET winner
-        $lowNet = array();
-        $scores =array();
-        foreach ($matchRound as $key => $match){
-            $netScore = ($match['score'] - round($match['player']->handicap,0)); //calculate net score
-            $lowNet[$match['player']->id] = $netScore;
-        }
-        $arrayLowNet = array_keys($lowNet, min($lowNet));
-
-        foreach($arrayLowNet as $key => $lownetPlayer) {
-            $netWinner = new Netwinner;
-            $netWinner->player_id = $lownetPlayer;
-            $netWinner->match_id = $matchdata['match'];
-            $netWinner->score = $lowNet[$lownetPlayer];
-            $netWinner->money = $this->prizeMoney->getlowScore() /  count($arrayLowNet);
-            $netWinner->save();
-        }
-
-        //Calculate Skins
-
-        //determine A and B players
-        //using pivot table match_player
-        $match = $this->match->find($matchdata['match']);
-        $aPlayers = array();
-        $bPlayers = array();
-        foreach($match->players as $player)
-        {
-            if($player->pivot->level_id == 1){
-                $aPlayers[] = $player->pivot->player_id;
-
-            }
-            if($player->pivot->level_id == 2){
-                $bPlayers[] = $player->pivot->player_id;
-            }
-        }
-
-        //Create Skins arrays
-        //player_id, 'holescores'
-        foreach($matchRound as $key => $round) {
-            if (in_array($round->player_id,$aPlayers)){
-                $aPlayersSkins[$key]['player_id'] = $round->player_id;
-                $aPlayersSkins[$key]['holescores'] = $round->holescores;
-            }
-            if (in_array($round->player_id,$bPlayers)){
-                $bPlayersSkins[$key]['player_id'] = $round->player_id;
-                $bPlayersSkins[$key]['holescores'] = $round->holescores;
-            }
-        }
-
-        //Run A Skins analysis
-        $scores = array();
-        foreach($aPlayersSkins as $key => $playerSkin){
-            foreach($playerSkin['holescores'] as $hole => $holescore){
-                $scores[$holescore['hole_id']][$playerSkin['player_id']] = $holescore['score'];
-            }
-        }
-
-        foreach($scores as $hole_id => $hole) {
-            $minScore = min($hole);
-            $winners[$hole_id] = array_keys($hole, min($hole)); //gets player id of lowest score
-        }
-        $aSkinsWon = 0;
-        foreach($winners as $key => $winner) {
-            if(count($winner)  ===  1) {
-                //post to DB
-                $skinWinner = new Skin;
-                $skinWinner->player_id = $winner[0];
-                $skinWinner->level_id = 1;
-                $skinWinner->match_id = intval($matchdata['match']);
-                $skinWinner->hole_id = $key;
-                $skinWinner->save();
-                $aSkinsWon++;
-            }
-        }
-
-        //Run B Skins analysis
-        $scores = array();
-        foreach($bPlayersSkins as $key => $playerSkin){
-            foreach($playerSkin['holescores'] as $hole => $holescore){
-                $scores[$holescore['hole_id']][$playerSkin['player_id']] = $holescore['score'];
-            }
-        }
-
-        foreach($scores as $hole_id => $hole) {
-            $minScore = min($hole);
-            $winners[$hole_id] = array_keys($hole, min($hole)); //gets player id of lowest score
-        }
-        $bSkinsWon = 0;
-        foreach($winners as $key => $winner) {
-            if(count($winner)  ===  1) {
-                //post to DB
-                $skinWinner = new Skin;
-                $skinWinner->player_id = $winner[0];
-                $skinWinner->level_id = 2;
-                $skinWinner->match_id = intval($matchdata['match']);
-                $skinWinner->hole_id = $key;
-                $skinWinner->save();
-                $bSkinsWon++;
-            }
-        }
-
-        $match =  Match::find($matchdata['match']);
-
-        //Need to add Carry over money if there no skins are won
-        //check for carry over money
-        $skinsamoney = $match->skinsamoney; // + carryover A money if any
-        $skinsbmoney = $match->skinsbmoney; // + carryover B money if any
-
-        if($aSkinsWon > 0) {
-            $moneyperskinA = $skinsamoney / $aSkinsWon;
-
-            $aSkins = Skin::where('match_id', '=', $matchdata['match'])->where('level_id', '=', 1)->get();
-            foreach ($aSkins as $askin){
-                $askin->money = $moneyperskinA;
-                $askin->save();
-            }
-        }
-
-        if($bSkinsWon > 0) {
-            $moneyperskinB = $skinsbmoney / $bSkinsWon;
-
-            $bSkins = Skin::where('match_id', '=', $matchdata['match'])->where('level_id', '=', 2)->get();
-            foreach ($bSkins as $bskin){
-                $bskin->money = $moneyperskinB;
-                $bskin->save();
-            }
-        }
-        //foreach player in pivot table create player and run handicap analysis
-        foreach($match->players as $matchplayer)
-        {
-            $player = Player::find($matchplayer->pivot->player_id);
-            $handicap = new Handicap($player);
-            $player->handicap = $handicap->calculate();
-            $player->save();
-        }
-
-        //Fire event to calculate money won and add to pivot table match_player
-        $this->events->fire('match.finalize', $match);
-
-    }
-
-    /**
-     * Method to get match from input Match data
-     *
-     * @param mixed $matchdata
-     * @return JSON object
-     */
-    public function get($matchid)
-    {
-        $matchdata =  $this->matchRepo->get($matchid);
-        return $matchdata;
-    }
-
-
-
-    private function search($array, $key, $value)
-    {
-        $results = array();
-        if (is_array($array)) {
-            if (isset($array[$key]) && $array[$key] == $value) {
-                $results[] = $array;
-            }
-            foreach ($array as $subarray) {
-                $results = array_merge($results, $this->search($subarray, $key, $value));
-            }
-        }
-        return $results;
-    }
+		$bPlayerCount = 0;
+		foreach($matchdata['player'] as $player){
+			if ($player['level_id'] == '1'){
+				$aPlayerCount++;
+			}
+			else {
+				$bPlayerCount++;
+			}
+			$totalPlayers++;
+		}
+
+		//Calculate Skins money based on how many players in each group
+
+		$matchdata['skinsamoney'] = $this->prizeMoney->skinsGroupPot($matchdata['purse'], $totalPlayers, $aPlayerCount);
+		$matchdata['skinsbmoney'] = $this->prizeMoney->skinsGroupPot($matchdata['purse'], $totalPlayers, $bPlayerCount);
+		//check for carry over money and if there is add it to skins money
+		$carryOver = new CarryOver;
+		$carryOverMoney = $carryOver->calculate();
+		$matchdata['skinsamoney'] +=  $carryOverMoney[1];
+		$matchdata['skinsbmoney'] +=  $carryOverMoney[2];
+
+		//append current handicap and set winnings to 0 for each player
+		foreach ($matchdata['player'] as $key=>$player) {
+			//get each player's current handicap
+			$currentPlayer = $this->player->find($player['player_id']);
+			$matchdata['player'][$key]['handicap'] = $currentPlayer->handicap;
+			$matchdata['player'][$key]['winnings'] = 0;
+		}// End foreach
+
+		$matchid = $this->matchRepo->create($matchdata);
+		$matchdata['match_id'] = $matchid;
+		$this->events->fire('match.create', array($matchdata));  // MatchHandler and teamMatchHandler are listening...
+
+		// Run for team Matches
+		if($matchdata['matchType'] === 'team' || $matchdata['matchType'] === 'both'){
+
+			foreach ($matchdata['teamMatchUp1'] as $teamKey => $team){
+				$matchUp1[] = $this->search($matchdata['player'], 'team', $team);
+			}
+
+			//Save matchUp 1
+			$match1['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
+			$match1['team_id'] = $matchUp1[0][0]['team'];
+			$match1['player1'] = $matchUp1[0][0]['player_id'];
+			$match1['player2'] = $matchUp1[0][1]['player_id'];
+			$match1['opponent'] = $matchUp1[1][0]['team'];
+			$this->teammatch->create($match1); //save to match table
+
+			$match1['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
+			$match1['team_id'] = $matchUp1[1][0]['team'];
+			$match1['player1'] = $matchUp1[1][0]['player_id'];
+			$match1['player2'] = $matchUp1[1][1]['player_id'];
+			$match1['opponent'] = $matchUp1[0][0]['team'];
+			$this->teammatch->create($match1); //save to match table
+
+
+			foreach ($matchdata['teamMatchUp2'] as $teamKey => $team){
+				$matchUp2[] = $this->search($matchdata['player'], 'team', $team);
+			}
+
+			//Save matchUp 2
+			$match2['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
+			$match2['team_id'] = $matchUp2[0][0]['team'];
+			$match2['player1'] = $matchUp2[0][0]['player_id'];
+			$match2['player2'] = $matchUp2[0][1]['player_id'];
+			$match2['opponent'] = $matchUp2[1][0]['team'];
+			$this->teammatch->create($match2); //save to match table
+
+			$match2['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
+			$match2['team_id'] = $matchUp2[1][0]['team'];
+			$match2['player1'] = $matchUp2[1][0]['player_id'];
+			$match2['player2'] = $matchUp2[1][1]['player_id'];
+			$match2['opponent'] = $matchUp2[0][0]['team'];
+			$this->teammatch->create($match2); //save to match table
+
+
+			foreach ($matchdata['teamMatchUp3'] as $teamKey => $team){
+				$matchUp3[] = $this->search($matchdata['player'], 'team', $team);
+			}
+
+			//Save matchUp 3
+			$match3['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
+			$match3['team_id'] = $matchUp3[0][0]['team'];
+			$match3['player1'] = $matchUp3[0][0]['player_id'];
+			$match3['player2'] = $matchUp3[0][1]['player_id'];
+			$match3['opponent'] = $matchUp3[1][0]['team'];
+			$this->teammatch->create($match3); //save to match table
+
+			$match3['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
+			$match3['team_id'] = $matchUp3[1][0]['team'];
+			$match3['player1'] = $matchUp3[1][0]['player_id'];
+			$match3['player2'] = $matchUp3[1][1]['player_id'];
+			$match3['opponent'] = $matchUp3[0][0]['team'];
+			$this->teammatch->create($match3); //save to match table
+
+		}
+	}
+
+	public function finalize($matchdata)
+	{
+		// post CTP1 and CTP2
+		$ctp1 = array(
+			'match_id' => $matchdata['match'],
+			'player_id' => $matchdata['ctp1'],
+			'hole_id' => $matchdata['ctp1hole'],
+			'money' => $this->prizeMoney->getCtp()
+		);
+		$this->ctp->create($ctp1);
+		$ctp2 = array(
+			'match_id' => $matchdata['match'],
+			'player_id' => $matchdata['ctp2'],
+			'hole_id' => $matchdata['ctp2hole'],
+			'money' => $this->prizeMoney->getCtp()
+		);
+		$this->ctp->create($ctp2);
+
+		//calculate Gross winner and post to grossWinnersTable
+
+		$matchRound = $this->matchRoundRepo->getByMatch($matchdata['match']);
+
+
+		$lowGross = array();
+		foreach ($matchRound as $key => $match){
+			$lowGross[$match['player']->id] = $match['score'];
+		}
+		$arrayLowGross = array_keys($lowGross, min($lowGross));
+		foreach($arrayLowGross as $key => $lowgrossPlayer) {
+			$grossWinner = new Grosswinner;
+			$grossWinner->player_id = $lowgrossPlayer;
+			$grossWinner->match_id = $matchdata['match'];
+			$grossWinner->score = $lowGross[$lowgrossPlayer];
+			$grossWinner->money = $this->prizeMoney->getlowScore() / count($arrayLowGross);
+			$grossWinner->save();
+		}
+
+		//Calculate NET winner
+		$lowNet = array();
+		$scores =array();
+		foreach ($matchRound as $key => $match){
+			$netScore = ($match['score'] - round($match['player']->handicap,0)); //calculate net score
+			$lowNet[$match['player']->id] = $netScore;
+		}
+		$arrayLowNet = array_keys($lowNet, min($lowNet));
+
+		foreach($arrayLowNet as $key => $lownetPlayer) {
+			$netWinner = new Netwinner;
+			$netWinner->player_id = $lownetPlayer;
+			$netWinner->match_id = $matchdata['match'];
+			$netWinner->score = $lowNet[$lownetPlayer];
+			$netWinner->money = $this->prizeMoney->getlowScore() /  count($arrayLowNet);
+			$netWinner->save();
+		}
+
+		//Calculate Skins
+
+		//determine A and B players
+		//using pivot table match_player
+		$match = $this->match->find($matchdata['match']);
+		$aPlayers = array();
+		$bPlayers = array();
+		foreach($match->players as $player)
+		{
+			if($player->pivot->level_id == 1){
+				$aPlayers[] = $player->pivot->player_id;
+
+			}
+			if($player->pivot->level_id == 2){
+				$bPlayers[] = $player->pivot->player_id;
+			}
+		}
+
+		//Create Skins arrays
+		//player_id, 'holescores'
+		foreach($matchRound as $key => $round) {
+			if (in_array($round->player_id,$aPlayers)){
+				$aPlayersSkins[$key]['player_id'] = $round->player_id;
+				$aPlayersSkins[$key]['holescores'] = $round->holescores;
+			}
+			if (in_array($round->player_id,$bPlayers)){
+				$bPlayersSkins[$key]['player_id'] = $round->player_id;
+				$bPlayersSkins[$key]['holescores'] = $round->holescores;
+			}
+		}
+
+		//Run A Skins analysis
+		$scores = array();
+		foreach($aPlayersSkins as $key => $playerSkin){
+			foreach($playerSkin['holescores'] as $hole => $holescore){
+				$scores[$holescore['hole_id']][$playerSkin['player_id']] = $holescore['score'];
+			}
+		}
+
+		foreach($scores as $hole_id => $hole) {
+			$minScore = min($hole);
+			$winners[$hole_id] = array_keys($hole, min($hole)); //gets player id of lowest score
+		}
+		$aSkinsWon = 0;
+		foreach($winners as $key => $winner) {
+			if(count($winner)  ===  1) {
+				//post to DB
+				$skinWinner = new Skin;
+				$skinWinner->player_id = $winner[0];
+				$skinWinner->level_id = 1;
+				$skinWinner->match_id = intval($matchdata['match']);
+				$skinWinner->hole_id = $key;
+				$skinWinner->save();
+				$aSkinsWon++;
+			}
+		}
+
+		//Run B Skins analysis
+		$scores = array();
+		foreach($bPlayersSkins as $key => $playerSkin){
+			foreach($playerSkin['holescores'] as $hole => $holescore){
+				$scores[$holescore['hole_id']][$playerSkin['player_id']] = $holescore['score'];
+			}
+		}
+
+		foreach($scores as $hole_id => $hole) {
+			$minScore = min($hole);
+			$winners[$hole_id] = array_keys($hole, min($hole)); //gets player id of lowest score
+		}
+		$bSkinsWon = 0;
+		foreach($winners as $key => $winner) {
+			if(count($winner)  ===  1) {
+				//post to DB
+				$skinWinner = new Skin;
+				$skinWinner->player_id = $winner[0];
+				$skinWinner->level_id = 2;
+				$skinWinner->match_id = intval($matchdata['match']);
+				$skinWinner->hole_id = $key;
+				$skinWinner->save();
+				$bSkinsWon++;
+			}
+		}
+
+		$match =  Match::find($matchdata['match']);
+
+		//Need to add Carry over money if there no skins are won
+		//check for carry over money
+		$skinsamoney = $match->skinsamoney; // + carryover A money if any
+		$skinsbmoney = $match->skinsbmoney; // + carryover B money if any
+
+		if($aSkinsWon > 0) {
+			$moneyperskinA = $skinsamoney / $aSkinsWon;
+
+			$aSkins = Skin::where('match_id', '=', $matchdata['match'])->where('level_id', '=', 1)->get();
+			foreach ($aSkins as $askin){
+				$askin->money = $moneyperskinA;
+				$askin->save();
+			}
+		}
+
+		if($bSkinsWon > 0) {
+			$moneyperskinB = $skinsbmoney / $bSkinsWon;
+
+			$bSkins = Skin::where('match_id', '=', $matchdata['match'])->where('level_id', '=', 2)->get();
+			foreach ($bSkins as $bskin){
+				$bskin->money = $moneyperskinB;
+				$bskin->save();
+			}
+		}
+		//foreach player in pivot table create player and run handicap analysis
+		foreach($match->players as $matchplayer)
+		{
+			$player = Player::find($matchplayer->pivot->player_id);
+			$handicap = new Handicap($player);
+			$player->handicap = $handicap->calculate();
+			$player->save();
+		}
+
+		//Fire event to calculate money won and add to pivot table match_player
+		$this->events->fire('match.finalize', $match);
+
+	}
+
+	/**
+	 * Method to get match from input Match data
+	 *
+	 * @param mixed $matchdata
+	 * @return JSON object
+	 */
+	public function get($matchid)
+	{
+		$matchdata =  $this->matchRepo->get($matchid);
+		return $matchdata;
+	}
+
+
+
+	private function search($array, $key, $value)
+	{
+		$results = array();
+		if (is_array($array)) {
+			if (isset($array[$key]) && $array[$key] == $value) {
+				$results[] = $array;
+			}
+			foreach ($array as $subarray) {
+				$results = array_merge($results, $this->search($subarray, $key, $value));
+			}
+		}
+		return $results;
+	}
 }

Spacing +45 added lines, -45 removed lines

@@ -67,8 +67,8 @@ 
         $aPlayerCount = 0;
         
         $bPlayerCount = 0;
-        foreach($matchdata['player'] as $player){
-            if ($player['level_id'] == '1'){
+        foreach ($matchdata['player'] as $player) {
+            if ($player['level_id'] == '1') {
                 $aPlayerCount++;
             }
             else {
@@ -84,8 +84,8 @@ 
         //check for carry over money and if there is add it to skins money
         $carryOver = new CarryOver;
         $carryOverMoney = $carryOver->calculate();
-        $matchdata['skinsamoney'] +=  $carryOverMoney[1];
-        $matchdata['skinsbmoney'] +=  $carryOverMoney[2];
+        $matchdata['skinsamoney'] += $carryOverMoney[1];
+        $matchdata['skinsbmoney'] += $carryOverMoney[2];
 
         //append current handicap and set winnings to 0 for each player
         foreach ($matchdata['player'] as $key=>$player) {
@@ -97,24 +97,24 @@ 
 
         $matchid = $this->matchRepo->create($matchdata);
         $matchdata['match_id'] = $matchid;
-        $this->events->fire('match.create', array($matchdata));  // MatchHandler and teamMatchHandler are listening...
+        $this->events->fire('match.create', array($matchdata)); // MatchHandler and teamMatchHandler are listening...
 
         // Run for team Matches
-        if($matchdata['matchType'] === 'team' || $matchdata['matchType'] === 'both'){
+        if ($matchdata['matchType'] === 'team' || $matchdata['matchType'] === 'both') {
 
-            foreach ($matchdata['teamMatchUp1'] as $teamKey => $team){
+            foreach ($matchdata['teamMatchUp1'] as $teamKey => $team) {
                 $matchUp1[] = $this->search($matchdata['player'], 'team', $team);
             }
 
             //Save matchUp 1
-            $match1['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
+            $match1['match_id'] = $matchdata['match_id']; // This is generated below and passed to listener
             $match1['team_id'] = $matchUp1[0][0]['team'];
             $match1['player1'] = $matchUp1[0][0]['player_id'];
             $match1['player2'] = $matchUp1[0][1]['player_id'];
             $match1['opponent'] = $matchUp1[1][0]['team'];
             $this->teammatch->create($match1); //save to match table
 
-            $match1['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
+            $match1['match_id'] = $matchdata['match_id']; // This is generated below and passed to listener
             $match1['team_id'] = $matchUp1[1][0]['team'];
             $match1['player1'] = $matchUp1[1][0]['player_id'];
             $match1['player2'] = $matchUp1[1][1]['player_id'];
@@ -122,19 +122,19 @@ 
             $this->teammatch->create($match1); //save to match table
 
 
-            foreach ($matchdata['teamMatchUp2'] as $teamKey => $team){
+            foreach ($matchdata['teamMatchUp2'] as $teamKey => $team) {
                 $matchUp2[] = $this->search($matchdata['player'], 'team', $team);
             }
 
             //Save matchUp 2
-            $match2['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
+            $match2['match_id'] = $matchdata['match_id']; // This is generated below and passed to listener
             $match2['team_id'] = $matchUp2[0][0]['team'];
             $match2['player1'] = $matchUp2[0][0]['player_id'];
             $match2['player2'] = $matchUp2[0][1]['player_id'];
             $match2['opponent'] = $matchUp2[1][0]['team'];
             $this->teammatch->create($match2); //save to match table
 
-            $match2['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
+            $match2['match_id'] = $matchdata['match_id']; // This is generated below and passed to listener
             $match2['team_id'] = $matchUp2[1][0]['team'];
             $match2['player1'] = $matchUp2[1][0]['player_id'];
             $match2['player2'] = $matchUp2[1][1]['player_id'];
@@ -142,19 +142,19 @@ 
             $this->teammatch->create($match2); //save to match table
 
 
-            foreach ($matchdata['teamMatchUp3'] as $teamKey => $team){
+            foreach ($matchdata['teamMatchUp3'] as $teamKey => $team) {
                 $matchUp3[] = $this->search($matchdata['player'], 'team', $team);
             }
 
             //Save matchUp 3
-            $match3['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
+            $match3['match_id'] = $matchdata['match_id']; // This is generated below and passed to listener
             $match3['team_id'] = $matchUp3[0][0]['team'];
             $match3['player1'] = $matchUp3[0][0]['player_id'];
             $match3['player2'] = $matchUp3[0][1]['player_id'];
             $match3['opponent'] = $matchUp3[1][0]['team'];
             $this->teammatch->create($match3); //save to match table
 
-            $match3['match_id'] = $matchdata['match_id'];  // This is generated below and passed to listener
+            $match3['match_id'] = $matchdata['match_id']; // This is generated below and passed to listener
             $match3['team_id'] = $matchUp3[1][0]['team'];
             $match3['player1'] = $matchUp3[1][0]['player_id'];
             $match3['player2'] = $matchUp3[1][1]['player_id'];
@@ -188,11 +188,11 @@ 
 
 
         $lowGross = array();
-        foreach ($matchRound as $key => $match){
+        foreach ($matchRound as $key => $match) {
             $lowGross[$match['player']->id] = $match['score'];
         }
         $arrayLowGross = array_keys($lowGross, min($lowGross));
-        foreach($arrayLowGross as $key => $lowgrossPlayer) {
+        foreach ($arrayLowGross as $key => $lowgrossPlayer) {
             $grossWinner = new Grosswinner;
             $grossWinner->player_id = $lowgrossPlayer;
             $grossWinner->match_id = $matchdata['match'];
@@ -203,19 +203,19 @@ 
 
         //Calculate NET winner
         $lowNet = array();
-        $scores =array();
-        foreach ($matchRound as $key => $match){
-            $netScore = ($match['score'] - round($match['player']->handicap,0)); //calculate net score
+        $scores = array();
+        foreach ($matchRound as $key => $match) {
+            $netScore = ($match['score'] - round($match['player']->handicap, 0)); //calculate net score
             $lowNet[$match['player']->id] = $netScore;
         }
         $arrayLowNet = array_keys($lowNet, min($lowNet));
 
-        foreach($arrayLowNet as $key => $lownetPlayer) {
+        foreach ($arrayLowNet as $key => $lownetPlayer) {
             $netWinner = new Netwinner;
             $netWinner->player_id = $lownetPlayer;
             $netWinner->match_id = $matchdata['match'];
             $netWinner->score = $lowNet[$lownetPlayer];
-            $netWinner->money = $this->prizeMoney->getlowScore() /  count($arrayLowNet);
+            $netWinner->money = $this->prizeMoney->getlowScore() / count($arrayLowNet);
             $netWinner->save();
         }
 
@@ -226,25 +226,25 @@ 
         $match = $this->match->find($matchdata['match']);
         $aPlayers = array();
         $bPlayers = array();
-        foreach($match->players as $player)
+        foreach ($match->players as $player)
         {
-            if($player->pivot->level_id == 1){
+            if ($player->pivot->level_id == 1) {
                 $aPlayers[] = $player->pivot->player_id;
 
             }
-            if($player->pivot->level_id == 2){
+            if ($player->pivot->level_id == 2) {
                 $bPlayers[] = $player->pivot->player_id;
             }
         }
 
         //Create Skins arrays
         //player_id, 'holescores'
-        foreach($matchRound as $key => $round) {
-            if (in_array($round->player_id,$aPlayers)){
+        foreach ($matchRound as $key => $round) {
+            if (in_array($round->player_id, $aPlayers)) {
                 $aPlayersSkins[$key]['player_id'] = $round->player_id;
                 $aPlayersSkins[$key]['holescores'] = $round->holescores;
             }
-            if (in_array($round->player_id,$bPlayers)){
+            if (in_array($round->player_id, $bPlayers)) {
                 $bPlayersSkins[$key]['player_id'] = $round->player_id;
                 $bPlayersSkins[$key]['holescores'] = $round->holescores;
             }
@@ -252,19 +252,19 @@ 
 
         //Run A Skins analysis
         $scores = array();
-        foreach($aPlayersSkins as $key => $playerSkin){
-            foreach($playerSkin['holescores'] as $hole => $holescore){
+        foreach ($aPlayersSkins as $key => $playerSkin) {
+            foreach ($playerSkin['holescores'] as $hole => $holescore) {
                 $scores[$holescore['hole_id']][$playerSkin['player_id']] = $holescore['score'];
             }
         }
 
-        foreach($scores as $hole_id => $hole) {
+        foreach ($scores as $hole_id => $hole) {
             $minScore = min($hole);
             $winners[$hole_id] = array_keys($hole, min($hole)); //gets player id of lowest score
         }
         $aSkinsWon = 0;
-        foreach($winners as $key => $winner) {
-            if(count($winner)  ===  1) {
+        foreach ($winners as $key => $winner) {
+            if (count($winner) === 1) {
                 //post to DB
                 $skinWinner = new Skin;
                 $skinWinner->player_id = $winner[0];
@@ -278,19 +278,19 @@ 
 
         //Run B Skins analysis
         $scores = array();
-        foreach($bPlayersSkins as $key => $playerSkin){
-            foreach($playerSkin['holescores'] as $hole => $holescore){
+        foreach ($bPlayersSkins as $key => $playerSkin) {
+            foreach ($playerSkin['holescores'] as $hole => $holescore) {
                 $scores[$holescore['hole_id']][$playerSkin['player_id']] = $holescore['score'];
             }
         }
 
-        foreach($scores as $hole_id => $hole) {
+        foreach ($scores as $hole_id => $hole) {
             $minScore = min($hole);
             $winners[$hole_id] = array_keys($hole, min($hole)); //gets player id of lowest score
         }
         $bSkinsWon = 0;
-        foreach($winners as $key => $winner) {
-            if(count($winner)  ===  1) {
+        foreach ($winners as $key => $winner) {
+            if (count($winner) === 1) {
                 //post to DB
                 $skinWinner = new Skin;
                 $skinWinner->player_id = $winner[0];
@@ -302,34 +302,34 @@ 
             }
         }
 
-        $match =  Match::find($matchdata['match']);
+        $match = Match::find($matchdata['match']);
 
         //Need to add Carry over money if there no skins are won
         //check for carry over money
         $skinsamoney = $match->skinsamoney; // + carryover A money if any
         $skinsbmoney = $match->skinsbmoney; // + carryover B money if any
 
-        if($aSkinsWon > 0) {
+        if ($aSkinsWon > 0) {
             $moneyperskinA = $skinsamoney / $aSkinsWon;
 
             $aSkins = Skin::where('match_id', '=', $matchdata['match'])->where('level_id', '=', 1)->get();
-            foreach ($aSkins as $askin){
+            foreach ($aSkins as $askin) {
                 $askin->money = $moneyperskinA;
                 $askin->save();
             }
         }
 
-        if($bSkinsWon > 0) {
+        if ($bSkinsWon > 0) {
             $moneyperskinB = $skinsbmoney / $bSkinsWon;
 
             $bSkins = Skin::where('match_id', '=', $matchdata['match'])->where('level_id', '=', 2)->get();
-            foreach ($bSkins as $bskin){
+            foreach ($bSkins as $bskin) {
                 $bskin->money = $moneyperskinB;
                 $bskin->save();
             }
         }
         //foreach player in pivot table create player and run handicap analysis
-        foreach($match->players as $matchplayer)
+        foreach ($match->players as $matchplayer)
         {
             $player = Player::find($matchplayer->pivot->player_id);
             $handicap = new Handicap($player);
@@ -350,7 +350,7 @@ 
      */
     public function get($matchid)
     {
-        $matchdata =  $this->matchRepo->get($matchid);
+        $matchdata = $this->matchRepo->get($matchid);
         return $matchdata;
     }
 

Braces +22 added lines, -26 removed lines

@@ -17,8 +17,7 @@ 
 /**
  * Our MatchService, containing all useful methods for business logic around Matches
  */
-class MatchService
-{
+class MatchService {
     // Containing our matchRepository to make all our database calls to
     protected $matchRepo;
 
@@ -67,11 +66,10 @@ 
         $aPlayerCount = 0;
         
         $bPlayerCount = 0;
-        foreach($matchdata['player'] as $player){
-            if ($player['level_id'] == '1'){
+        foreach($matchdata['player'] as $player) {
+            if ($player['level_id'] == '1') {
                 $aPlayerCount++;
-            }
-            else {
+            } else {
                 $bPlayerCount++;
             }
             $totalPlayers++;
@@ -100,9 +98,9 @@ 
         $this->events->fire('match.create', array($matchdata));  // MatchHandler and teamMatchHandler are listening...
 
         // Run for team Matches
-        if($matchdata['matchType'] === 'team' || $matchdata['matchType'] === 'both'){
+        if($matchdata['matchType'] === 'team' || $matchdata['matchType'] === 'both') {
 
-            foreach ($matchdata['teamMatchUp1'] as $teamKey => $team){
+            foreach ($matchdata['teamMatchUp1'] as $teamKey => $team) {
                 $matchUp1[] = $this->search($matchdata['player'], 'team', $team);
             }
 
@@ -122,7 +120,7 @@ 
             $this->teammatch->create($match1); //save to match table
 
 
-            foreach ($matchdata['teamMatchUp2'] as $teamKey => $team){
+            foreach ($matchdata['teamMatchUp2'] as $teamKey => $team) {
                 $matchUp2[] = $this->search($matchdata['player'], 'team', $team);
             }
 
@@ -142,7 +140,7 @@ 
             $this->teammatch->create($match2); //save to match table
 
 
-            foreach ($matchdata['teamMatchUp3'] as $teamKey => $team){
+            foreach ($matchdata['teamMatchUp3'] as $teamKey => $team) {
                 $matchUp3[] = $this->search($matchdata['player'], 'team', $team);
             }
 
@@ -188,7 +186,7 @@ 
 
 
         $lowGross = array();
-        foreach ($matchRound as $key => $match){
+        foreach ($matchRound as $key => $match) {
             $lowGross[$match['player']->id] = $match['score'];
         }
         $arrayLowGross = array_keys($lowGross, min($lowGross));
@@ -204,7 +202,7 @@ 
         //Calculate NET winner
         $lowNet = array();
         $scores =array();
-        foreach ($matchRound as $key => $match){
+        foreach ($matchRound as $key => $match) {
             $netScore = ($match['score'] - round($match['player']->handicap,0)); //calculate net score
             $lowNet[$match['player']->id] = $netScore;
         }
@@ -226,13 +224,12 @@ 
         $match = $this->match->find($matchdata['match']);
         $aPlayers = array();
         $bPlayers = array();
-        foreach($match->players as $player)
-        {
-            if($player->pivot->level_id == 1){
+        foreach($match->players as $player) {
+            if($player->pivot->level_id == 1) {
                 $aPlayers[] = $player->pivot->player_id;
 
             }
-            if($player->pivot->level_id == 2){
+            if($player->pivot->level_id == 2) {
                 $bPlayers[] = $player->pivot->player_id;
             }
         }
@@ -240,11 +237,11 @@ 
         //Create Skins arrays
         //player_id, 'holescores'
         foreach($matchRound as $key => $round) {
-            if (in_array($round->player_id,$aPlayers)){
+            if (in_array($round->player_id,$aPlayers)) {
                 $aPlayersSkins[$key]['player_id'] = $round->player_id;
                 $aPlayersSkins[$key]['holescores'] = $round->holescores;
             }
-            if (in_array($round->player_id,$bPlayers)){
+            if (in_array($round->player_id,$bPlayers)) {
                 $bPlayersSkins[$key]['player_id'] = $round->player_id;
                 $bPlayersSkins[$key]['holescores'] = $round->holescores;
             }
@@ -252,8 +249,8 @@ 
 
         //Run A Skins analysis
         $scores = array();
-        foreach($aPlayersSkins as $key => $playerSkin){
-            foreach($playerSkin['holescores'] as $hole => $holescore){
+        foreach($aPlayersSkins as $key => $playerSkin) {
+            foreach($playerSkin['holescores'] as $hole => $holescore) {
                 $scores[$holescore['hole_id']][$playerSkin['player_id']] = $holescore['score'];
             }
         }
@@ -278,8 +275,8 @@ 
 
         //Run B Skins analysis
         $scores = array();
-        foreach($bPlayersSkins as $key => $playerSkin){
-            foreach($playerSkin['holescores'] as $hole => $holescore){
+        foreach($bPlayersSkins as $key => $playerSkin) {
+            foreach($playerSkin['holescores'] as $hole => $holescore) {
                 $scores[$holescore['hole_id']][$playerSkin['player_id']] = $holescore['score'];
             }
         }
@@ -313,7 +310,7 @@ 
             $moneyperskinA = $skinsamoney / $aSkinsWon;
 
             $aSkins = Skin::where('match_id', '=', $matchdata['match'])->where('level_id', '=', 1)->get();
-            foreach ($aSkins as $askin){
+            foreach ($aSkins as $askin) {
                 $askin->money = $moneyperskinA;
                 $askin->save();
             }
@@ -323,14 +320,13 @@ 
             $moneyperskinB = $skinsbmoney / $bSkinsWon;
 
             $bSkins = Skin::where('match_id', '=', $matchdata['match'])->where('level_id', '=', 2)->get();
-            foreach ($bSkins as $bskin){
+            foreach ($bSkins as $bskin) {
                 $bskin->money = $moneyperskinB;
                 $bskin->save();
             }
         }
         //foreach player in pivot table create player and run handicap analysis
-        foreach($match->players as $matchplayer)
-        {
+        foreach($match->players as $matchplayer) {
             $player = Player::find($matchplayer->pivot->player_id);
             $handicap = new Handicap($player);
             $player->handicap = $handicap->calculate();

app/models/Teammatch.php

Indentation +14 added lines, -14 removed lines

@@ -2,22 +2,22 @@
 
 class Teammatch extends Eloquent {
 
-    protected $table = 'teammatches';
-    protected $fillable = ['match_id', 'team_id', 'player1', 'player2', 'opponent'];
+	protected $table = 'teammatches';
+	protected $fillable = ['match_id', 'team_id', 'player1', 'player2', 'opponent'];
 
-    public function match()
-    {
-        return $this->belongsTo('Match');
-    }
+	public function match()
+	{
+		return $this->belongsTo('Match');
+	}
 
-    public function team()
-    {
-        return $this->belongsTo('Team');
-    }
+	public function team()
+	{
+		return $this->belongsTo('Team');
+	}
 
-    public function player()
-    {
-        return $this->belongsTo('Player');
-    }
+	public function player()
+	{
+		return $this->belongsTo('Player');
+	}
 
 }
\ No newline at end of file

app/routes.php

Indentation +8 added lines, -8 removed lines

@@ -12,20 +12,20 @@
 */
 Route::get('/', function()
 {
-    return Redirect::to('schedule');
+	return Redirect::to('schedule');
 });
 
 Route::get('/test', function()
 {
 
-    $players = new \Player();
-    $players = $players->all();
-    //echo $players;
+	$players = new \Player();
+	$players = $players->all();
+	//echo $players;
    foreach ($players as $player){
-       $handicap = new \GolfLeague\Handicap($player);
-       $player->handicap = $handicap->calculate();
-       echo $player->name . " " . $player->handicap . "<br>";
-       $player->save();
+	   $handicap = new \GolfLeague\Handicap($player);
+	   $player->handicap = $handicap->calculate();
+	   echo $player->name . " " . $player->handicap . "<br>";
+	   $player->save();
    }
 });
 

Spacing +4 added lines, -4 removed lines

@@ -21,10 +21,10 @@ 
     $players = new \Player();
     $players = $players->all();
     //echo $players;
-   foreach ($players as $player){
+   foreach ($players as $player) {
        $handicap = new \GolfLeague\Handicap($player);
        $player->handicap = $handicap->calculate();
-       echo $player->name . " " . $player->handicap . "<br>";
+       echo $player->name." ".$player->handicap."<br>";
        $player->save();
    }
 });
@@ -61,8 +61,8 @@ 
 Route::resource('leaderboard', 'LeaderboardController');
 Route::resource('tournament', 'TournamentController');
 Route::resource('tournamentLeaderboard', 'TournamentLeaderboardController');
-Route::resource('teammatches','TeamMatchesController');
-Route::get('teammatches/points/{year}','TeamMatchesController@getPointsByYear');
+Route::resource('teammatches', 'TeamMatchesController');
+Route::get('teammatches/points/{year}', 'TeamMatchesController@getPointsByYear');
 Route::resource('team', 'TeamController');
 Route::get('team/year/{year}', 'TeamController@findByYear');
 

Braces +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     $players = new \Player();
     $players = $players->all();
     //echo $players;
-   foreach ($players as $player){
+   foreach ($players as $player) {
        $handicap = new \GolfLeague\Handicap($player);
        $player->handicap = $handicap->calculate();
        echo $player->name . " " . $player->handicap . "<br>";

app/controllers/TeamController.php

Indentation +14 added lines, -14 removed lines

@@ -4,13 +4,13 @@ 
 
 class TeamController extends \BaseController {
 
-    private $team;
+	private $team;
 
-    public function __construct(TeamRepo $team)
-    {
-        $this->team = $team;
-    }
-    /**
+	public function __construct(TeamRepo $team)
+	{
+		$this->team = $team;
+	}
+	/**
 	 * Display a listing of the resource.
 	 *
 	 * @return Response
@@ -42,15 +42,15 @@ 
 		//
 	}
 
-    /**
-     * Display a listing of the teams by year .
-     *
-     * @return Response
-     */
+	/**
+	 * Display a listing of the teams by year .
+	 *
+	 * @return Response
+	 */
 	public function findByYear($year)
-    {
-        return $this->team->findByYear($year);
-    }
+	{
+		return $this->team->findByYear($year);
+	}
 
 	/**
 	 * Display the specified resource.

Braces +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
      * @return Response
      */
 	public function findByYear($year)
-    {
+	{
         return $this->team->findByYear($year);
     }
 

app/controllers/MatchesController.php

Indentation +13 added lines, -13 removed lines

@@ -7,11 +7,11 @@ 
 class MatchesController extends \BaseController {
 
 
-    public function __construct(MatchService $match, MatchRepository $matchRepo)
-    {
-        $this->match = $match;
+	public function __construct(MatchService $match, MatchRepository $matchRepo)
+	{
+		$this->match = $match;
 		$this->matchRepo = $matchRepo;
-    }
+	}
 
 	/**
 	 * Display a listing of the resource.
@@ -32,7 +32,7 @@ 
 	public function create()
 	{
 		$view = View::make('creatematch');
-        return $view;
+		return $view;
 	}
 
 	/**
@@ -42,7 +42,7 @@ 
 	 */
 	public function store()
 	{
-	    $input = Input::all();
+		$input = Input::all();
 		return $this->match->create($input);
 	}
 
@@ -67,18 +67,18 @@ 
 	 */
 	public function edit($id)
 	{
-        $enterView = 'EnterTeamMatch';
-	    $data = $this->match->get($id);
-        $view = View::make($enterView, $data);
-        return $view;
+		$enterView = 'EnterTeamMatch';
+		$data = $this->match->get($id);
+		$view = View::make($enterView, $data);
+		return $view;
 		// Logic to allow editable for day of match only
 		$today = Carbon::today();
-        $teamMatchDate = new Carbon('first day of January 2017');
+		$teamMatchDate = new Carbon('first day of January 2017');
 		$matchDate = new Carbon($data['date']);
 
 		if($matchDate >= $teamMatchDate){
-		    $enterView = 'EnterTeamMatch';
-        }
+			$enterView = 'EnterTeamMatch';
+		}
 
 		if($today <= $matchDate){
 			//Show Editable View

Spacing +2 added lines, -2 removed lines

@@ -76,11 +76,11 @@
         $teamMatchDate = new Carbon('first day of January 2017');
 		$matchDate = new Carbon($data['date']);
 
-		if($matchDate >= $teamMatchDate){
+		if ($matchDate >= $teamMatchDate) {
 		    $enterView = 'EnterTeamMatch';
         }
 
-		if($today <= $matchDate){
+		if ($today <= $matchDate) {
 			//Show Editable View
 			$view = View::make($enterView, $data);
 			return $view;

Braces +3 added lines, -4 removed lines

@@ -76,16 +76,15 @@
         $teamMatchDate = new Carbon('first day of January 2017');
 		$matchDate = new Carbon($data['date']);
 
-		if($matchDate >= $teamMatchDate){
+		if($matchDate >= $teamMatchDate) {
 		    $enterView = 'EnterTeamMatch';
         }
 
-		if($today <= $matchDate){
+		if($today <= $matchDate) {
 			//Show Editable View
 			$view = View::make($enterView, $data);
 			return $view;
-		}
-		else {
+		} else {
 			//Show Readonly View
 			$view = View::make('ViewMatch', $data);
 			return $view;

app/controllers/TeamMatchesController.php

Indentation +213 added lines, -213 removed lines

@@ -6,14 +6,14 @@ 
 
 class TeamMatchesController extends \BaseController {
 
-    public function __construct(MatchService $match, MatchRoundRepository $matchRoundRepo, TeamMatchesRepository $teamMatchesRepository)
-    {
-        $this->match = $match;
-        $this->matchRoundRepo = $matchRoundRepo;
-        $this->teamMatchesRepo = $teamMatchesRepository;
-    }
-
-    /**
+	public function __construct(MatchService $match, MatchRoundRepository $matchRoundRepo, TeamMatchesRepository $teamMatchesRepository)
+	{
+		$this->match = $match;
+		$this->matchRoundRepo = $matchRoundRepo;
+		$this->teamMatchesRepo = $teamMatchesRepository;
+	}
+
+	/**
 	 * Display a listing of the resource.
 	 *
 	 * @return Response
@@ -56,204 +56,204 @@ 
 	{
 
 
-        $group = Input::get('group');
-
-
-        $groupPlayers = $this->matchRoundRepo->matchGroup($id, $group);
-
-        //Create Player data
-        $matchUp = array();
-        foreach($groupPlayers as $key=>$groupPlayer){
-            $matchUp[$key]['player'] = $groupPlayer->pivot->player_id;
-            $matchUp[$key]['matchHandicap'] = round($groupPlayer->pivot->handicap ,0);
-            foreach ($groupPlayer->round as $round){
-                $matchUp[$key]['team'] = $round->team_id;
-                $matchUp[$key]['course'] = $round->course_id;
-                $matchUp[$key]['holescores'] = $round->holescores;
-            }
-
-        }
-
-        // Change lowest handicap to ZERO and change others to reflect it
-            foreach($matchUp as $key=>$match){
-                $matchHandicaps[] = $match['matchHandicap'];
-            }
-            $lowestMatchHandicap = min($matchHandicaps);
-            //handicap change
-            $handicapChange = $lowestMatchHandicap * -1;
-            foreach($matchUp as $key=>$match){
-                $matchUp[$key]['matchHandicap'] = $match['matchHandicap'] + $handicapChange;
-            }
-
-        // Separate two teams
-            $team1 = array(array_shift ($matchUp));
-            $team1Id = $team1[0]['team'];
-            $team1Name = Team::select('name')->where('id', '=', $team1Id)->get()->toArray();
-            foreach($matchUp as $key=>$match){
-                if($match['team'] == $team1[0]['team']){
-                    $team1[] = $match;
-                    unset($matchUp[$key]);
-                }
-            }
-            $team2 = $matchUp;
-            $team2Id = $team2[1]['team'];
-            $team2Name = Team::select('name')->where('id', '=', $team2Id)->get()->toArray();
-
-            $holesData = Hole::select('handicap')->where('course_id', '=', $team1[0]['course'])->get();
-
-            $team1Scores = $this->getTeamNetScore($team1, $holesData);
-            //return $team1Scores;
-            $team2Scores = $this->getTeamNetScore($team2, $holesData);
-
-            $team1Points = $this->calculatePoints($team1Scores, $team2Scores);
-            $team2Points = $this->calculatePoints($team2Scores, $team1Scores);
-
-            //Save Points in Teammatches
-            Teammatch::where('match_id', '=', $id)->where('team_id', '=', $team1Id)->update(array('pointsWon' => $team1Points));
-            Teammatch::where('match_id', '=', $id)->where('team_id', '=', $team2Id)->update(array('pointsWon' => $team2Points));
-
-
-        //Need to determine if same amount of scores are in both
-        // If not then do not return
-
-            foreach($team1Scores as $key=>$teamScore){
-                if($teamScore <= 0){
-                    $team1Scores[$key] = '';
-                }
-            }
-
-        foreach($team2Scores as $key=>$teamScore){
-            if($teamScore <= 0){
-                $team2Scores[$key] = '';
-            }
-        }
-
-        $team[0] = [
-            "team" =>  $team1Name[0]['name'],
-            "hole1" => $team1Scores[0],
-            "hole2" => $team1Scores[1],
-            "hole3" => $team1Scores[2],
-            "hole4" => $team1Scores[3],
-            "hole5" => $team1Scores[4],
-            "hole6" => $team1Scores[5],
-            "hole7" => $team1Scores[6],
-            "hole8" => $team1Scores[7],
-            "hole9" => $team1Scores[8],
-            "points" =>$team1Points
-        ];
-
-        $team[1] = [
-            "team" =>  $team2Name[0]['name'],
-            "hole1" => $team2Scores[0],
-            "hole2" => $team2Scores[1],
-            "hole3" => $team2Scores[2],
-            "hole4" => $team2Scores[3],
-            "hole5" => $team2Scores[4],
-            "hole6" => $team2Scores[5],
-            "hole7" => $team2Scores[6],
-            "hole8" => $team2Scores[7],
-            "hole9" => $team2Scores[8],
-            "points" => $team2Points
-        ];
-
-        $data['data'] = $team;
-        return $data;
+		$group = Input::get('group');
+
+
+		$groupPlayers = $this->matchRoundRepo->matchGroup($id, $group);
+
+		//Create Player data
+		$matchUp = array();
+		foreach($groupPlayers as $key=>$groupPlayer){
+			$matchUp[$key]['player'] = $groupPlayer->pivot->player_id;
+			$matchUp[$key]['matchHandicap'] = round($groupPlayer->pivot->handicap ,0);
+			foreach ($groupPlayer->round as $round){
+				$matchUp[$key]['team'] = $round->team_id;
+				$matchUp[$key]['course'] = $round->course_id;
+				$matchUp[$key]['holescores'] = $round->holescores;
+			}
+
+		}
+
+		// Change lowest handicap to ZERO and change others to reflect it
+			foreach($matchUp as $key=>$match){
+				$matchHandicaps[] = $match['matchHandicap'];
+			}
+			$lowestMatchHandicap = min($matchHandicaps);
+			//handicap change
+			$handicapChange = $lowestMatchHandicap * -1;
+			foreach($matchUp as $key=>$match){
+				$matchUp[$key]['matchHandicap'] = $match['matchHandicap'] + $handicapChange;
+			}
+
+		// Separate two teams
+			$team1 = array(array_shift ($matchUp));
+			$team1Id = $team1[0]['team'];
+			$team1Name = Team::select('name')->where('id', '=', $team1Id)->get()->toArray();
+			foreach($matchUp as $key=>$match){
+				if($match['team'] == $team1[0]['team']){
+					$team1[] = $match;
+					unset($matchUp[$key]);
+				}
+			}
+			$team2 = $matchUp;
+			$team2Id = $team2[1]['team'];
+			$team2Name = Team::select('name')->where('id', '=', $team2Id)->get()->toArray();
+
+			$holesData = Hole::select('handicap')->where('course_id', '=', $team1[0]['course'])->get();
+
+			$team1Scores = $this->getTeamNetScore($team1, $holesData);
+			//return $team1Scores;
+			$team2Scores = $this->getTeamNetScore($team2, $holesData);
+
+			$team1Points = $this->calculatePoints($team1Scores, $team2Scores);
+			$team2Points = $this->calculatePoints($team2Scores, $team1Scores);
+
+			//Save Points in Teammatches
+			Teammatch::where('match_id', '=', $id)->where('team_id', '=', $team1Id)->update(array('pointsWon' => $team1Points));
+			Teammatch::where('match_id', '=', $id)->where('team_id', '=', $team2Id)->update(array('pointsWon' => $team2Points));
+
+
+		//Need to determine if same amount of scores are in both
+		// If not then do not return
+
+			foreach($team1Scores as $key=>$teamScore){
+				if($teamScore <= 0){
+					$team1Scores[$key] = '';
+				}
+			}
+
+		foreach($team2Scores as $key=>$teamScore){
+			if($teamScore <= 0){
+				$team2Scores[$key] = '';
+			}
+		}
+
+		$team[0] = [
+			"team" =>  $team1Name[0]['name'],
+			"hole1" => $team1Scores[0],
+			"hole2" => $team1Scores[1],
+			"hole3" => $team1Scores[2],
+			"hole4" => $team1Scores[3],
+			"hole5" => $team1Scores[4],
+			"hole6" => $team1Scores[5],
+			"hole7" => $team1Scores[6],
+			"hole8" => $team1Scores[7],
+			"hole9" => $team1Scores[8],
+			"points" =>$team1Points
+		];
+
+		$team[1] = [
+			"team" =>  $team2Name[0]['name'],
+			"hole1" => $team2Scores[0],
+			"hole2" => $team2Scores[1],
+			"hole3" => $team2Scores[2],
+			"hole4" => $team2Scores[3],
+			"hole5" => $team2Scores[4],
+			"hole6" => $team2Scores[5],
+			"hole7" => $team2Scores[6],
+			"hole8" => $team2Scores[7],
+			"hole9" => $team2Scores[8],
+			"points" => $team2Points
+		];
+
+		$data['data'] = $team;
+		return $data;
 	}
 
-    private function getTeamNetScore($team, $holesData)
-    {
-        foreach($team as $key=>$item){
-            // Create holes array for NET
-            $holes = array();
-            $i = 1;
-            foreach($holesData as $key=>$holeData){
-                $holes[$i] = $holeData->handicap;
-                $i++;
-            }
-
-            // Create stroke array - how many to take away from score
-            $strokeArray = [
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 0,
-                9 => 0
-            ];
-            //Create array of strokes
-            for($counter = $item['matchHandicap']; $counter > 0; $counter--){
-                if($counter > 9){
-                    $newCounter = $counter - 9;
-                    while($newCounter > 0) {
-                        $strokeArray[$newCounter] = $strokeArray[$newCounter] + 1;
-                        $counter--;
-                        $newCounter--;
-                    }
-                }
-                $strokeArray[$counter] = $strokeArray[$counter] + 1;
-            }
-            // Plus handicaps don't hit previous loop so need its own
-            //Plus handicap logic
-
-            foreach($strokeArray as $strokeKey=>$stroke){
-                $holeKey = array_search($strokeKey,$holes);
-                $holes[$holeKey] = $stroke;
-            }
-
-            ///now have array of strokes to subtract
-            //get array of holescores
-
-            $holeScores = $item['holescores'];
-            foreach($holeScores as $key=>$holeScore){
-                //check if new score is less PlayerScores
-                if(isset($playerScores[$key])){ // 2nd time in for hole
-                    if($playerScores[$key] >= $holeScore['score']){
-                        $playerScores[$key] = $holeScore['score'] - $holes[$key+1];
-                    }
-                } else{ // first time in for hole
-                    if($holeScore['score'] != null){
-                        $playerScores[$key] = $holeScore['score'] - $holes[$key+1];
-                    } else{
-                        $playerScores[$key] = null;
-                    }
-                }
-            }
-
-        }
-        return $playerScores;
-    }
-
-    private function calculatePoints($team, $opponent)
-    {
-        $points = 0;
-        $teamTotalScore = 0;
-        $opponentTotalScore = 0;
-        foreach ($team as $key=>$score){
-            if($score != null){
-                if($score < $opponent[$key]){
-                    $points++;
-                }
-                if($score == $opponent[$key]){
-                    $points = $points + .5;
-                }
-            }
-            $teamTotalScore = $teamTotalScore + $score;
-            $opponentTotalScore = $opponentTotalScore + $score;
-        }
-        // Bonus point logic
-        if($team[8] != null && $opponent[8] != null){
-            if($teamTotalScore > $opponentTotalScore){
-                $points = $points + 1;
-            }
-            if($teamTotalScore = $opponentTotalScore){
-                $points = $points + .5;
-            }
-        }
-        return $points;
-    }
+	private function getTeamNetScore($team, $holesData)
+	{
+		foreach($team as $key=>$item){
+			// Create holes array for NET
+			$holes = array();
+			$i = 1;
+			foreach($holesData as $key=>$holeData){
+				$holes[$i] = $holeData->handicap;
+				$i++;
+			}
+
+			// Create stroke array - how many to take away from score
+			$strokeArray = [
+				1 => 0,
+				2 => 0,
+				3 => 0,
+				4 => 0,
+				5 => 0,
+				6 => 0,
+				7 => 0,
+				8 => 0,
+				9 => 0
+			];
+			//Create array of strokes
+			for($counter = $item['matchHandicap']; $counter > 0; $counter--){
+				if($counter > 9){
+					$newCounter = $counter - 9;
+					while($newCounter > 0) {
+						$strokeArray[$newCounter] = $strokeArray[$newCounter] + 1;
+						$counter--;
+						$newCounter--;
+					}
+				}
+				$strokeArray[$counter] = $strokeArray[$counter] + 1;
+			}
+			// Plus handicaps don't hit previous loop so need its own
+			//Plus handicap logic
+
+			foreach($strokeArray as $strokeKey=>$stroke){
+				$holeKey = array_search($strokeKey,$holes);
+				$holes[$holeKey] = $stroke;
+			}
+
+			///now have array of strokes to subtract
+			//get array of holescores
+
+			$holeScores = $item['holescores'];
+			foreach($holeScores as $key=>$holeScore){
+				//check if new score is less PlayerScores
+				if(isset($playerScores[$key])){ // 2nd time in for hole
+					if($playerScores[$key] >= $holeScore['score']){
+						$playerScores[$key] = $holeScore['score'] - $holes[$key+1];
+					}
+				} else{ // first time in for hole
+					if($holeScore['score'] != null){
+						$playerScores[$key] = $holeScore['score'] - $holes[$key+1];
+					} else{
+						$playerScores[$key] = null;
+					}
+				}
+			}
+
+		}
+		return $playerScores;
+	}
+
+	private function calculatePoints($team, $opponent)
+	{
+		$points = 0;
+		$teamTotalScore = 0;
+		$opponentTotalScore = 0;
+		foreach ($team as $key=>$score){
+			if($score != null){
+				if($score < $opponent[$key]){
+					$points++;
+				}
+				if($score == $opponent[$key]){
+					$points = $points + .5;
+				}
+			}
+			$teamTotalScore = $teamTotalScore + $score;
+			$opponentTotalScore = $opponentTotalScore + $score;
+		}
+		// Bonus point logic
+		if($team[8] != null && $opponent[8] != null){
+			if($teamTotalScore > $opponentTotalScore){
+				$points = $points + 1;
+			}
+			if($teamTotalScore = $opponentTotalScore){
+				$points = $points + .5;
+			}
+		}
+		return $points;
+	}
 
 	/**
 	 * Show the form for editing the specified resource.
@@ -291,15 +291,15 @@ 
 	}
 
 	public function getPointsByYear($year)
-    {
-        $teamMatches = Teammatch::select('team_id','pointsWon')->whereYear('created_at', '=', $year)->with('team')->get();
-        foreach ($teamMatches as $key=>$teamMatch) {
-            $pointsData[$key]['name'] = $teamMatch['team']['name'];
-            $pointsData[$key]['points'] = $teamMatch['pointsWon'];
-        }
-        $data['data'] = $pointsData;
-        return $data;
-    }
+	{
+		$teamMatches = Teammatch::select('team_id','pointsWon')->whereYear('created_at', '=', $year)->with('team')->get();
+		foreach ($teamMatches as $key=>$teamMatch) {
+			$pointsData[$key]['name'] = $teamMatch['team']['name'];
+			$pointsData[$key]['points'] = $teamMatch['pointsWon'];
+		}
+		$data['data'] = $pointsData;
+		return $data;
+	}
 
 
 }

Spacing +35 added lines, -35 removed lines

@@ -63,10 +63,10 @@ 
 
         //Create Player data
         $matchUp = array();
-        foreach($groupPlayers as $key=>$groupPlayer){
+        foreach ($groupPlayers as $key=>$groupPlayer) {
             $matchUp[$key]['player'] = $groupPlayer->pivot->player_id;
-            $matchUp[$key]['matchHandicap'] = round($groupPlayer->pivot->handicap ,0);
-            foreach ($groupPlayer->round as $round){
+            $matchUp[$key]['matchHandicap'] = round($groupPlayer->pivot->handicap, 0);
+            foreach ($groupPlayer->round as $round) {
                 $matchUp[$key]['team'] = $round->team_id;
                 $matchUp[$key]['course'] = $round->course_id;
                 $matchUp[$key]['holescores'] = $round->holescores;
@@ -75,22 +75,22 @@ 
         }
 
         // Change lowest handicap to ZERO and change others to reflect it
-            foreach($matchUp as $key=>$match){
+            foreach ($matchUp as $key=>$match) {
                 $matchHandicaps[] = $match['matchHandicap'];
             }
             $lowestMatchHandicap = min($matchHandicaps);
             //handicap change
             $handicapChange = $lowestMatchHandicap * -1;
-            foreach($matchUp as $key=>$match){
+            foreach ($matchUp as $key=>$match) {
                 $matchUp[$key]['matchHandicap'] = $match['matchHandicap'] + $handicapChange;
             }
 
         // Separate two teams
-            $team1 = array(array_shift ($matchUp));
+            $team1 = array(array_shift($matchUp));
             $team1Id = $team1[0]['team'];
             $team1Name = Team::select('name')->where('id', '=', $team1Id)->get()->toArray();
-            foreach($matchUp as $key=>$match){
-                if($match['team'] == $team1[0]['team']){
+            foreach ($matchUp as $key=>$match) {
+                if ($match['team'] == $team1[0]['team']) {
                     $team1[] = $match;
                     unset($matchUp[$key]);
                 }
@@ -116,14 +116,14 @@ 
         //Need to determine if same amount of scores are in both
         // If not then do not return
 
-            foreach($team1Scores as $key=>$teamScore){
-                if($teamScore <= 0){
+            foreach ($team1Scores as $key=>$teamScore) {
+                if ($teamScore <= 0) {
                     $team1Scores[$key] = '';
                 }
             }
 
-        foreach($team2Scores as $key=>$teamScore){
-            if($teamScore <= 0){
+        foreach ($team2Scores as $key=>$teamScore) {
+            if ($teamScore <= 0) {
                 $team2Scores[$key] = '';
             }
         }
@@ -162,11 +162,11 @@ 
 
     private function getTeamNetScore($team, $holesData)
     {
-        foreach($team as $key=>$item){
+        foreach ($team as $key=>$item) {
             // Create holes array for NET
             $holes = array();
             $i = 1;
-            foreach($holesData as $key=>$holeData){
+            foreach ($holesData as $key=>$holeData) {
                 $holes[$i] = $holeData->handicap;
                 $i++;
             }
@@ -184,10 +184,10 @@ 
                 9 => 0
             ];
             //Create array of strokes
-            for($counter = $item['matchHandicap']; $counter > 0; $counter--){
-                if($counter > 9){
+            for ($counter = $item['matchHandicap']; $counter > 0; $counter--) {
+                if ($counter > 9) {
                     $newCounter = $counter - 9;
-                    while($newCounter > 0) {
+                    while ($newCounter > 0) {
                         $strokeArray[$newCounter] = $strokeArray[$newCounter] + 1;
                         $counter--;
                         $newCounter--;
@@ -198,8 +198,8 @@ 
             // Plus handicaps don't hit previous loop so need its own
             //Plus handicap logic
 
-            foreach($strokeArray as $strokeKey=>$stroke){
-                $holeKey = array_search($strokeKey,$holes);
+            foreach ($strokeArray as $strokeKey=>$stroke) {
+                $holeKey = array_search($strokeKey, $holes);
                 $holes[$holeKey] = $stroke;
             }
 
@@ -207,16 +207,16 @@ 
             //get array of holescores
 
             $holeScores = $item['holescores'];
-            foreach($holeScores as $key=>$holeScore){
+            foreach ($holeScores as $key=>$holeScore) {
                 //check if new score is less PlayerScores
-                if(isset($playerScores[$key])){ // 2nd time in for hole
-                    if($playerScores[$key] >= $holeScore['score']){
-                        $playerScores[$key] = $holeScore['score'] - $holes[$key+1];
+                if (isset($playerScores[$key])) { // 2nd time in for hole
+                    if ($playerScores[$key] >= $holeScore['score']) {
+                        $playerScores[$key] = $holeScore['score'] - $holes[$key + 1];
                     }
-                } else{ // first time in for hole
-                    if($holeScore['score'] != null){
-                        $playerScores[$key] = $holeScore['score'] - $holes[$key+1];
-                    } else{
+                } else { // first time in for hole
+                    if ($holeScore['score'] != null) {
+                        $playerScores[$key] = $holeScore['score'] - $holes[$key + 1];
+                    } else {
                         $playerScores[$key] = null;
                     }
                 }
@@ -231,12 +231,12 @@ 
         $points = 0;
         $teamTotalScore = 0;
         $opponentTotalScore = 0;
-        foreach ($team as $key=>$score){
-            if($score != null){
-                if($score < $opponent[$key]){
+        foreach ($team as $key=>$score) {
+            if ($score != null) {
+                if ($score < $opponent[$key]) {
                     $points++;
                 }
-                if($score == $opponent[$key]){
+                if ($score == $opponent[$key]) {
                     $points = $points + .5;
                 }
             }
@@ -244,11 +244,11 @@ 
             $opponentTotalScore = $opponentTotalScore + $score;
         }
         // Bonus point logic
-        if($team[8] != null && $opponent[8] != null){
-            if($teamTotalScore > $opponentTotalScore){
+        if ($team[8] != null && $opponent[8] != null) {
+            if ($teamTotalScore > $opponentTotalScore) {
                 $points = $points + 1;
             }
-            if($teamTotalScore = $opponentTotalScore){
+            if ($teamTotalScore = $opponentTotalScore) {
                 $points = $points + .5;
             }
         }
@@ -292,7 +292,7 @@ 
 
 	public function getPointsByYear($year)
     {
-        $teamMatches = Teammatch::select('team_id','pointsWon')->whereYear('created_at', '=', $year)->with('team')->get();
+        $teamMatches = Teammatch::select('team_id', 'pointsWon')->whereYear('created_at', '=', $year)->with('team')->get();
         foreach ($teamMatches as $key=>$teamMatch) {
             $pointsData[$key]['name'] = $teamMatch['team']['name'];
             $pointsData[$key]['points'] = $teamMatch['pointsWon'];

Braces +31 added lines, -29 removed lines

@@ -63,10 +63,10 @@ 
 
         //Create Player data
         $matchUp = array();
-        foreach($groupPlayers as $key=>$groupPlayer){
+        foreach($groupPlayers as $key=>$groupPlayer) {
             $matchUp[$key]['player'] = $groupPlayer->pivot->player_id;
             $matchUp[$key]['matchHandicap'] = round($groupPlayer->pivot->handicap ,0);
-            foreach ($groupPlayer->round as $round){
+            foreach ($groupPlayer->round as $round) {
                 $matchUp[$key]['team'] = $round->team_id;
                 $matchUp[$key]['course'] = $round->course_id;
                 $matchUp[$key]['holescores'] = $round->holescores;
@@ -75,13 +75,13 @@ 
         }
 
         // Change lowest handicap to ZERO and change others to reflect it
-            foreach($matchUp as $key=>$match){
+            foreach($matchUp as $key=>$match) {
                 $matchHandicaps[] = $match['matchHandicap'];
             }
             $lowestMatchHandicap = min($matchHandicaps);
             //handicap change
             $handicapChange = $lowestMatchHandicap * -1;
-            foreach($matchUp as $key=>$match){
+            foreach($matchUp as $key=>$match) {
                 $matchUp[$key]['matchHandicap'] = $match['matchHandicap'] + $handicapChange;
             }
 
@@ -89,8 +89,8 @@ 
             $team1 = array(array_shift ($matchUp));
             $team1Id = $team1[0]['team'];
             $team1Name = Team::select('name')->where('id', '=', $team1Id)->get()->toArray();
-            foreach($matchUp as $key=>$match){
-                if($match['team'] == $team1[0]['team']){
+            foreach($matchUp as $key=>$match) {
+                if($match['team'] == $team1[0]['team']) {
                     $team1[] = $match;
                     unset($matchUp[$key]);
                 }
@@ -116,14 +116,14 @@ 
         //Need to determine if same amount of scores are in both
         // If not then do not return
 
-            foreach($team1Scores as $key=>$teamScore){
-                if($teamScore <= 0){
+            foreach($team1Scores as $key=>$teamScore) {
+                if($teamScore <= 0) {
                     $team1Scores[$key] = '';
                 }
             }
 
-        foreach($team2Scores as $key=>$teamScore){
-            if($teamScore <= 0){
+        foreach($team2Scores as $key=>$teamScore) {
+            if($teamScore <= 0) {
                 $team2Scores[$key] = '';
             }
         }
@@ -162,11 +162,11 @@ 
 
     private function getTeamNetScore($team, $holesData)
     {
-        foreach($team as $key=>$item){
+        foreach($team as $key=>$item) {
             // Create holes array for NET
             $holes = array();
             $i = 1;
-            foreach($holesData as $key=>$holeData){
+            foreach($holesData as $key=>$holeData) {
                 $holes[$i] = $holeData->handicap;
                 $i++;
             }
@@ -184,8 +184,8 @@ 
                 9 => 0
             ];
             //Create array of strokes
-            for($counter = $item['matchHandicap']; $counter > 0; $counter--){
-                if($counter > 9){
+            for($counter = $item['matchHandicap']; $counter > 0; $counter--) {
+                if($counter > 9) {
                     $newCounter = $counter - 9;
                     while($newCounter > 0) {
                         $strokeArray[$newCounter] = $strokeArray[$newCounter] + 1;
@@ -198,7 +198,7 @@ 
             // Plus handicaps don't hit previous loop so need its own
             //Plus handicap logic
 
-            foreach($strokeArray as $strokeKey=>$stroke){
+            foreach($strokeArray as $strokeKey=>$stroke) {
                 $holeKey = array_search($strokeKey,$holes);
                 $holes[$holeKey] = $stroke;
             }
@@ -207,16 +207,18 @@ 
             //get array of holescores
 
             $holeScores = $item['holescores'];
-            foreach($holeScores as $key=>$holeScore){
+            foreach($holeScores as $key=>$holeScore) {
                 //check if new score is less PlayerScores
-                if(isset($playerScores[$key])){ // 2nd time in for hole
-                    if($playerScores[$key] >= $holeScore['score']){
+                if(isset($playerScores[$key])) {
+// 2nd time in for hole
+                    if($playerScores[$key] >= $holeScore['score']) {
                         $playerScores[$key] = $holeScore['score'] - $holes[$key+1];
                     }
-                } else{ // first time in for hole
-                    if($holeScore['score'] != null){
+                } else {
+// first time in for hole
+                    if($holeScore['score'] != null) {
                         $playerScores[$key] = $holeScore['score'] - $holes[$key+1];
-                    } else{
+                    } else {
                         $playerScores[$key] = null;
                     }
                 }
@@ -231,12 +233,12 @@ 
         $points = 0;
         $teamTotalScore = 0;
         $opponentTotalScore = 0;
-        foreach ($team as $key=>$score){
-            if($score != null){
-                if($score < $opponent[$key]){
+        foreach ($team as $key=>$score) {
+            if($score != null) {
+                if($score < $opponent[$key]) {
                     $points++;
                 }
-                if($score == $opponent[$key]){
+                if($score == $opponent[$key]) {
                     $points = $points + .5;
                 }
             }
@@ -244,11 +246,11 @@ 
             $opponentTotalScore = $opponentTotalScore + $score;
         }
         // Bonus point logic
-        if($team[8] != null && $opponent[8] != null){
-            if($teamTotalScore > $opponentTotalScore){
+        if($team[8] != null && $opponent[8] != null) {
+            if($teamTotalScore > $opponentTotalScore) {
                 $points = $points + 1;
             }
-            if($teamTotalScore = $opponentTotalScore){
+            if($teamTotalScore = $opponentTotalScore) {
                 $points = $points + .5;
             }
         }
@@ -291,7 +293,7 @@ 
 	}
 
 	public function getPointsByYear($year)
-    {
+	{
         $teamMatches = Teammatch::select('team_id','pointsWon')->whereYear('created_at', '=', $year)->with('team')->get();
         foreach ($teamMatches as $key=>$teamMatch) {
             $pointsData[$key]['name'] = $teamMatch['team']['name'];

app/library/Storage/EloquentRepositories/EloquentTeamRepository.php

Indentation +32 added lines, -32 removed lines

@@ -4,37 +4,37 @@
 
 class EloquentTeamRepository implements TeamRepository
 {
-    private $team;
-
-    public function __construct(Team $team)
-    {
-        $this->team = $team;
-    }
-
-    public function all()
-    {
-        return $this->team->all();
-    }
-    public function findById($id)
-    {
-        return $this->team->where('id', '=', $id)->get();
-    }
-
-    public function findByYear($year)
-    {
-        return $this->team->whereYear('created_at', '=', $year)->get();
-    }
-
-    public function create($input)
-    {
-        $this->team->create($input);
-    }
-
-    public function update($team)
-    {
-        $updateTeam = $this->team->where('id', '=', $id)->get();
-        $updateTeam = $team;
-        $updateTeam->save();
-    }
+	private $team;
+
+	public function __construct(Team $team)
+	{
+		$this->team = $team;
+	}
+
+	public function all()
+	{
+		return $this->team->all();
+	}
+	public function findById($id)
+	{
+		return $this->team->where('id', '=', $id)->get();
+	}
+
+	public function findByYear($year)
+	{
+		return $this->team->whereYear('created_at', '=', $year)->get();
+	}
+
+	public function create($input)
+	{
+		$this->team->create($input);
+	}
+
+	public function update($team)
+	{
+		$updateTeam = $this->team->where('id', '=', $id)->get();
+		$updateTeam = $team;
+		$updateTeam->save();
+	}
 
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 use \Team as Team;
 
-class EloquentTeamRepository implements TeamRepository
-{
+class EloquentTeamRepository implements TeamRepository {
     private $team;
 
     public function __construct(Team $team)

app/library/Storage/EloquentRepositories/EloquentTeamMatchesRepository.php

Indentation +31 added lines, -31 removed lines

@@ -14,35 +14,35 @@
 
 class EloquentTeamMatchesRepository implements TeamMatchesRepository
 {
-    private $teamMatch;
-
-    public function __construct(Teammatch $teamMatch)
-    {
-        $this->teamMatch = $teamMatch;
-    }
-
-    public function all()
-    {
-        // TODO: Implement all() method.
-    }
-
-    public function findById($id)
-    {
-        // TODO: Implement findById() method.
-    }
-
-    public function create($input)
-    {
-        // TODO: Implement create() method.
-    }
-
-    public function update($team)
-    {
-        // TODO: Implement update() method.
-    }
-
-    public function getByMatch($matchId)
-    {
-        return $this->teamMatch->where('match_id', '=', $matchId)->get();
-    }
+	private $teamMatch;
+
+	public function __construct(Teammatch $teamMatch)
+	{
+		$this->teamMatch = $teamMatch;
+	}
+
+	public function all()
+	{
+		// TODO: Implement all() method.
+	}
+
+	public function findById($id)
+	{
+		// TODO: Implement findById() method.
+	}
+
+	public function create($input)
+	{
+		// TODO: Implement create() method.
+	}
+
+	public function update($team)
+	{
+		// TODO: Implement update() method.
+	}
+
+	public function getByMatch($matchId)
+	{
+		return $this->teamMatch->where('match_id', '=', $matchId)->get();
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
 
 use GolfLeague\Storage\Team\TeamMatchesRepository;
 
-class EloquentTeamMatchesRepository implements TeamMatchesRepository
-{
+class EloquentTeamMatchesRepository implements TeamMatchesRepository {
     private $teamMatch;
 
     public function __construct(Teammatch $teamMatch)

app/library/Storage/TeamRepository.php

Indentation +5 added lines, -5 removed lines

@@ -4,9 +4,9 @@
 
 interface TeamRepository {
 
-    public function all();
-    public function findById($id);
-    public function findByYear($year);
-    public function create($input);
-    public function update($team);
+	public function all();
+	public function findById($id);
+	public function findByYear($year);
+	public function create($input);
+	public function update($team);
 }
\ No newline at end of file