vikkio88 / dsManager-php

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/Lib/Helpers/Config.php

Indentation +16 added lines, -16 removed lines

@@ -15,21 +15,21 @@
  */
 class Config
 {
-    /**
-     * @param $key
-     * @param null $directory
-     * @return null
-     */
-    public static function get($key, $directory = null)
-    {
-        $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");
-            $val = array_key_exists($exp[1], $conf) ? $conf[$exp[1]] : null;
-            return $val;
-        }
-        return null;
-    }
+	/**
+	 * @param $key
+	 * @param null $directory
+	 * @return null
+	 */
+	public static function get($key, $directory = null)
+	{
+		$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");
+			$val = array_key_exists($exp[1], $conf) ? $conf[$exp[1]] : null;
+			return $val;
+		}
+		return null;
+	}
 
 } 
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -22,10 +22,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;
         }

api/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/Lib/Helpers/Dom.php

Indentation +5 added lines, -5 removed lines

@@ -9,11 +9,11 @@
  */
 class Dom
 {
-    /**
-     * @param $node
-     * @return string
-     */
-    public static function getHtml($node) {
+	/**
+	 * @param $node
+	 * @return string
+	 */
+	public static function getHtml($node) {
 		$innerHTML= '';
 		$children = $node->childNodes;
 		foreach ($children as $child) {

Spacing +2 added lines, -2 removed lines

@@ -14,10 +14,10 @@
      * @return string
      */
     public static function getHtml($node) {
-		$innerHTML= '';
+		$innerHTML = '';
 		$children = $node->childNodes;
 		foreach ($children as $child) {
-			$innerHTML .= $child->ownerDocument->saveXML( $child );
+			$innerHTML .= $child->ownerDocument->saveXML($child);
 		}
 		return $innerHTML;
 	}

api/Lib/Helpers/RegExp.php

Indentation +12 added lines, -12 removed lines

@@ -9,24 +9,24 @@
  */
 class RegExp
 {
-    /**
-     * @param $regexp
-     * @param $target
-     * @return null
-     */
-    public static function getFirstMatch($regexp, $target)
+	/**
+	 * @param $regexp
+	 * @param $target
+	 * @return null
+	 */
+	public static function getFirstMatch($regexp, $target)
 	{
 		preg_match_all($regexp, $target, $matches);
 		$match = array_key_exists(0,$matches[1]) ? $matches[1][0] : null;
 		return $match;
 	}
 
-    /**
-     * @param $regexp
-     * @param $target
-     * @return null
-     */
-    public static function getAllMatch($regexp, $target)
+	/**
+	 * @param $regexp
+	 * @param $target
+	 * @return null
+	 */
+	public static function getAllMatch($regexp, $target)
 	{
 		$matches = null;
 		preg_match_all($regexp, $target, $matches);

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     public static function getFirstMatch($regexp, $target)
 	{
 		preg_match_all($regexp, $target, $matches);
-		$match = array_key_exists(0,$matches[1]) ? $matches[1][0] : null;
+		$match = array_key_exists(0, $matches[1]) ? $matches[1][0] : null;
 		return $match;
 	}
 

api/Lib/DsManager/Helpers/RandomFiller.php

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;

 

 /**

Doc Comments +2 added lines, -2 removed lines

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

 

     /**

-     * @param null $forcedRole

+     * @param string|null $forcedRole

      * @param null $locale

      * @return Player

      */

@@ -149,7 +149,7 @@ 
     }

 

     /**

-     * @param $locale

+     * @param string $locale

      * @return mixed

      */

     private function nationalityFromLocale($locale)

Indentation +152 added lines, -152 removed lines

@@ -15,157 +15,157 @@
  */

 class RandomFiller

 {

-    /**

-     * @var \Faker\Generator

-     */

-    protected $faker;

-

-    /**

-     * @var string

-     */

-    protected $locale;

-

-

-    /**

-     * RandomFiller constructor.

-     * @param string $locale

-     */

-    public function __construct($locale = "it_IT")

-    {

-        $this->locale = $locale;

-        $this->faker = \Faker\Factory::create($locale);

-    }

-

-    /**

-     * @return string

-     */

-    public function getTeamName()

-    {

-        return $this->faker->city;

-    }

-

-

-    /**

-     * @param null $forcedRole

-     * @param null $locale

-     * @return Player

-     */

-    public function getPlayer($forcedRole = null, $locale = null)

-    {

-        $this->setFaker($locale);

-        $player = new Player;

-        $player->name = $this->faker->firstNameMale;

-        $player->surname = $this->faker->lastName;

-        $player->role = $forcedRole == null ? $this->getRole() : $forcedRole;

-        $player->nationality = $this->nationalityFromLocale($this->locale);

-        $player->age = rand(16, 38);

-        $player->skillAvg = rand(40, 100);

-

-        return $player;

-    }

-

-

-    /**

-     * @param null $locale

-     * @return Coach

-     */

-    public function getCoach($locale = null)

-    {

-        $this->setFaker($locale);

-        $coach = new Coach;

-        $coach->name = $this->faker->firstNameMale;

-        $coach->surname = $this->faker->lastName;

-        $coach->favouriteModule = $this->getModule();

-        $coach->nationality = $this->nationalityFromLocale($this->locale);

-        $coach->age = rand(33, 68);

-        $coach->skillAvg = rand(40, 100);

-

-        return $coach;

-    }

-

-    /**

-     * @return mixed

-     */

-    public function getRole()

-    {

-        $roles = array_keys(Config::get('modules.roles'));

-        shuffle($roles);

-        return $roles[0];

-    }

-

-    /**

-     * @return mixed

-     */

-    public function getModule()

-    {

-        $modules = array_keys(Config::get('modules.modules'));

-        shuffle($modules);

-        return $modules[0];

-    }

-

-

-    /**

-     * @param null $locale

-     * @return Team

-     */

-    public function getTeam($locale = null)

-    {

-        $rosterConf = Config::get('generic.rosters');

-        $numberOfPlayers = rand($rosterConf['min'], $rosterConf['max']);

-        $this->setFaker($locale);

-        $team = new Team;

-        $team->name = $this->getTeamName();

-        $team->nationality = $this->nationalityFromLocale($this->locale);

-        $players = [];

-        for ($i = 0; $i < $numberOfPlayers; $i++) {

-            $players[] = $this->getPlayer();

-        }

-        //Adding some forced role

-        $players[] = $this->getPlayer("GK", $this->getLocale());

-        $players[] = $this->getPlayer("CD", $this->getLocale());

-        $players[] = $this->getPlayer("CD", $this->getLocale());

-        $players[] = $this->getPlayer("CM", $this->getLocale());

-        $players[] = $this->getPlayer("CM", $this->getLocale());

-        $players[] = $this->getPlayer("CS", $this->getLocale());

-        //

-

-        $team->roster = $players;

-        //setting random Nationality Coach (20%)

-        $coachNationality = Randomizer::boolOnPercentage(20) ? $this->getLocale() : null;

-        $team->coach = $this->getCoach($coachNationality);

-

-        return $team;

-    }

-

-

-    /**

-     * @return mixed

-     */

-    public function getLocale()

-    {

-        $locales = (Config::get('generic.localesSmall'));

-        shuffle($locales);

-        return $locales[0];

-    }

-

-    /**

-     * @param $locale

-     * @return mixed

-     */

-    private function nationalityFromLocale($locale)

-    {

-        return preg_replace("/.._/", '', $locale);

-    }

-

-    /**

-     * @param $locale

-     */

-    private function setFaker($locale)

-    {

-        if ($locale !== null) {

-            $this->faker = \Faker\Factory::create($locale);

-            $this->locale = $locale;

-        }

-    }

+	/**

+	 * @var \Faker\Generator

+	 */

+	protected $faker;

+

+	/**

+	 * @var string

+	 */

+	protected $locale;

+

+

+	/**

+	 * RandomFiller constructor.

+	 * @param string $locale

+	 */

+	public function __construct($locale = "it_IT")

+	{

+		$this->locale = $locale;

+		$this->faker = \Faker\Factory::create($locale);

+	}

+

+	/**

+	 * @return string

+	 */

+	public function getTeamName()

+	{

+		return $this->faker->city;

+	}

+

+

+	/**

+	 * @param null $forcedRole

+	 * @param null $locale

+	 * @return Player

+	 */

+	public function getPlayer($forcedRole = null, $locale = null)

+	{

+		$this->setFaker($locale);

+		$player = new Player;

+		$player->name = $this->faker->firstNameMale;

+		$player->surname = $this->faker->lastName;

+		$player->role = $forcedRole == null ? $this->getRole() : $forcedRole;

+		$player->nationality = $this->nationalityFromLocale($this->locale);

+		$player->age = rand(16, 38);

+		$player->skillAvg = rand(40, 100);

+

+		return $player;

+	}

+

+

+	/**

+	 * @param null $locale

+	 * @return Coach

+	 */

+	public function getCoach($locale = null)

+	{

+		$this->setFaker($locale);

+		$coach = new Coach;

+		$coach->name = $this->faker->firstNameMale;

+		$coach->surname = $this->faker->lastName;

+		$coach->favouriteModule = $this->getModule();

+		$coach->nationality = $this->nationalityFromLocale($this->locale);

+		$coach->age = rand(33, 68);

+		$coach->skillAvg = rand(40, 100);

+

+		return $coach;

+	}

+

+	/**

+	 * @return mixed

+	 */

+	public function getRole()

+	{

+		$roles = array_keys(Config::get('modules.roles'));

+		shuffle($roles);

+		return $roles[0];

+	}

+

+	/**

+	 * @return mixed

+	 */

+	public function getModule()

+	{

+		$modules = array_keys(Config::get('modules.modules'));

+		shuffle($modules);

+		return $modules[0];

+	}

+

+

+	/**

+	 * @param null $locale

+	 * @return Team

+	 */

+	public function getTeam($locale = null)

+	{

+		$rosterConf = Config::get('generic.rosters');

+		$numberOfPlayers = rand($rosterConf['min'], $rosterConf['max']);

+		$this->setFaker($locale);

+		$team = new Team;

+		$team->name = $this->getTeamName();

+		$team->nationality = $this->nationalityFromLocale($this->locale);

+		$players = [];

+		for ($i = 0; $i < $numberOfPlayers; $i++) {

+			$players[] = $this->getPlayer();

+		}

+		//Adding some forced role

+		$players[] = $this->getPlayer("GK", $this->getLocale());

+		$players[] = $this->getPlayer("CD", $this->getLocale());

+		$players[] = $this->getPlayer("CD", $this->getLocale());

+		$players[] = $this->getPlayer("CM", $this->getLocale());

+		$players[] = $this->getPlayer("CM", $this->getLocale());

+		$players[] = $this->getPlayer("CS", $this->getLocale());

+		//

+

+		$team->roster = $players;

+		//setting random Nationality Coach (20%)

+		$coachNationality = Randomizer::boolOnPercentage(20) ? $this->getLocale() : null;

+		$team->coach = $this->getCoach($coachNationality);

+

+		return $team;

+	}

+

+

+	/**

+	 * @return mixed

+	 */

+	public function getLocale()

+	{

+		$locales = (Config::get('generic.localesSmall'));

+		shuffle($locales);

+		return $locales[0];

+	}

+

+	/**

+	 * @param $locale

+	 * @return mixed

+	 */

+	private function nationalityFromLocale($locale)

+	{

+		return preg_replace("/.._/", '', $locale);

+	}

+

+	/**

+	 * @param $locale

+	 */

+	private function setFaker($locale)

+	{

+		if ($locale !== null) {

+			$this->faker = \Faker\Factory::create($locale);

+			$this->locale = $locale;

+		}

+	}

 

 }
\ No newline at end of file

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

Indentation +24 added lines, -24 removed lines

@@ -9,31 +9,31 @@
  */

 class Coach extends DsManagerOrm

 {

-    /**

-     * @var string

-     */

-    protected $table = 'coaches';

+	/**

+	 * @var string

+	 */

+	protected $table = 'coaches';

 

-    /**

-     * @var array

-     */

-    protected $fillable = [

-        'name',

-        'surname',

-        'age',

-        'nationality',

-        'skillAvg',

-        'wageReq',

-        'favouriteModule',

-        'team_id'

-    ];

+	/**

+	 * @var array

+	 */

+	protected $fillable = [

+		'name',

+		'surname',

+		'age',

+		'nationality',

+		'skillAvg',

+		'wageReq',

+		'favouriteModule',

+		'team_id'

+	];

 

-    /**

-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo

-     */

-    public function team()

-    {

-        return $this->belongsTo(Team::class);

-    }

+	/**

+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo

+	 */

+	public function team()

+	{

+		return $this->belongsTo(Team::class);

+	}

 

 } 
\ No newline at end of file