vikkio88 / dsManager-php

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/Common/DsManagerModel.php

Indentation +8 added lines, -8 removed lines

@@ -12,15 +12,15 @@
  */

 abstract class DsManagerModel implements ActiveModel

 {

-    /**

-     * @var

-     */

-    public $id;

+	/**

+	 * @var

+	 */

+	public $id;

 

-    /**

-     * @return mixed

-     */

-    abstract function toArray();

+	/**

+	 * @return mixed

+	 */

+	abstract function toArray();

 	/**

 	 * @param array $array

 	 * @return mixed

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	 * @param array $array

 	 * @return mixed

 	 */

-	public static function fromArray($array =[])

+	public static function fromArray($array = [])

 	{

 		$class = get_called_class();

 		$class = new $class();

api/Lib/DsManager/Models/Module.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	 */

 	function __toString()

 	{

-		return "" . $this->moduleCode;

+		return "".$this->moduleCode;

 	}

 

 

Braces +6 added lines, -3 removed lines

@@ -31,7 +31,9 @@ 
 	{

 		$this->moduleCode = $module;

 		$this->configuration = Config::get("modules.modules", "api/")[$module];

-		if ($this->configuration == null) throw new \InvalidArgumentException("Not a valid Module supplied");

+		if ($this->configuration == null) {
+			throw new \InvalidArgumentException("Not a valid Module supplied");
+		}
 	}

 

 	/**

@@ -98,8 +100,9 @@ 
 		$roles = \App\Lib\Helpers\Config::get('modules.roles', "api/");

 		$rolesKeys = array_keys($roles);

 		foreach ($this->configuration["roles"] as $index => $playNum) {

-			if ($playNum != 0 || $complete)

-				$rolesNeeded[$rolesKeys[$index]] = $playNum;

+			if ($playNum != 0 || $complete) {
+							$rolesNeeded[$rolesKeys[$index]] = $playNum;
+			}
 		}

 

 		return $rolesNeeded;

api/Lib/Helpers/Responder.php

Indentation +38 added lines, -38 removed lines

@@ -9,44 +9,44 @@
  */

 class Responder

 {

-    /**

-     * @param $content

-     * @param $response

-     * @param array $headers

-     * @return mixed

-     */

-    public static function getJsonResponse($content, $response, $headers = [])

-    {

-        $headers['Content-Type'] = 'application/json';

-        return self::getResponse($headers, $content, $response);

-    }

+	/**

+	 * @param $content

+	 * @param $response

+	 * @param array $headers

+	 * @return mixed

+	 */

+	public static function getJsonResponse($content, $response, $headers = [])

+	{

+		$headers['Content-Type'] = 'application/json';

+		return self::getResponse($headers, $content, $response);

+	}

 

-    /**

-     * @param array $headers

-     * @param $content

-     * @param $response

-     * @return mixed

-     */

-    public static function getResponse($headers = [], $content, $response)

-    {

-        $body = $response->getBody();

-        $body->write($content);

-        $i = 0;

-        foreach ($headers as $header => $value) {

-            if ($i === 0) {

-                $response = $response->withHeader(

-                    $header,

-                    $value

-                );

-            } else {

-                $response = $response->withAddedHeader(

-                    $header,

-                    $value

-                );

-            }

-            $i++;

-        }

-        return $response->withBody($body);

-    }

+	/**

+	 * @param array $headers

+	 * @param $content

+	 * @param $response

+	 * @return mixed

+	 */

+	public static function getResponse($headers = [], $content, $response)

+	{

+		$body = $response->getBody();

+		$body->write($content);

+		$i = 0;

+		foreach ($headers as $header => $value) {

+			if ($i === 0) {

+				$response = $response->withHeader(

+					$header,

+					$value

+				);

+			} else {

+				$response = $response->withAddedHeader(

+					$header,

+					$value

+				);

+			}

+			$i++;

+		}

+		return $response->withBody($body);

+	}

 

 }
\ No newline at end of file

api/tests/ModuleConfigurationTest.php

Indentation +67 added lines, -67 removed lines

@@ -8,76 +8,76 @@
 {

 

 

-    /**

-     * @group Modules

-     * @group config

-     */

-    public function testAllTheModulesGot11Players()

-    {

-        $modules = \App\Lib\Helpers\Config::get('modules.modules');

-        $this->assertNotEmpty($modules);

-        foreach ($modules as $key => $module) {

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

-            $count = 0;

-            foreach ($module["roles"] as $roleNum) {

-                $count += $roleNum;

-            }

-            $this->assertTrue(11 === $count, "Not correct Players for $key");

-        }

-    }

+	/**

+	 * @group Modules

+	 * @group config

+	 */

+	public function testAllTheModulesGot11Players()

+	{

+		$modules = \App\Lib\Helpers\Config::get('modules.modules');

+		$this->assertNotEmpty($modules);

+		foreach ($modules as $key => $module) {

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

+			$count = 0;

+			foreach ($module["roles"] as $roleNum) {

+				$count += $roleNum;

+			}

+			$this->assertTrue(11 === $count, "Not correct Players for $key");

+		}

+	}

 

-    /**

-     * @group Roles

-     * @group config

-     */

-    public function testCorrectDisplayModuleDescriptionRole()

-    {

-        $modules = \App\Lib\Helpers\Config::get('modules.modules');

-        $this->assertNotEmpty($modules);

-        $roles = \App\Lib\Helpers\Config::get('modules.roles');

-        $rolesKeys = array_keys($roles);

+	/**

+	 * @group Roles

+	 * @group config

+	 */

+	public function testCorrectDisplayModuleDescriptionRole()

+	{

+		$modules = \App\Lib\Helpers\Config::get('modules.modules');

+		$this->assertNotEmpty($modules);

+		$roles = \App\Lib\Helpers\Config::get('modules.roles');

+		$rolesKeys = array_keys($roles);

 

-        foreach ($modules as $key => $module) {

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

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

-                if ($playNum != 0) {

-                    $this->assertGreaterThan(0, $playNum);

-                    $this->assertNotNull($roles[$rolesKeys[$index]]["description"]);

-                }

-            }

-        }

-    }

+		foreach ($modules as $key => $module) {

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

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

+				if ($playNum != 0) {

+					$this->assertGreaterThan(0, $playNum);

+					$this->assertNotNull($roles[$rolesKeys[$index]]["description"]);

+				}

+			}

+		}

+	}

 

-    /**

-     * @group rand

-     *

-     */

-    public function testRandomizer()

-    {

-        $yes = 0;

-        $no = 0;

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

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

-                $yes++;

-            } else {

-                $no++;

-            }

-        }

-        $this->assertNotEmpty($yes);

-        $this->assertNotEmpty($no);

-        $this->assertGreaterThan($yes, $no);

-    }

+	/**

+	 * @group rand

+	 *

+	 */

+	public function testRandomizer()

+	{

+		$yes = 0;

+		$no = 0;

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

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

+				$yes++;

+			} else {

+				$no++;

+			}

+		}

+		$this->assertNotEmpty($yes);

+		$this->assertNotEmpty($no);

+		$this->assertGreaterThan($yes, $no);

+	}

 

-    /**

-     * @group randFiller

-     *

-     */

-    public function testRandomFiller()

-    {

-        $rndF = new \App\Lib\DsManager\Helpers\RandomFiller();

-        for ($i = 1; $i <= 10; $i++) {

-            $this->assertNotEmpty($rndF->getLocale());

-        }

-    }

+	/**

+	 * @group randFiller

+	 *

+	 */

+	public function testRandomFiller()

+	{

+		$rndF = new \App\Lib\DsManager\Helpers\RandomFiller();

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

+			$this->assertNotEmpty($rndF->getLocale());

+		}

+	}

 

 }

api/database/migrations/CreateTeamTable.php

Indentation +15 added lines, -15 removed lines

@@ -5,19 +5,19 @@
 

 class CreateTeamTable

 {

-    /**

-     * Run the migrations.

-     *

-     * @return void

-     */

-    public function run()

-    {

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

-        Capsule::schema()->create('teams', function (Blueprint $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 (Blueprint $table) {

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

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

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

+			$table->timestamps();

+		});

+	}

 }

Spacing +2 added lines, -2 removed lines

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

     {

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

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

+        Capsule::schema()->create('teams', function(Blueprint $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

@@ -5,35 +5,35 @@
 

 class CreateCoachesTable

 {

-    /**

-     * Run the migrations.

-     *

-     * @return void

-     */

-    public function run()

-    {

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

-        Capsule::schema()->create('coaches', function (Blueprint $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 (Blueprint $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

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

     {

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

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

+        Capsule::schema()->create('coaches', function(Blueprint $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

@@ -5,26 +5,26 @@
 

 class CreatePlayersTable

 {

-    /**

-     * Run the migrations.

-     *

-     * @return void

-     */

-    public function run()

-    {

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

-        Capsule::schema()->create('players', function (Blueprint $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 (Blueprint $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

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

     {

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

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

+        Capsule::schema()->create('players', function(Blueprint $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/config/config.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 

 use Illuminate\Database\Capsule\Manager as Capsule;

 

-$dotenv = new Dotenv\Dotenv(__DIR__ . "/../");

+$dotenv = new Dotenv\Dotenv(__DIR__."/../");

 $dotenv->load();

 

 /**

Indentation +10 added lines, -10 removed lines

@@ -4,9 +4,9 @@ 
 

 $dotenv = new Dotenv\Dotenv(__DIR__ . "/../");

 try {

-    $dotenv->load();

+	$dotenv->load();

 } catch (Exception $e) {

-    //yummy exception

+	//yummy exception

 }

 

 /**

@@ -14,14 +14,14 @@ 
  */

 $capsule = new Capsule;

 $capsule->addConnection(array(

-    'driver' => 'mysql',

-    'host' => 'localhost',

-    'database' => 'dsmanager',

-    'username' => getenv('USERNAME'),

-    'password' => getenv('PASSWORD'),

-    'charset' => 'utf8',

-    'collation' => 'utf8_general_ci',

-    'prefix' => ''

+	'driver' => 'mysql',

+	'host' => 'localhost',

+	'database' => 'dsmanager',

+	'username' => getenv('USERNAME'),

+	'password' => getenv('PASSWORD'),

+	'charset' => 'utf8',

+	'collation' => 'utf8_general_ci',

+	'prefix' => ''

 ));

 $capsule->setAsGlobal();

 $capsule->bootEloquent();