vikkio88 / dsManager-php

api/tests/ModelsTest.php

Spacing +11 added lines, -11 removed lines

@@ -65,7 +65,7 @@ 
 		$team = $rndF->getTeam();

 

 		//var_dump($team->toArray());

-		echo "\n" . $team->name . " avg:";

+		echo "\n".$team->name." avg:";

 		echo $team->getAvgSkill();

 

 		echo "\n Adding player:";

@@ -98,8 +98,8 @@ 
 		for ($i = 1; $i <= 20; $i++) {

 			echo "\n\n-------------";

 			$team = $rndF->getTeam();

-			echo "\n team: " . $team->name;

-			echo "\n nat:  " . $team->nationality;

+			echo "\n team: ".$team->name;

+			echo "\n nat:  ".$team->nationality;

 			echo "\n skill avg: ";

 			echo $team->getAvgSkill();

 			echo "\n age avg: ";

@@ -118,9 +118,9 @@ 
 			$rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");

 			$italian = $rndF->getTeam();

 

-			echo "\n" . $italian->name . "(" . $italian->getAvgSkill() . ") - " . $spanish->name . "(" . $spanish->getAvgSkill() . ") ...... ";

+			echo "\n".$italian->name."(".$italian->getAvgSkill().") - ".$spanish->name."(".$spanish->getAvgSkill().") ...... ";

 			$result = (new \App\Lib\DsManager\Models\Match($italian, $spanish))->simulate()->toArray();

-			echo $result['goalHome'] . " - " . $result['goalAway'];

+			echo $result['goalHome']." - ".$result['goalAway'];

 			echo "\n\n";

 		}

 

@@ -146,9 +146,9 @@ 
 			$rndF = new \App\Lib\DsManager\Helpers\RandomFiller($randomLocale);

 			$opponent = $rndF->getTeam();

 

-			echo "\n" . $opponent->name . "(" . $opponent->getAvgSkill() . ") - " . $myTeam->name . "(" . $myTeam->getAvgSkill() . ") ...... ";

+			echo "\n".$opponent->name."(".$opponent->getAvgSkill().") - ".$myTeam->name."(".$myTeam->getAvgSkill().") ...... ";

 			$result = (new \App\Lib\DsManager\Models\Match($opponent, $myTeam))->simulate()->toArray();

-			echo $result['goalHome'] . " - " . $result['goalAway'];

+			echo $result['goalHome']." - ".$result['goalAway'];

 			$result = $result['info'];

 			if (!$result['isDraw']) {

 				if ($result['winner']->name == $myTeam->name) {

@@ -178,10 +178,10 @@ 
 		$modules = array_keys($modules);

 		foreach ($modules as $mod) {

 			$module = new \App\Lib\DsManager\Models\Module($mod);

-			echo "\n------------\n\n" . $module;

-			echo "\nD: " . $module->isDefensive();

-			echo "\nB: " . $module->isBalanced();

-			echo "\nO: " . $module->isOffensive();

+			echo "\n------------\n\n".$module;

+			echo "\nD: ".$module->isDefensive();

+			echo "\nB: ".$module->isBalanced();

+			echo "\nO: ".$module->isOffensive();

 			echo "\n";

 			print_r($module->getRoleNeeded());

 			echo "\napplicable? ";

api/tests/ModuleConfigurationTest.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 			$this->assertNotEmpty($module["roles"]);

 			foreach ($module["roles"] as $index => $playNum) {

 				if ($playNum != 0)

-					echo $playNum . " " . $roles[$rolesKeys[$index]]["description"] . " ";

+					echo $playNum." ".$roles[$rolesKeys[$index]]["description"]." ";

 			}

 		}

 	}

@@ -58,7 +58,7 @@ 
 		echo "\n";

 

 		for ($i = 1; $i <= 100; $i++) {

-			echo $i . " . ";

+			echo $i." . ";

 			if (\App\Lib\DsManager\Helpers\Randomizer::boolOnPercentage(20)) {

 				echo "yes";

 				$yes++;

Braces +3 added lines, -2 removed lines

@@ -41,8 +41,9 @@
 			echo "\nto play $key\n";

 			$this->assertNotEmpty($module["roles"]);

 			foreach ($module["roles"] as $index => $playNum) {

-				if ($playNum != 0)

-					echo $playNum . " " . $roles[$rolesKeys[$index]]["description"] . " ";

+				if ($playNum != 0) {
+									echo $playNum . " " . $roles[$rolesKeys[$index]]["description"] . " ";
+				}
 			}

 		}

 	}

api/tests/ExampleTest.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	 */

 	public function testIlluminateConnection()

 	{

-		Illuminate\Database\Capsule\Manager::schema()->create('test', function ($table) {

+		Illuminate\Database\Capsule\Manager::schema()->create('test', function($table) {

 			$table->increments('id');

 			$table->string('email')->unique();

 			$table->timestamps();

api/Lib/DsManager/Models/Player.php

Braces +45 added lines, -15 removed lines

@@ -44,7 +44,9 @@ 
 		$val -= rand(1, 3);

 		$val += $this->onRoleModifier();

 		$val += $this->spareChange();

-		if ($val < 0) $val = $val * -1;

+		if ($val < 0) {
+			$val = $val * -1;
+		}
 		$val = round($val, 2);

 		return $val;

 	}

@@ -57,7 +59,9 @@ 
 		if ($this->wageReq == null) {

 			$wage = round($this->getVal() / 10.0, 2);

 			$wage += $this->spareChange();

-			if ($wage < 0) $wage = $wage * -1;

+			if ($wage < 0) {
+				$wage = $wage * -1;
+			}
 			$this->wageReq = round($wage, 2);

 		}

 		return $this->wageReq;

@@ -80,13 +84,27 @@ 
 	 */

 	private function priceOnSkill()

 	{

-		if ($this->skillAvg > 98) return 130.0;

-		if ($this->skillAvg > 90) return 80.0;

-		if ($this->skillAvg > 80) return 50.0;

-		if ($this->skillAvg > 76) return 20.0;

-		if ($this->skillAvg > 70) return 10.0;

-		if ($this->skillAvg > 60) return 5.0;

-		if ($this->skillAvg > 50) return 2.0;

+		if ($this->skillAvg > 98) {
+			return 130.0;
+		}
+		if ($this->skillAvg > 90) {
+			return 80.0;
+		}
+		if ($this->skillAvg > 80) {
+			return 50.0;
+		}
+		if ($this->skillAvg > 76) {
+			return 20.0;
+		}
+		if ($this->skillAvg > 70) {
+			return 10.0;
+		}
+		if ($this->skillAvg > 60) {
+			return 5.0;
+		}
+		if ($this->skillAvg > 50) {
+			return 2.0;
+		}
 		return 0.5;

 

 	}

@@ -96,12 +114,24 @@ 
 	 */

 	private function onAgeModifier()

 	{

-		if ($this->age > 32) return -0.5;

-		if ($this->age > 30) return -0.2;

-		if ($this->age > 28) return -0.1;

-		if ($this->age > 26) return 0.1;

-		if ($this->age > 22) return 0.2;

-		if ($this->age > 20) return 0.3;

+		if ($this->age > 32) {
+			return -0.5;
+		}
+		if ($this->age > 30) {
+			return -0.2;
+		}
+		if ($this->age > 28) {
+			return -0.1;
+		}
+		if ($this->age > 26) {
+			return 0.1;
+		}
+		if ($this->age > 22) {
+			return 0.2;
+		}
+		if ($this->age > 20) {
+			return 0.3;
+		}
 		return 0.5;

 	}

 

api/Lib/DsManager/Models/Match.php

Indentation +144 added lines, -144 removed lines

@@ -10,149 +10,149 @@
  */

 class Match

 {

-    /**

-     * @var Team

-     */

-    private $homeTeam;

-    /**

-     * @var Team

-     */

-    private $awayTeam;

-

-    /**

-     * Match constructor.

-     * @param Team $home

-     * @param Team $away

-     */

-    public function __construct(Team $home, Team $away)

-    {

-        $this->homeTeam = $home;

-        $this->awayTeam = $away;

-    }

-

-    /**

-     * @return MatchResult

-     */

-    public function simulate()

-    {

-        $homePoints = $this->homeTeam->getAvgSkill();

-        $awayPoints = $this->awayTeam->getAvgSkill();

-

-        $homePoints += $this->malusModule(

-            $this->homeTeam->coach->favouriteModule,

-            $this->homeTeam->playersPerRoleArray()

-        );

-        $awayPoints += $this->malusModule(

-            $this->awayTeam->coach->favouriteModule,

-            $this->awayTeam->playersPerRoleArray()

-        );

-

-        $goalHome = 0;

-        $goalAway = 0;

-

-        if (Randomizer::boolOnPercentage(80)) {

-

-            if (($homePoints - $awayPoints) < 0) {

-                $goalAway = ($awayPoints - $homePoints) % 6;

-                $goalHome += $this->chance();

-                $goalAway += $this->chance();

-                $goalHome += $this->bonusHome();

-            } else {

-                $goalHome = ($homePoints - $awayPoints) % 6;

-                $goalAway += $this->chance();

-                $goalHome += $this->bonusHome();

-            }

-

-        } else {

-            $goalHome += $this->chance();

-            $goalAway += $this->chance();

-            $goalHome += $this->bonusHome();

-        }

-

-        $goalHome += $this->bonusAge($this->homeTeam);

-        $goalAway += $this->bonusAge($this->awayTeam);

-

-

-        //Bonus on Good GoalKeeper

-        $goalies = $this->homeTeam->getBestPlayerForRole("GK");

-        $goalAway -= $this->bonusGoalkeeper($goalies);

-        $goalies = $this->awayTeam->getBestPlayerForRole("GK");

-        $goalHome -= $this->bonusGoalkeeper($goalies);

-        //

-

-        $homeModule = new Module($this->homeTeam->coach->favouriteModule);

-        $awayModule = new Module($this->awayTeam->coach->favouriteModule);

-

-        if ($homeModule->isOffensive()) {

-            $goalHome += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;

-            $goalAway += Randomizer::boolOnPercentage(20) ? 1 : 0;

-        }

-        if ($awayModule->isOffensive()) {

-            $goalAway += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;

-            $goalHome += Randomizer::boolOnPercentage(20) ? 1 : 0;

-        }

-

-        if ($awayModule->isDefensive()) {

-            $goalHome -= Randomizer::boolOnPercentage(50) ? 1 : 0;

-        }

-        if ($homeModule->isDefensive()) {

-            $goalAway -= Randomizer::boolOnPercentage(50) ? 1 : 0;

-        }

-

-        $goalHome = $goalHome < 0 ? 0 : $goalHome;

-        $goalAway = $goalAway < 0 ? 0 : $goalAway;

-        return new MatchResult($goalHome, $goalAway, $this->homeTeam, $this->awayTeam);

-    }

-

-    private function bonusAge(Team $team)

-    {

-        if ($team->getAvgAge() > 29 || $team->getAvgAge() < 24) {

-            return $this->chance();

-        }

-        return 0;

-    }

-

-    /**

-     * @param $goalkeeper

-     * @return int

-     */

-    private function bonusGoalKeeper($goalkeeper)

-    {

-

-        $skillGoalkeeper = empty($goalkeeper) ? 1 : $goalkeeper->skillAvg;

-        return (Randomizer::boolOnPercentage($skillGoalkeeper) ? 1 : 0);

-

-    }

-

-    /**

-     * @return int

-     */

-    private function chance()

-    {

-        return rand(0, 3);

-    }

-

-    /**

-     * @return int

-     */

-    private function bonusHome()

-    {

-        return Randomizer::boolOnPercentage(66) ? 1 : 0;

-    }

-

-    /**

-     * @param $moduleString

-     * @param $playersRoleArray

-     * @return int

-     */

-    private function malusModule($moduleString, $playersRoleArray)

-    {

-        $module = new Module($moduleString);

-        if ($module->isApplicableToArray($playersRoleArray)) {

-            return rand(1, 10);

-        } else {

-            return (-1) * rand(1, 10);

-        }

-    }

+	/**

+	 * @var Team

+	 */

+	private $homeTeam;

+	/**

+	 * @var Team

+	 */

+	private $awayTeam;

+

+	/**

+	 * Match constructor.

+	 * @param Team $home

+	 * @param Team $away

+	 */

+	public function __construct(Team $home, Team $away)

+	{

+		$this->homeTeam = $home;

+		$this->awayTeam = $away;

+	}

+

+	/**

+	 * @return MatchResult

+	 */

+	public function simulate()

+	{

+		$homePoints = $this->homeTeam->getAvgSkill();

+		$awayPoints = $this->awayTeam->getAvgSkill();

+

+		$homePoints += $this->malusModule(

+			$this->homeTeam->coach->favouriteModule,

+			$this->homeTeam->playersPerRoleArray()

+		);

+		$awayPoints += $this->malusModule(

+			$this->awayTeam->coach->favouriteModule,

+			$this->awayTeam->playersPerRoleArray()

+		);

+

+		$goalHome = 0;

+		$goalAway = 0;

+

+		if (Randomizer::boolOnPercentage(80)) {

+

+			if (($homePoints - $awayPoints) < 0) {

+				$goalAway = ($awayPoints - $homePoints) % 6;

+				$goalHome += $this->chance();

+				$goalAway += $this->chance();

+				$goalHome += $this->bonusHome();

+			} else {

+				$goalHome = ($homePoints - $awayPoints) % 6;

+				$goalAway += $this->chance();

+				$goalHome += $this->bonusHome();

+			}

+

+		} else {

+			$goalHome += $this->chance();

+			$goalAway += $this->chance();

+			$goalHome += $this->bonusHome();

+		}

+

+		$goalHome += $this->bonusAge($this->homeTeam);

+		$goalAway += $this->bonusAge($this->awayTeam);

+

+

+		//Bonus on Good GoalKeeper

+		$goalies = $this->homeTeam->getBestPlayerForRole("GK");

+		$goalAway -= $this->bonusGoalkeeper($goalies);

+		$goalies = $this->awayTeam->getBestPlayerForRole("GK");

+		$goalHome -= $this->bonusGoalkeeper($goalies);

+		//

+

+		$homeModule = new Module($this->homeTeam->coach->favouriteModule);

+		$awayModule = new Module($this->awayTeam->coach->favouriteModule);

+

+		if ($homeModule->isOffensive()) {

+			$goalHome += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;

+			$goalAway += Randomizer::boolOnPercentage(20) ? 1 : 0;

+		}

+		if ($awayModule->isOffensive()) {

+			$goalAway += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;

+			$goalHome += Randomizer::boolOnPercentage(20) ? 1 : 0;

+		}

+

+		if ($awayModule->isDefensive()) {

+			$goalHome -= Randomizer::boolOnPercentage(50) ? 1 : 0;

+		}

+		if ($homeModule->isDefensive()) {

+			$goalAway -= Randomizer::boolOnPercentage(50) ? 1 : 0;

+		}

+

+		$goalHome = $goalHome < 0 ? 0 : $goalHome;

+		$goalAway = $goalAway < 0 ? 0 : $goalAway;

+		return new MatchResult($goalHome, $goalAway, $this->homeTeam, $this->awayTeam);

+	}

+

+	private function bonusAge(Team $team)

+	{

+		if ($team->getAvgAge() > 29 || $team->getAvgAge() < 24) {

+			return $this->chance();

+		}

+		return 0;

+	}

+

+	/**

+	 * @param $goalkeeper

+	 * @return int

+	 */

+	private function bonusGoalKeeper($goalkeeper)

+	{

+

+		$skillGoalkeeper = empty($goalkeeper) ? 1 : $goalkeeper->skillAvg;

+		return (Randomizer::boolOnPercentage($skillGoalkeeper) ? 1 : 0);

+

+	}

+

+	/**

+	 * @return int

+	 */

+	private function chance()

+	{

+		return rand(0, 3);

+	}

+

+	/**

+	 * @return int

+	 */

+	private function bonusHome()

+	{

+		return Randomizer::boolOnPercentage(66) ? 1 : 0;

+	}

+

+	/**

+	 * @param $moduleString

+	 * @param $playersRoleArray

+	 * @return int

+	 */

+	private function malusModule($moduleString, $playersRoleArray)

+	{

+		$module = new Module($moduleString);

+		if ($module->isApplicableToArray($playersRoleArray)) {

+			return rand(1, 10);

+		} else {

+			return (-1) * rand(1, 10);

+		}

+	}

 

 }
\ No newline at end of file

api/Lib/DsManager/Models/Orm/Coach.php

Indentation +24 added lines, -24 removed lines

@@ -9,31 +9,31 @@
  */

 class Coach extends DsManagerOrm

 {

-    /**

-     * @var string

-     */

-    protected $table = 'coaches';

+	/**

+	 * @var string

+	 */

+	protected $table = 'coaches';

 

-    /**

-     * @var array

-     */

-    protected $fillable = [

-        'name',

-        'surname',

-        'age',

-        'nationality',

-        'skillAvg',

-        'wageReq',

-        'favouriteModule',

-        'team_id'

-    ];

+	/**

+	 * @var array

+	 */

+	protected $fillable = [

+		'name',

+		'surname',

+		'age',

+		'nationality',

+		'skillAvg',

+		'wageReq',

+		'favouriteModule',

+		'team_id'

+	];

 

-    /**

-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo

-     */

-    public function team()

-    {

-        return $this->belongsTo(Team::class);

-    }

+	/**

+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo

+	 */

+	public function team()

+	{

+		return $this->belongsTo(Team::class);

+	}

 

 } 
\ No newline at end of file

api/Lib/DsManager/Models/Orm/DsManagerOrm.php

Indentation +4 added lines, -4 removed lines

@@ -6,9 +6,9 @@
 

 abstract class DsManagerOrm extends Eloquent{

 

-    protected $hidden = [

-        'created_at',

-        'updated_at'

-    ];

+	protected $hidden = [

+		'created_at',

+		'updated_at'

+	];

 

 } 
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 use Illuminate\Database\Eloquent\Model as Eloquent;

 

 

-abstract class DsManagerOrm extends Eloquent{

+abstract class DsManagerOrm extends Eloquent {

 

     protected $hidden = [

         'created_at',

api/Lib/DsManager/Models/Coach.php

Braces +24 added lines, -8 removed lines

@@ -35,7 +35,9 @@ 
 		if ($this->wageReq == null) {

 			$wage = $this->wageOnSkill();

 			$wage += $this->spareChange();

-			if ($wage < 0) $wage = $wage * (-1);

+			if ($wage < 0) {
+				$wage = $wage * (-1);
+			}
 			$this->wageReq = round($wage, 2);

 		}

 		return $this->wageReq;

@@ -46,13 +48,27 @@ 
 	 */

 	private function wageOnSkill()

 	{

-		if ($this->skillAvg > 98) return 5.0;

-		if ($this->skillAvg > 90) return 3.5;

-		if ($this->skillAvg > 80) return 2.0;

-		if ($this->skillAvg > 76) return 1.5;

-		if ($this->skillAvg > 70) return 1.0;

-		if ($this->skillAvg > 60) return .76;

-		if ($this->skillAvg > 50) return .20;

+		if ($this->skillAvg > 98) {
+			return 5.0;
+		}
+		if ($this->skillAvg > 90) {
+			return 3.5;
+		}
+		if ($this->skillAvg > 80) {
+			return 2.0;
+		}
+		if ($this->skillAvg > 76) {
+			return 1.5;
+		}
+		if ($this->skillAvg > 70) {
+			return 1.0;
+		}
+		if ($this->skillAvg > 60) {
+			return .76;
+		}
+		if ($this->skillAvg > 50) {
+			return .20;
+		}
 		return 0.5;

 

 	}

api/Lib/DsManager/Models/MatchResult.php

Indentation +54 added lines, -54 removed lines

@@ -9,65 +9,65 @@
  */

 class MatchResult

 {

-    private $goalHome;

-    private $goalAway;

-    private $homeTeam;

-    private $awayTeam;

+	private $goalHome;

+	private $goalAway;

+	private $homeTeam;

+	private $awayTeam;

 

-    /**

-     * MatchResult constructor.

-     * @param $goalHome

-     * @param $goalAway

-     * @param Team $home

-     * @param Team $away

-     */

-    public function __construct($goalHome, $goalAway, Team $home, Team $away)

-    {

-        $this->goalHome = $goalHome;

-        $this->goalAway = $goalAway;

-        $this->homeTeam = $home;

-        $this->awayTeam = $away;

-    }

+	/**

+	 * MatchResult constructor.

+	 * @param $goalHome

+	 * @param $goalAway

+	 * @param Team $home

+	 * @param Team $away

+	 */

+	public function __construct($goalHome, $goalAway, Team $home, Team $away)

+	{

+		$this->goalHome = $goalHome;

+		$this->goalAway = $goalAway;

+		$this->homeTeam = $home;

+		$this->awayTeam = $away;

+	}

 

-    public function getWinnerLoser()

-    {

-        if ($this->goalAway == $this->goalHome) {

-            return [

-                'isDraw' => true,

-                'winner' => $this->homeTeam,

-                'loser' => $this->awayTeam

-            ];

-        }

+	public function getWinnerLoser()

+	{

+		if ($this->goalAway == $this->goalHome) {

+			return [

+				'isDraw' => true,

+				'winner' => $this->homeTeam,

+				'loser' => $this->awayTeam

+			];

+		}

 

-        if ($this->goalHome > $this->goalAway) {

-            return [

-                'isDraw' => false,

-                'winner' => $this->homeTeam,

-                'loser' => $this->awayTeam

-            ];

-        }

+		if ($this->goalHome > $this->goalAway) {

+			return [

+				'isDraw' => false,

+				'winner' => $this->homeTeam,

+				'loser' => $this->awayTeam

+			];

+		}

 

-        if ($this->goalHome < $this->goalAway) {

-            return [

-                'isDraw' => false,

-                'winner' => $this->awayTeam,

-                'loser' => $this->homeTeam

-            ];

-        }

+		if ($this->goalHome < $this->goalAway) {

+			return [

+				'isDraw' => false,

+				'winner' => $this->awayTeam,

+				'loser' => $this->homeTeam

+			];

+		}

 

-        return [];

-    }

+		return [];

+	}

 

-    /**

-     * @return array

-     */

-    public function toArray()

-    {

-        $result = [];

-        $result["goalHome"] = $this->goalHome;

-        $result["goalAway"] = $this->goalAway;

-        $result['info'] = $this->getWinnerLoser();

-        return $result;

-    }

+	/**

+	 * @return array

+	 */

+	public function toArray()

+	{

+		$result = [];

+		$result["goalHome"] = $this->goalHome;

+		$result["goalAway"] = $this->goalAway;

+		$result['info'] = $this->getWinnerLoser();

+		return $result;

+	}

 

 }
\ No newline at end of file