vikkio88 / dsManager-php

Lib/Helpers/TextFormatter.php

Indentation +5 added lines, -5 removed lines

@@ -10,11 +10,11 @@
 class TextFormatter
 {
 
-    /**
-     * @param $currencyString
-     * @return float
-     */
-    public static function currencyStringToFloat($currencyString){
+	/**
+	 * @param $currencyString
+	 * @return float
+	 */
+	public static function currencyStringToFloat($currencyString){
 		//currency is always in this format € 550
 
 		return floatval(

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      * @param $currencyString
      * @return float
      */
-    public static function currencyStringToFloat($currencyString){
+    public static function currencyStringToFloat($currencyString) {
 		//currency is always in this format € 550
 
 		return floatval(

api/config/modules.php

Indentation +9 added lines, -9 removed lines

@@ -4,39 +4,39 @@
 	'modules' => [
 		"4-4-2" => [
 			'roles'=>[1,1,2,1,1,2,1,0,2,0],
-            'character' => 2
+			'character' => 2
 		],
 		"4-3-3" => [
 			'roles'=>[1,1,2,1,0,3,0,1,1,1],
-            'character' => 1
+			'character' => 1
 		],
 		"4-5-1" => [
 			'roles'=>[1,1,2,1,1,3,1,0,1,0],
-            'character' => 4
+			'character' => 4
 		],
 		"4-2-4" => [
 			'roles'=>[1,1,2,1,0,2,0,1,2,1],
-            'character' => 1
+			'character' => 1
 		],
 		"3-5-2" => [
 			'roles'=>[1,0,3,0,1,3,1,0,2,0],
-            'character' => 2
+			'character' => 2
 		],
 		"3-4-3" => [
 			'roles'=>[1,0,3,0,1,2,1,1,1,1],
-            'character' => 1
+			'character' => 1
 		],
 		"3-3-4" => [
 			'roles'=>[1,0,3,0,0,3,0,1,2,1],
-            'character' => 1
+			'character' => 1
 		],
 		"5-4-1" => [
 			'roles'=>[1,1,3,1,1,2,1,0,1,0],
-            'character' => 4
+			'character' => 4
 		],
 		"5-3-2" => [
 			'roles'=>[1,1,3,1,0,3,0,0,2,0],
-            'character' => 4
+			'character' => 4
 		]
 	],
 	'roles' => [

Spacing +9 added lines, -9 removed lines

@@ -3,39 +3,39 @@
 return [
 	'modules' => [
 		"4-4-2" => [
-			'roles'=>[1,1,2,1,1,2,1,0,2,0],
+			'roles'=>[1, 1, 2, 1, 1, 2, 1, 0, 2, 0],
             'character' => 2
 		],
 		"4-3-3" => [
-			'roles'=>[1,1,2,1,0,3,0,1,1,1],
+			'roles'=>[1, 1, 2, 1, 0, 3, 0, 1, 1, 1],
             'character' => 1
 		],
 		"4-5-1" => [
-			'roles'=>[1,1,2,1,1,3,1,0,1,0],
+			'roles'=>[1, 1, 2, 1, 1, 3, 1, 0, 1, 0],
             'character' => 4
 		],
 		"4-2-4" => [
-			'roles'=>[1,1,2,1,0,2,0,1,2,1],
+			'roles'=>[1, 1, 2, 1, 0, 2, 0, 1, 2, 1],
             'character' => 1
 		],
 		"3-5-2" => [
-			'roles'=>[1,0,3,0,1,3,1,0,2,0],
+			'roles'=>[1, 0, 3, 0, 1, 3, 1, 0, 2, 0],
             'character' => 2
 		],
 		"3-4-3" => [
-			'roles'=>[1,0,3,0,1,2,1,1,1,1],
+			'roles'=>[1, 0, 3, 0, 1, 2, 1, 1, 1, 1],
             'character' => 1
 		],
 		"3-3-4" => [
-			'roles'=>[1,0,3,0,0,3,0,1,2,1],
+			'roles'=>[1, 0, 3, 0, 0, 3, 0, 1, 2, 1],
             'character' => 1
 		],
 		"5-4-1" => [
-			'roles'=>[1,1,3,1,1,2,1,0,1,0],
+			'roles'=>[1, 1, 3, 1, 1, 2, 1, 0, 1, 0],
             'character' => 4
 		],
 		"5-3-2" => [
-			'roles'=>[1,1,3,1,0,3,0,0,2,0],
+			'roles'=>[1, 1, 3, 1, 0, 3, 0, 0, 2, 0],
             'character' => 4
 		]
 	],

api/index.php

Spacing +10 added lines, -10 removed lines

@@ -9,7 +9,7 @@ 
 
 $api->response->headers->set('Content-Type', 'application/json');
 
-$api->get('/ping', function () {
+$api->get('/ping', function() {
 	echo JsonResponse::fromArray(
 		[
 			"status" => "service up",
@@ -19,37 +19,37 @@ 
 	);
 });
 
-$api->get('/players', function () {
+$api->get('/players', function() {
 	echo JsonResponse::fromArray(
 		Player::all()->toArray()
 	);
 });
 
-$api->get('/players/:id', function ($id) {
+$api->get('/players/:id', function($id) {
 	echo JsonResponse::fromArray(
 		Player::findOrFail($id)->toArray()
 	);
 });
 
-$api->get('/coaches', function () {
+$api->get('/coaches', function() {
 	echo JsonResponse::fromArray(
 		Coach::all()->toArray()
 	);
 });
 
-$api->get('/coaches/:id', function ($id) {
+$api->get('/coaches/:id', function($id) {
 	echo JsonResponse::fromArray(
 		Coach::findOrFail($id)->toArray()
 	);
 });
 
-$api->get('/teams', function () {
+$api->get('/teams', function() {
 	echo JsonResponse::fromArray(
 		Team::all()->toArray()
 	);
 });
 
-$api->get('/teams/:teamId', function ($teamId) {
+$api->get('/teams/:teamId', function($teamId) {
 	echo JsonResponse::fromArray(
 		Team::with(
 			[
@@ -59,7 +59,7 @@ 
 	);
 });
 
-$api->get('/teams/:teamId/players', function ($teamId) {
+$api->get('/teams/:teamId/players', function($teamId) {
 	echo JsonResponse::fromArray(
 		Team::with(
 			'roster'
@@ -67,7 +67,7 @@ 
 	);
 });
 
-$api->get('/teams/:teamId/players/:playerId', function ($teamId, $playerId) {
+$api->get('/teams/:teamId/players/:playerId', function($teamId, $playerId) {
 	echo JsonResponse::fromArray(
 		Player::where(
 			[
@@ -78,7 +78,7 @@ 
 	);
 });
 
-$api->get('/teams/:teamId/coach', function ($teamId) {
+$api->get('/teams/:teamId/coach', function($teamId) {
 	echo JsonResponse::fromArray(
 		Team::with(
 			'coach'

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();
         });

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();
         });

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();
         });
     }

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

Lib/Helpers/Config.php

Spacing +3 added lines, -3 removed lines

@@ -17,10 +17,10 @@
 	 */
 	public static function get($key, $directory = null)
 	{
-		$fileName = $directory . "config/";
+		$fileName = $directory."config/";
 		$exp = explode(".", $key);
-		if (is_array($exp) && $exp[0] != null && $exp[1] != null && file_exists($fileName . $exp[0] . ".php")) {
-			$conf = include($fileName . $exp[0] . ".php");
+		if (is_array($exp) && $exp[0] != null && $exp[1] != null && file_exists($fileName.$exp[0].".php")) {
+			$conf = include($fileName.$exp[0].".php");
 			$val = array_key_exists($exp[1], $conf) ? $conf[$exp[1]] : null;
 			return $val;
 		}