vikkio88 / dsManager-php

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

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/config/config.php

Indentation +8 added lines, -8 removed lines

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

 $capsule = new Capsule;

 $capsule->addConnection(array(

-    'driver' => 'mysql',

-    'host' => 'localhost',

-    'database' => 'dsmanager',

-    'username' => 'root',

-    'password' => 'root',

-    'charset' => 'utf8',

-    'collation' => 'utf8_general_ci',

-    'prefix' => ''

+	'driver' => 'mysql',

+	'host' => 'localhost',

+	'database' => 'dsmanager',

+	'username' => 'root',

+	'password' => 'root',

+	'charset' => 'utf8',

+	'collation' => 'utf8_general_ci',

+	'prefix' => ''

 ));

 $capsule->setAsGlobal();

 $capsule->bootEloquent();

api/index.php

Indentation +65 added lines, -65 removed lines

@@ -10,101 +10,101 @@
 use \App\Lib\DsManager\Models\Orm\Coach;

 

 $configuration = [

-    'settings' => [

-        'displayErrorDetails' => true,

-    ],

+	'settings' => [

+		'displayErrorDetails' => true,

+	],

 ];

 $c = new \Slim\Container($configuration);

 $api = new \Slim\App($c);

 

 $api->get('/ping', function ($request, $response, $args) {

-    $jsonResp = json_encode(

-        [

-            "status" => "service up",

-            "message" => "in a bottle",

-            "config" => \App\Lib\Helpers\Config::get("config1.stuff")

-        ]

-    );

-    return \App\Lib\Helpers\Responder::getJsonResponse($jsonResp, $response);

+	$jsonResp = json_encode(

+		[

+			"status" => "service up",

+			"message" => "in a bottle",

+			"config" => \App\Lib\Helpers\Config::get("config1.stuff")

+		]

+	);

+	return \App\Lib\Helpers\Responder::getJsonResponse($jsonResp, $response);

 });

 

 $api->get('/players', function ($request, $response, $args) {

-    $json = json_encode(Player::all());

-    return \App\Lib\Helpers\Responder::getJsonResponse($json, $response);

+	$json = json_encode(Player::all());

+	return \App\Lib\Helpers\Responder::getJsonResponse($json, $response);

 });

 

 

 $api->get('/players/{id}', function ($request, $response, $args) {

-    return \App\Lib\Helpers\Responder::getJsonResponse(

-        Player::findOrFail($args['id']),

-        $response

-    );

+	return \App\Lib\Helpers\Responder::getJsonResponse(

+		Player::findOrFail($args['id']),

+		$response

+	);

 });

 

 $api->get('/coaches', function ($request, $response, $args) {

-    return \App\Lib\Helpers\Responder::getJsonResponse(

-        Coach::all(),

-        $response

-    );

+	return \App\Lib\Helpers\Responder::getJsonResponse(

+		Coach::all(),

+		$response

+	);

 });

 

 $api->get('/teams', function ($request, $response, $args) {

-    return \App\Lib\Helpers\Responder::getJsonResponse(

-        Team::all(),

-        $response

-    );

+	return \App\Lib\Helpers\Responder::getJsonResponse(

+		Team::all(),

+		$response

+	);

 });

 

 $api->get('/teams/{id}', function ($request, $response, $args) {

-    return \App\Lib\Helpers\Responder::getJsonResponse(

-        Team::with(

-            'roster',

-            'coach'

-        )->where(

-            [

-                'id' => $args['id']

-            ]

-        )->get(),

-        $response

-    );

+	return \App\Lib\Helpers\Responder::getJsonResponse(

+		Team::with(

+			'roster',

+			'coach'

+		)->where(

+			[

+				'id' => $args['id']

+			]

+		)->get(),

+		$response

+	);

 });

 

 $api->get('/teams/{id}/players', function ($request, $response, $args) {

-    return \App\Lib\Helpers\Responder::getJsonResponse(

-        Team::with(

-            'roster'

-        )->where(

-            [

-                'id' => $args['id']

-            ]

-        )->get(),

-        $response

-    );

+	return \App\Lib\Helpers\Responder::getJsonResponse(

+		Team::with(

+			'roster'

+		)->where(

+			[

+				'id' => $args['id']

+			]

+		)->get(),

+		$response

+	);

 });

 

 $api->get('/teams/{id}/players/{playerId}', function ($request, $response, $args) {

-    return \App\Lib\Helpers\Responder::getJsonResponse(

-        Player::where(

-            [

-                'id' => $args['playerId'],

-                'team_id' => $args['id']

-            ]

-        )->get(),

-        $response

-    );

+	return \App\Lib\Helpers\Responder::getJsonResponse(

+		Player::where(

+			[

+				'id' => $args['playerId'],

+				'team_id' => $args['id']

+			]

+		)->get(),

+		$response

+	);

 });

 

 $api->get('/teams/{id}/coach', function ($request, $response, $args) {

-    return \App\Lib\Helpers\Responder::getJsonResponse(

-        Team::with(

-            'coach'

-        )->where(

-            [

-                'id' => $args['id']

-            ]

-        )->get(),

-        $response

-    );

+	return \App\Lib\Helpers\Responder::getJsonResponse(

+		Team::with(

+			'coach'

+		)->where(

+			[

+				'id' => $args['id']

+			]

+		)->get(),

+		$response

+	);

 });

 

 $api->run();
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -17,7 +17,7 @@ 
 $c = new \Slim\Container($configuration);

 $api = new \Slim\App($c);

 

-$api->get('/ping', function ($request, $response, $args) {

+$api->get('/ping', function($request, $response, $args) {

     $jsonResp = json_encode(

         [

             "status" => "service up",

@@ -28,34 +28,34 @@ 
     return \App\Lib\Helpers\Responder::getJsonResponse($jsonResp, $response);

 });

 

-$api->get('/players', function ($request, $response, $args) {

+$api->get('/players', function($request, $response, $args) {

     $json = json_encode(Player::all());

     return \App\Lib\Helpers\Responder::getJsonResponse($json, $response);

 });

 

 

-$api->get('/players/{id}', function ($request, $response, $args) {

+$api->get('/players/{id}', function($request, $response, $args) {

     return \App\Lib\Helpers\Responder::getJsonResponse(

         Player::findOrFail($args['id']),

         $response

     );

 });

 

-$api->get('/coaches', function ($request, $response, $args) {

+$api->get('/coaches', function($request, $response, $args) {

     return \App\Lib\Helpers\Responder::getJsonResponse(

         Coach::all(),

         $response

     );

 });

 

-$api->get('/teams', function ($request, $response, $args) {

+$api->get('/teams', function($request, $response, $args) {

     return \App\Lib\Helpers\Responder::getJsonResponse(

         Team::all(),

         $response

     );

 });

 

-$api->get('/teams/{id}', function ($request, $response, $args) {

+$api->get('/teams/{id}', function($request, $response, $args) {

     return \App\Lib\Helpers\Responder::getJsonResponse(

         Team::with(

             'roster',

@@ -69,7 +69,7 @@ 
     );

 });

 

-$api->get('/teams/{id}/players', function ($request, $response, $args) {

+$api->get('/teams/{id}/players', function($request, $response, $args) {

     return \App\Lib\Helpers\Responder::getJsonResponse(

         Team::with(

             'roster'

@@ -82,7 +82,7 @@ 
     );

 });

 

-$api->get('/teams/{id}/players/{playerId}', function ($request, $response, $args) {

+$api->get('/teams/{id}/players/{playerId}', function($request, $response, $args) {

     return \App\Lib\Helpers\Responder::getJsonResponse(

         Player::where(

             [

@@ -94,7 +94,7 @@ 
     );

 });

 

-$api->get('/teams/{id}/coach', function ($request, $response, $args) {

+$api->get('/teams/{id}/coach', function($request, $response, $args) {

     return \App\Lib\Helpers\Responder::getJsonResponse(

         Team::with(

             'coach'