vikkio88 / dsManager-php

api/Lib/DsManager/Helpers/RandomFiller.php

Doc Comments +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
 

 

 	/**

-	 * @param null $forcedRole

+	 * @param string|null $forcedRole

 	 * @param null $locale

 	 * @return Player

 	 */

@@ -148,7 +148,7 @@ 
 	}

 

 	/**

-	 * @param $locale

+	 * @param string $locale

 	 * @return mixed

 	 */

 	private function nationalityFromLocale($locale)

Unused Use Statements +3 added lines, -3 removed lines

@@ -4,9 +4,9 @@
 namespace App\Lib\DsManager\Helpers;

 

 

-use App\Lib\DsManager\Models\Coach;

-use App\Lib\DsManager\Models\Player;

-use App\Lib\DsManager\Models\Team;

+use App\Lib\DsManager\Models\Coach;
+use App\Lib\DsManager\Models\Player;
+use App\Lib\DsManager\Models\Team;
 use App\Lib\Helpers\Config;

 

 /**

api/database/migrations/CreateTeamTable.php

Indentation +15 added lines, -15 removed lines

@@ -4,19 +4,19 @@
 

 class CreateTeamTable

 {

-    /**

-     * Run the migrations.

-     *

-     * @return void

-     */

-    public function run()

-    {

-        Capsule::schema()->dropIfExists('teams');

-        Capsule::schema()->create('teams', function ($table) {

-            $table->increments('id');

-            $table->string('name');

-            $table->string('nationality',2);

-            $table->timestamps();

-        });

-    }

+	/**

+	 * Run the migrations.

+	 *

+	 * @return void

+	 */

+	public function run()

+	{

+		Capsule::schema()->dropIfExists('teams');

+		Capsule::schema()->create('teams', function ($table) {

+			$table->increments('id');

+			$table->string('name');

+			$table->string('nationality',2);

+			$table->timestamps();

+		});

+	}

 }

Spacing +2 added lines, -2 removed lines

@@ -12,10 +12,10 @@
     public function run()

     {

         Capsule::schema()->dropIfExists('teams');

-        Capsule::schema()->create('teams', function ($table) {

+        Capsule::schema()->create('teams', function($table) {

             $table->increments('id');

             $table->string('name');

-            $table->string('nationality',2);

+            $table->string('nationality', 2);

             $table->timestamps();

         });

     }

api/database/migrations/CreateCoachesTable.php

Indentation +30 added lines, -30 removed lines

@@ -4,35 +4,35 @@
 

 class CreateCoachesTable

 {

-    /**

-     * Run the migrations.

-     *

-     * @return void

-     */

-    public function run()

-    {

-        Capsule::schema()->dropIfExists('coaches');

-        Capsule::schema()->create('coaches', function ($table) {

-            $table->increments('id');

-            $table->string('name');

-            $table->string('surname');

-            $table->tinyInteger('age');

-            $table->string('nationality',2);

-            $table->float('skillAvg');

-            $table->float('wageReq');

-            $table->string('favouriteModule',10);

-            $table->integer('team_id')->nullable();

-            $table->timestamps();

-        });

-    }

+	/**

+	 * Run the migrations.

+	 *

+	 * @return void

+	 */

+	public function run()

+	{

+		Capsule::schema()->dropIfExists('coaches');

+		Capsule::schema()->create('coaches', function ($table) {

+			$table->increments('id');

+			$table->string('name');

+			$table->string('surname');

+			$table->tinyInteger('age');

+			$table->string('nationality',2);

+			$table->float('skillAvg');

+			$table->float('wageReq');

+			$table->string('favouriteModule',10);

+			$table->integer('team_id')->nullable();

+			$table->timestamps();

+		});

+	}

 

-    /**

-     * Reverse the migrations.

-     *

-     * @return void

-     */

-    public function down()

-    {

-        Schema::drop('coaches');

-    }

+	/**

+	 * Reverse the migrations.

+	 *

+	 * @return void

+	 */

+	public function down()

+	{

+		Schema::drop('coaches');

+	}

 }

Spacing +3 added lines, -3 removed lines

@@ -12,15 +12,15 @@
     public function run()

     {

         Capsule::schema()->dropIfExists('coaches');

-        Capsule::schema()->create('coaches', function ($table) {

+        Capsule::schema()->create('coaches', function($table) {

             $table->increments('id');

             $table->string('name');

             $table->string('surname');

             $table->tinyInteger('age');

-            $table->string('nationality',2);

+            $table->string('nationality', 2);

             $table->float('skillAvg');

             $table->float('wageReq');

-            $table->string('favouriteModule',10);

+            $table->string('favouriteModule', 10);

             $table->integer('team_id')->nullable();

             $table->timestamps();

         });

api/database/migrations/CreatePlayersTable.php

Indentation +22 added lines, -22 removed lines

@@ -4,26 +4,26 @@
 

 class CreatePlayersTable

 {

-    /**

-     * Run the migrations.

-     *

-     * @return void

-     */

-    public function run()

-    {

-        Capsule::schema()->dropIfExists('players');

-        Capsule::schema()->create('players', function ($table) {

-            $table->increments('id');

-            $table->string('name');

-            $table->string('surname');

-            $table->tinyInteger('age');

-            $table->string('nationality',2);

-            $table->float('skillAvg');

-            $table->float('wageReq');

-            $table->float('val');

-            $table->string('role',2);

-            $table->integer('team_id')->nullable();

-            $table->timestamps();

-        });

-    }

+	/**

+	 * Run the migrations.

+	 *

+	 * @return void

+	 */

+	public function run()

+	{

+		Capsule::schema()->dropIfExists('players');

+		Capsule::schema()->create('players', function ($table) {

+			$table->increments('id');

+			$table->string('name');

+			$table->string('surname');

+			$table->tinyInteger('age');

+			$table->string('nationality',2);

+			$table->float('skillAvg');

+			$table->float('wageReq');

+			$table->float('val');

+			$table->string('role',2);

+			$table->integer('team_id')->nullable();

+			$table->timestamps();

+		});

+	}

 }

Spacing +3 added lines, -3 removed lines

@@ -12,16 +12,16 @@
     public function run()

     {

         Capsule::schema()->dropIfExists('players');

-        Capsule::schema()->create('players', function ($table) {

+        Capsule::schema()->create('players', function($table) {

             $table->increments('id');

             $table->string('name');

             $table->string('surname');

             $table->tinyInteger('age');

-            $table->string('nationality',2);

+            $table->string('nationality', 2);

             $table->float('skillAvg');

             $table->float('wageReq');

             $table->float('val');

-            $table->string('role',2);

+            $table->string('role', 2);

             $table->integer('team_id')->nullable();

             $table->timestamps();

         });

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