@@ -63,7 +63,7 @@ |
||
| 63 | 63 | |
| 64 | 64 | public function assignToMachine($id, ?Machine $machine) |
| 65 | 65 | { |
| 66 | - return $this->update($id, ['machine_id' => $machine->id ?? null]); |
|
| 66 | + return $this->update($id, [ 'machine_id' => $machine->id ?? null ]); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | public function unlinkFromMachine($id) |
@@ -5,90 +5,90 @@ |
||
| 5 | 5 | |
| 6 | 6 | $factory->define(Account::class, function (Faker $faker) { |
| 7 | 7 | return [ |
| 8 | - 'user_id' => 1, |
|
| 9 | - 'username' => $faker->unique()->safeEmail, |
|
| 10 | - 'password' => $faker->password, |
|
| 11 | - 'game' => 'OSRS', |
|
| 12 | - 'banned_at' => $faker->boolean(80) ? null : \Carbon\Carbon::now()->subHours($faker->numberBetween(1, 500)), |
|
| 13 | - 'last_heartbeat_at' => $faker->boolean(50) ? null : \Carbon\Carbon::now()->subSeconds($faker->numberBetween(1, 500)), |
|
| 14 | - 'performance_mode' => array_random([ |
|
| 15 | - 'EXTREME', |
|
| 16 | - 'MEDIUM', |
|
| 17 | - 'DISABLED', |
|
| 18 | - ]), |
|
| 19 | - 'logged_in' => $faker->boolean, |
|
| 20 | - 'machine_id' => 1, |
|
| 21 | - ]; |
|
| 8 | + 'user_id' => 1, |
|
| 9 | + 'username' => $faker->unique()->safeEmail, |
|
| 10 | + 'password' => $faker->password, |
|
| 11 | + 'game' => 'OSRS', |
|
| 12 | + 'banned_at' => $faker->boolean(80) ? null : \Carbon\Carbon::now()->subHours($faker->numberBetween(1, 500)), |
|
| 13 | + 'last_heartbeat_at' => $faker->boolean(50) ? null : \Carbon\Carbon::now()->subSeconds($faker->numberBetween(1, 500)), |
|
| 14 | + 'performance_mode' => array_random([ |
|
| 15 | + 'EXTREME', |
|
| 16 | + 'MEDIUM', |
|
| 17 | + 'DISABLED', |
|
| 18 | + ]), |
|
| 19 | + 'logged_in' => $faker->boolean, |
|
| 20 | + 'machine_id' => 1, |
|
| 21 | + ]; |
|
| 22 | 22 | }); |
| 23 | 23 | |
| 24 | - $factory->state(Account::class, 'OSRS', function (Faker $faker) { |
|
| 25 | - return [ |
|
| 26 | - 'game' => 'OSRS', |
|
| 27 | - 'bank_pin' => $faker->randomNumber(4, true), |
|
| 28 | - 'ingame_name' => $faker->userName, |
|
| 29 | - 'membership_expires_at' => $faker->boolean(80) ? null : \Carbon\Carbon::now()->addHours($faker->numberBetween(1, 500)), |
|
| 30 | - 'location' => [ |
|
| 31 | - 'x' => $faker->numberBetween(-10000, 10000), |
|
| 32 | - 'y' => $faker->numberBetween(-10000, 10000), |
|
| 33 | - 'z' => $faker->numberBetween(0, 3), |
|
| 34 | - ], |
|
| 35 | - 'skills' => [ |
|
| 36 | - 'hitpoints' => $faker->numberBetween(0, 200000000), |
|
| 37 | - 'attack' => $faker->numberBetween(0, 200000000), |
|
| 38 | - 'strength' => $faker->numberBetween(0, 200000000), |
|
| 39 | - 'defence' => $faker->numberBetween(0, 200000000), |
|
| 40 | - 'ranged' => $faker->numberBetween(0, 200000000), |
|
| 41 | - 'prayer' => $faker->numberBetween(0, 200000000), |
|
| 42 | - 'magic' => $faker->numberBetween(0, 200000000), |
|
| 43 | - 'runecrafting' => $faker->numberBetween(0, 200000000), |
|
| 44 | - 'crafting' => $faker->numberBetween(0, 200000000), |
|
| 45 | - 'mining' => $faker->numberBetween(0, 200000000), |
|
| 46 | - 'smithing' => $faker->numberBetween(0, 200000000), |
|
| 47 | - 'fishing' => $faker->numberBetween(0, 200000000), |
|
| 48 | - 'cooking' => $faker->numberBetween(0, 200000000), |
|
| 49 | - 'firemaking' => $faker->numberBetween(0, 200000000), |
|
| 50 | - 'woodcutting' => $faker->numberBetween(0, 200000000), |
|
| 51 | - 'agility' => $faker->numberBetween(0, 200000000), |
|
| 52 | - 'herblore' => $faker->numberBetween(0, 200000000), |
|
| 53 | - 'thieving' => $faker->numberBetween(0, 200000000), |
|
| 54 | - 'fletching' => $faker->numberBetween(0, 200000000), |
|
| 55 | - 'slayer' => $faker->numberBetween(0, 200000000), |
|
| 56 | - 'farming' => $faker->numberBetween(0, 200000000), |
|
| 57 | - 'construction' => $faker->numberBetween(0, 200000000), |
|
| 58 | - 'hunter' => $faker->numberBetween(0, 200000000), |
|
| 59 | - ], |
|
| 60 | - 'items' => [ |
|
| 61 | - 'bank' => [ |
|
| 62 | - [ |
|
| 63 | - 'item_id' => 5, |
|
| 64 | - 'amount' => 2, |
|
| 65 | - ], |
|
| 66 | - [ |
|
| 67 | - 'item_id' => 4, |
|
| 68 | - 'amount' => 3, |
|
| 69 | - ], |
|
| 70 | - [ |
|
| 71 | - 'item_id' => 2, |
|
| 72 | - 'amount' => 1, |
|
| 73 | - ], |
|
| 74 | - ], |
|
| 75 | - 'equipment' => [], |
|
| 76 | - 'grand_exchange' => [ |
|
| 77 | - [ |
|
| 78 | - 'item_id' => 5, |
|
| 79 | - 'amount' => 2, |
|
| 80 | - ], |
|
| 81 | - ], |
|
| 82 | - 'inventory' => [], |
|
| 83 | - ], |
|
| 84 | - ]; |
|
| 85 | - }); |
|
| 24 | + $factory->state(Account::class, 'OSRS', function (Faker $faker) { |
|
| 25 | + return [ |
|
| 26 | + 'game' => 'OSRS', |
|
| 27 | + 'bank_pin' => $faker->randomNumber(4, true), |
|
| 28 | + 'ingame_name' => $faker->userName, |
|
| 29 | + 'membership_expires_at' => $faker->boolean(80) ? null : \Carbon\Carbon::now()->addHours($faker->numberBetween(1, 500)), |
|
| 30 | + 'location' => [ |
|
| 31 | + 'x' => $faker->numberBetween(-10000, 10000), |
|
| 32 | + 'y' => $faker->numberBetween(-10000, 10000), |
|
| 33 | + 'z' => $faker->numberBetween(0, 3), |
|
| 34 | + ], |
|
| 35 | + 'skills' => [ |
|
| 36 | + 'hitpoints' => $faker->numberBetween(0, 200000000), |
|
| 37 | + 'attack' => $faker->numberBetween(0, 200000000), |
|
| 38 | + 'strength' => $faker->numberBetween(0, 200000000), |
|
| 39 | + 'defence' => $faker->numberBetween(0, 200000000), |
|
| 40 | + 'ranged' => $faker->numberBetween(0, 200000000), |
|
| 41 | + 'prayer' => $faker->numberBetween(0, 200000000), |
|
| 42 | + 'magic' => $faker->numberBetween(0, 200000000), |
|
| 43 | + 'runecrafting' => $faker->numberBetween(0, 200000000), |
|
| 44 | + 'crafting' => $faker->numberBetween(0, 200000000), |
|
| 45 | + 'mining' => $faker->numberBetween(0, 200000000), |
|
| 46 | + 'smithing' => $faker->numberBetween(0, 200000000), |
|
| 47 | + 'fishing' => $faker->numberBetween(0, 200000000), |
|
| 48 | + 'cooking' => $faker->numberBetween(0, 200000000), |
|
| 49 | + 'firemaking' => $faker->numberBetween(0, 200000000), |
|
| 50 | + 'woodcutting' => $faker->numberBetween(0, 200000000), |
|
| 51 | + 'agility' => $faker->numberBetween(0, 200000000), |
|
| 52 | + 'herblore' => $faker->numberBetween(0, 200000000), |
|
| 53 | + 'thieving' => $faker->numberBetween(0, 200000000), |
|
| 54 | + 'fletching' => $faker->numberBetween(0, 200000000), |
|
| 55 | + 'slayer' => $faker->numberBetween(0, 200000000), |
|
| 56 | + 'farming' => $faker->numberBetween(0, 200000000), |
|
| 57 | + 'construction' => $faker->numberBetween(0, 200000000), |
|
| 58 | + 'hunter' => $faker->numberBetween(0, 200000000), |
|
| 59 | + ], |
|
| 60 | + 'items' => [ |
|
| 61 | + 'bank' => [ |
|
| 62 | + [ |
|
| 63 | + 'item_id' => 5, |
|
| 64 | + 'amount' => 2, |
|
| 65 | + ], |
|
| 66 | + [ |
|
| 67 | + 'item_id' => 4, |
|
| 68 | + 'amount' => 3, |
|
| 69 | + ], |
|
| 70 | + [ |
|
| 71 | + 'item_id' => 2, |
|
| 72 | + 'amount' => 1, |
|
| 73 | + ], |
|
| 74 | + ], |
|
| 75 | + 'equipment' => [], |
|
| 76 | + 'grand_exchange' => [ |
|
| 77 | + [ |
|
| 78 | + 'item_id' => 5, |
|
| 79 | + 'amount' => 2, |
|
| 80 | + ], |
|
| 81 | + ], |
|
| 82 | + 'inventory' => [], |
|
| 83 | + ], |
|
| 84 | + ]; |
|
| 85 | + }); |
|
| 86 | 86 | |
| 87 | - $factory->state(Account::class, 'RS3', function (Faker $faker) { |
|
| 88 | - return [ |
|
| 89 | - 'game' => 'RS3', |
|
| 90 | - 'bank_pin' => $faker->randomNumber(4, true), |
|
| 91 | - 'ingame_name' => $faker->userName, |
|
| 92 | - 'membership_expires_at' => null, |
|
| 93 | - ]; |
|
| 94 | - }); |
|
| 87 | + $factory->state(Account::class, 'RS3', function (Faker $faker) { |
|
| 88 | + return [ |
|
| 89 | + 'game' => 'RS3', |
|
| 90 | + 'bank_pin' => $faker->randomNumber(4, true), |
|
| 91 | + 'ingame_name' => $faker->userName, |
|
| 92 | + 'membership_expires_at' => null, |
|
| 93 | + ]; |
|
| 94 | + }); |
|
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | use Faker\Generator as Faker; |
| 4 | 4 | use Modules\Account\Entities\Account; |
| 5 | 5 | |
| 6 | -$factory->define(Account::class, function (Faker $faker) { |
|
| 6 | +$factory->define(Account::class, function(Faker $faker) { |
|
| 7 | 7 | return [ |
| 8 | 8 | 'user_id' => 1, |
| 9 | 9 | 'username' => $faker->unique()->safeEmail, |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | ]; |
| 22 | 22 | }); |
| 23 | 23 | |
| 24 | - $factory->state(Account::class, 'OSRS', function (Faker $faker) { |
|
| 24 | + $factory->state(Account::class, 'OSRS', function(Faker $faker) { |
|
| 25 | 25 | return [ |
| 26 | 26 | 'game' => 'OSRS', |
| 27 | 27 | 'bank_pin' => $faker->randomNumber(4, true), |
@@ -72,19 +72,19 @@ discard block |
||
| 72 | 72 | 'amount' => 1, |
| 73 | 73 | ], |
| 74 | 74 | ], |
| 75 | - 'equipment' => [], |
|
| 75 | + 'equipment' => [ ], |
|
| 76 | 76 | 'grand_exchange' => [ |
| 77 | 77 | [ |
| 78 | 78 | 'item_id' => 5, |
| 79 | 79 | 'amount' => 2, |
| 80 | 80 | ], |
| 81 | 81 | ], |
| 82 | - 'inventory' => [], |
|
| 82 | + 'inventory' => [ ], |
|
| 83 | 83 | ], |
| 84 | 84 | ]; |
| 85 | 85 | }); |
| 86 | 86 | |
| 87 | - $factory->state(Account::class, 'RS3', function (Faker $faker) { |
|
| 87 | + $factory->state(Account::class, 'RS3', function(Faker $faker) { |
|
| 88 | 88 | return [ |
| 89 | 89 | 'game' => 'RS3', |
| 90 | 90 | 'bank_pin' => $faker->randomNumber(4, true), |
@@ -17,9 +17,9 @@ discard block |
||
| 17 | 17 | { |
| 18 | 18 | use IncludesRelations; |
| 19 | 19 | |
| 20 | - public $include = []; |
|
| 20 | + public $include = [ ]; |
|
| 21 | 21 | |
| 22 | - public $available = []; |
|
| 22 | + public $available = [ ]; |
|
| 23 | 23 | |
| 24 | 24 | public function __construct($resource) |
| 25 | 25 | { |
@@ -57,6 +57,6 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | public function transformResource() |
| 59 | 59 | { |
| 60 | - return []; |
|
| 60 | + return [ ]; |
|
| 61 | 61 | } |
| 62 | 62 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | return explode(',', $request->include); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - return []; |
|
| 29 | + return [ ]; |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | /** |
@@ -35,10 +35,10 @@ discard block |
||
| 35 | 35 | public function compileRelations() |
| 36 | 36 | { |
| 37 | 37 | $requestedRelations = $this->parseRequestIncludeParameter(); |
| 38 | - $relations = []; |
|
| 38 | + $relations = [ ]; |
|
| 39 | 39 | foreach ($requestedRelations as $requestedRelation) { |
| 40 | - if (isset($this->available[$requestedRelation])) { |
|
| 41 | - $relations[$requestedRelation] = $this->available[$requestedRelation]; |
|
| 40 | + if (isset($this->available[ $requestedRelation ])) { |
|
| 41 | + $relations[ $requestedRelation ] = $this->available[ $requestedRelation ]; |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | $merge = array_merge($this->include, $relations); |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | if (is_array($relation)) { |
| 57 | 57 | $this->include = array_merge($this->include, $relation); |
| 58 | 58 | } else { |
| 59 | - $this->include[] = $relation; |
|
| 59 | + $this->include[ ] = $relation; |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | return $this; |
@@ -64,18 +64,18 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | protected function includeRelations() |
| 66 | 66 | { |
| 67 | - $relations = []; |
|
| 67 | + $relations = [ ]; |
|
| 68 | 68 | if ($this->resource instanceof Model) { |
| 69 | 69 | $relations = $this->compileRelations(); |
| 70 | 70 | foreach ($relations as $relation => $transformer) { |
| 71 | 71 | $relationMethodName = 'transform'.ucfirst(strtolower($relation)); |
| 72 | 72 | if (method_exists($this, $relationMethodName)) { |
| 73 | - $relations[$relation] = $this->$relationMethodName($this->resource->$relation); |
|
| 73 | + $relations[ $relation ] = $this->$relationMethodName($this->resource->$relation); |
|
| 74 | 74 | } else { |
| 75 | 75 | if ($this->resource->$relation instanceof Model) { |
| 76 | - $relations[$relation] = $transformer::resource($this->whenLoaded($relation)); |
|
| 76 | + $relations[ $relation ] = $transformer::resource($this->whenLoaded($relation)); |
|
| 77 | 77 | } elseif ($this->resource->$relation instanceof Collection) { |
| 78 | - $relations[$relation] = $transformer::collection($this->whenLoaded($relation)); |
|
| 78 | + $relations[ $relation ] = $transformer::collection($this->whenLoaded($relation)); |
|
| 79 | 79 | } |
| 80 | 80 | } |
| 81 | 81 | } |