vikkio88 / dsManager-php

api/database/migrations/CreateTeamTable.php

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

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

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/Orm/DsManagerOrm.php

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;

 

 	}