@@ -39,7 +39,7 @@ |
||
39 | 39 | 'location' => 'required|string|max:255', |
40 | 40 | ]); |
41 | 41 | |
42 | - $supplier = Supplier::create($request->only(['name', 'location'])); |
|
42 | + $supplier = Supplier::create($request->only([ 'name', 'location' ])); |
|
43 | 43 | event(new SupplierWasCreated($supplier)); |
44 | 44 | } |
45 | 45 |
@@ -40,7 +40,7 @@ |
||
40 | 40 | $purchase = Purchase::findOrFail($id); |
41 | 41 | |
42 | 42 | return fractal()->item($purchase, new PurchaseTransformer) |
43 | - ->parseIncludes(['guitars', 'supplier']) |
|
43 | + ->parseIncludes([ 'guitars', 'supplier' ]) |
|
44 | 44 | ->toArray(); |
45 | 45 | } |
46 | 46 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | { |
32 | 32 | $this->info('Starting Installation...'); |
33 | 33 | |
34 | - if ( ! env('APP_KEY')) { |
|
34 | + if (!env('APP_KEY')) { |
|
35 | 35 | $this->info('Generating app key'); |
36 | 36 | Artisan::call('key:generate'); |
37 | 37 | } else { |
@@ -39,11 +39,11 @@ discard block |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | $this->info('Migrating database'); |
42 | - Artisan::call('migrate', ['--force' => true]); |
|
42 | + Artisan::call('migrate', [ '--force' => true ]); |
|
43 | 43 | |
44 | - if ( ! User::count()) { |
|
44 | + if (!User::count()) { |
|
45 | 45 | $this->info('Seeding initial data'); |
46 | - Artisan::call('db:seed', ['--force' => true]); |
|
46 | + Artisan::call('db:seed', [ '--force' => true ]); |
|
47 | 47 | } else { |
48 | 48 | $this->comment('Skipping - Data already seeded'); |
49 | 49 | } |
@@ -13,11 +13,11 @@ |
||
13 | 13 | */ |
14 | 14 | public function broadcastOn() |
15 | 15 | { |
16 | - return ['default']; |
|
16 | + return [ 'default' ]; |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | public function broadcastWith() |
20 | 20 | { |
21 | - return []; |
|
21 | + return [ ]; |
|
22 | 22 | } |
23 | 23 | } |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -Route::group(['middleware' => 'web'], function ($router) { |
|
4 | - $router->get('/', function () { |
|
3 | +Route::group([ 'middleware' => 'web' ], function($router) { |
|
4 | + $router->get('/', function() { |
|
5 | 5 | return redirect('/dashboard'); |
6 | 6 | }); |
7 | 7 | |
@@ -35,13 +35,13 @@ discard block |
||
35 | 35 | $router->put('api/notifications/{id}/dismiss', 'API\NotificationController@dismiss'); |
36 | 36 | $router->get('api/users/me', 'API\UserController@getCurrentUser'); |
37 | 37 | |
38 | - $router->resource('makes', 'MakeController', ['except' => ['create', 'show', 'edit', 'update']]); |
|
39 | - $router->resource('models', 'ModelController', ['except' => ['create', 'show', 'edit', 'update']]); |
|
40 | - $router->resource('purchases', 'PurchaseController', ['except' => ['create', 'edit', 'update']]); |
|
38 | + $router->resource('makes', 'MakeController', [ 'except' => [ 'create', 'show', 'edit', 'update' ] ]); |
|
39 | + $router->resource('models', 'ModelController', [ 'except' => [ 'create', 'show', 'edit', 'update' ] ]); |
|
40 | + $router->resource('purchases', 'PurchaseController', [ 'except' => [ 'create', 'edit', 'update' ] ]); |
|
41 | 41 | $router->post('purchases/{id}/guitars', 'GuitarController@store'); |
42 | - $router->resource('suppliers', 'SupplierController', ['except' => ['create', 'show', 'edit', 'update']]); |
|
43 | - $router->resource('warehouses', 'WarehouseController', ['except' => ['create', 'show', 'edit']]); |
|
44 | - $router->resource('guitars', 'GuitarController', ['only' => ['index', 'update', 'destroy']]); |
|
42 | + $router->resource('suppliers', 'SupplierController', [ 'except' => [ 'create', 'show', 'edit', 'update' ] ]); |
|
43 | + $router->resource('warehouses', 'WarehouseController', [ 'except' => [ 'create', 'show', 'edit' ] ]); |
|
44 | + $router->resource('guitars', 'GuitarController', [ 'only' => [ 'index', 'update', 'destroy' ] ]); |
|
45 | 45 | $router->get('guitars/{id}/sale', 'GuitarController@showSaleFor'); |
46 | 46 | $router->post('guitars/{id}/sale', 'GuitarController@sale'); |
47 | 47 | }); |
@@ -13,33 +13,33 @@ |
||
13 | 13 | * @var array |
14 | 14 | */ |
15 | 15 | protected $listen = [ |
16 | - 'App\Events\MakeWasCreated' => [], |
|
17 | - 'App\Events\MakeWasDeleted' => [], |
|
16 | + 'App\Events\MakeWasCreated' => [ ], |
|
17 | + 'App\Events\MakeWasDeleted' => [ ], |
|
18 | 18 | |
19 | - 'App\Events\ModelWasCreated' => [], |
|
20 | - 'App\Events\ModelWasDeleted' => [], |
|
19 | + 'App\Events\ModelWasCreated' => [ ], |
|
20 | + 'App\Events\ModelWasDeleted' => [ ], |
|
21 | 21 | |
22 | - 'App\Events\WarehouseWasCreated' => [], |
|
23 | - 'App\Events\WarehouseWasUpdated' => [], |
|
24 | - 'App\Events\WarehouseWasDeleted' => [], |
|
22 | + 'App\Events\WarehouseWasCreated' => [ ], |
|
23 | + 'App\Events\WarehouseWasUpdated' => [ ], |
|
24 | + 'App\Events\WarehouseWasDeleted' => [ ], |
|
25 | 25 | |
26 | - 'App\Events\SupplierWasCreated' => [], |
|
27 | - 'App\Events\SupplierWasDeleted' => [], |
|
26 | + 'App\Events\SupplierWasCreated' => [ ], |
|
27 | + 'App\Events\SupplierWasDeleted' => [ ], |
|
28 | 28 | |
29 | 29 | 'App\Events\PurchaseWasCreated' => [ |
30 | 30 | 'App\Listeners\GeneratePurchaseNotification', |
31 | 31 | ], |
32 | - 'App\Events\PurchaseWasDeleted' => [], |
|
32 | + 'App\Events\PurchaseWasDeleted' => [ ], |
|
33 | 33 | |
34 | - 'App\Events\GuitarWasCreated' => [], |
|
35 | - 'App\Events\GuitarWasUpdated' => [], |
|
36 | - 'App\Events\GuitarWasDeleted' => [], |
|
34 | + 'App\Events\GuitarWasCreated' => [ ], |
|
35 | + 'App\Events\GuitarWasUpdated' => [ ], |
|
36 | + 'App\Events\GuitarWasDeleted' => [ ], |
|
37 | 37 | |
38 | - 'App\Events\SaleWasCreated' => [], |
|
39 | - 'App\Events\SaleWasDeleted' => [], |
|
38 | + 'App\Events\SaleWasCreated' => [ ], |
|
39 | + 'App\Events\SaleWasDeleted' => [ ], |
|
40 | 40 | |
41 | - 'App\Events\NotificationWasCreated' => [], |
|
42 | - 'App\Events\NotificationWasDismissed' => [], |
|
41 | + 'App\Events\NotificationWasCreated' => [ ], |
|
42 | + 'App\Events\NotificationWasDismissed' => [ ], |
|
43 | 43 | ]; |
44 | 44 | |
45 | 45 | /** |
@@ -44,14 +44,14 @@ discard block |
||
44 | 44 | public function store($id, Request $request) |
45 | 45 | { |
46 | 46 | $purchase = Purchase::findOrFail($id); |
47 | - if ( ! $purchase->hasArrived() || ! $purchase->isPendingStorage()) { |
|
48 | - return response(['purchase' => ['The purchase has not yet arrived or doesn\'t require addition of guitars.']], |
|
47 | + if (!$purchase->hasArrived() || !$purchase->isPendingStorage()) { |
|
48 | + return response([ 'purchase' => [ 'The purchase has not yet arrived or doesn\'t require addition of guitars.' ] ], |
|
49 | 49 | 422); |
50 | 50 | } |
51 | 51 | |
52 | 52 | $this->validate($request, [ |
53 | - 'rack_id' => 'required|exists:racks,id,make_id,' . $purchase->make_id, |
|
54 | - 'model_id' => 'required|exists:models,id,make_id,' . $purchase->make_id, |
|
53 | + 'rack_id' => 'required|exists:racks,id,make_id,'.$purchase->make_id, |
|
54 | + 'model_id' => 'required|exists:models,id,make_id,'.$purchase->make_id, |
|
55 | 55 | 'colour' => 'required|string|max:255', |
56 | 56 | 'damaged' => 'boolean', |
57 | 57 | 'condition' => 'required_if:damaged,true', |
@@ -60,10 +60,10 @@ discard block |
||
60 | 60 | |
61 | 61 | $rack = Rack::find($request->input('rack_id')); |
62 | 62 | if ($rack->used >= $rack->capacity) { |
63 | - return response(['rack_id' => ['The selected rack is full.']], 422); |
|
63 | + return response([ 'rack_id' => [ 'The selected rack is full.' ] ], 422); |
|
64 | 64 | } |
65 | 65 | |
66 | - $guitar = Guitar::create($request->only(['rack_id', 'model_id', 'colour', 'price']) + [ |
|
66 | + $guitar = Guitar::create($request->only([ 'rack_id', 'model_id', 'colour', 'price' ]) + [ |
|
67 | 67 | 'make_id' => $purchase->make_id, |
68 | 68 | 'purchase_id' => $purchase->id, |
69 | 69 | 'damaged' => $request->input('damaged'), |
@@ -85,8 +85,8 @@ discard block |
||
85 | 85 | { |
86 | 86 | $guitar = Guitar::findOrFail($id); |
87 | 87 | $this->validate($request, [ |
88 | - 'rack_id' => 'required|exists:racks,id,make_id,' . $guitar->make_id, |
|
89 | - 'model_id' => 'required|exists:models,id,make_id,' . $guitar->make_id, |
|
88 | + 'rack_id' => 'required|exists:racks,id,make_id,'.$guitar->make_id, |
|
89 | + 'model_id' => 'required|exists:models,id,make_id,'.$guitar->make_id, |
|
90 | 90 | 'colour' => 'required|string|max:255', |
91 | 91 | 'damaged' => 'boolean', |
92 | 92 | 'condition' => 'required_if:damaged,true', |
@@ -95,10 +95,10 @@ discard block |
||
95 | 95 | |
96 | 96 | $rack = Rack::find($request->input('rack_id')); |
97 | 97 | if ($rack->used >= $rack->capacity) { |
98 | - return response(['rack_id' => ['The selected rack is full.']], 422); |
|
98 | + return response([ 'rack_id' => [ 'The selected rack is full.' ] ], 422); |
|
99 | 99 | } |
100 | 100 | |
101 | - $guitar->update($request->only(['rack_id', 'model_id', 'colour', 'price']) + [ |
|
101 | + $guitar->update($request->only([ 'rack_id', 'model_id', 'colour', 'price' ]) + [ |
|
102 | 102 | 'damaged' => $request->input('damaged'), |
103 | 103 | 'condition' => $request->input('damaged') ? $request->input('condition') : null |
104 | 104 | ]); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $guitar = Guitar::findOrFail($id); |
119 | 119 | |
120 | 120 | if ($guitar->isSold()) { |
121 | - return response(['guitar_id' => ['This guitar has already been sold.']], 422); |
|
121 | + return response([ 'guitar_id' => [ 'This guitar has already been sold.' ] ], 422); |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | $this->validate($request, [ |
@@ -129,10 +129,10 @@ discard block |
||
129 | 129 | |
130 | 130 | $shop = null; |
131 | 131 | if ($request->input('customer_type') == 'shop') { |
132 | - $shop = Shop::create($request->only(['name', 'address']))->id; |
|
132 | + $shop = Shop::create($request->only([ 'name', 'address' ]))->id; |
|
133 | 133 | } |
134 | 134 | |
135 | - $sale = Sale::create($request->only(['name', 'address']) + ['guitar_id' => $id, 'shop_id' => $shop]); |
|
135 | + $sale = Sale::create($request->only([ 'name', 'address' ]) + [ 'guitar_id' => $id, 'shop_id' => $shop ]); |
|
136 | 136 | |
137 | 137 | event(new SaleWasCreated($sale)); |
138 | 138 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -$factory->define(App\User::class, function (Faker\Generator $faker) { |
|
3 | +$factory->define(App\User::class, function(Faker\Generator $faker) { |
|
4 | 4 | return [ |
5 | 5 | 'name' => $faker->name, |
6 | 6 | 'email' => $faker->email, |
@@ -9,47 +9,47 @@ discard block |
||
9 | 9 | ]; |
10 | 10 | }); |
11 | 11 | |
12 | -$factory->define(App\Warehouse::class, function (Faker\Generator $faker) { |
|
12 | +$factory->define(App\Warehouse::class, function(Faker\Generator $faker) { |
|
13 | 13 | return [ |
14 | 14 | 'name' => 'Warehouse #'.$faker->numberBetween(), |
15 | 15 | ]; |
16 | 16 | }); |
17 | 17 | |
18 | -$factory->define(App\Make::class, function (Faker\Generator $faker) { |
|
18 | +$factory->define(App\Make::class, function(Faker\Generator $faker) { |
|
19 | 19 | return [ |
20 | 20 | 'name' => $faker->words(2, true), |
21 | 21 | ]; |
22 | 22 | }); |
23 | 23 | |
24 | -$factory->define(App\Supplier::class, function (Faker\Generator $faker) { |
|
24 | +$factory->define(App\Supplier::class, function(Faker\Generator $faker) { |
|
25 | 25 | return [ |
26 | 26 | 'name' => $faker->company, |
27 | 27 | 'location' => $faker->address, |
28 | 28 | ]; |
29 | 29 | }); |
30 | 30 | |
31 | -$factory->define(App\Shop::class, function (Faker\Generator $faker) { |
|
31 | +$factory->define(App\Shop::class, function(Faker\Generator $faker) { |
|
32 | 32 | return [ |
33 | 33 | 'name' => $faker->company, |
34 | 34 | 'address' => $faker->address, |
35 | 35 | ]; |
36 | 36 | }); |
37 | 37 | |
38 | -$factory->define(App\Rack::class, function (Faker\Generator $faker) { |
|
38 | +$factory->define(App\Rack::class, function(Faker\Generator $faker) { |
|
39 | 39 | return [ |
40 | 40 | 'name' => 'Rack #'.$faker->numberBetween(1, 20), |
41 | 41 | 'capacity' => $faker->randomNumber(3), |
42 | 42 | ]; |
43 | 43 | }); |
44 | 44 | |
45 | -$factory->define(App\Model::class, function (Faker\Generator $faker) { |
|
45 | +$factory->define(App\Model::class, function(Faker\Generator $faker) { |
|
46 | 46 | return [ |
47 | 47 | 'name' => 'Model #'.$faker->numberBetween(1, 20), |
48 | 48 | 'photo' => config('shop.images.dir').$faker->image(config('shop.images.path'), 640, 480, 'technics', null), |
49 | 49 | ]; |
50 | 50 | }); |
51 | 51 | |
52 | -$factory->define(App\Purchase::class, function (Faker\Generator $faker) { |
|
52 | +$factory->define(App\Purchase::class, function(Faker\Generator $faker) { |
|
53 | 53 | return [ |
54 | 54 | 'quantity' => $faker->randomNumber(2), |
55 | 55 | 'price' => $faker->randomFloat(2, 1000), |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | ]; |
59 | 59 | }); |
60 | 60 | |
61 | -$factory->defineAs(App\Purchase::class, 'delivered', function (Faker\Generator $faker) use ($factory) { |
|
61 | +$factory->defineAs(App\Purchase::class, 'delivered', function(Faker\Generator $faker) use ($factory) { |
|
62 | 62 | $user = $factory->raw(App\Purchase::class); |
63 | 63 | |
64 | 64 | return array_merge($user, [ |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | ]); |
68 | 68 | }); |
69 | 69 | |
70 | -$factory->define(App\Guitar::class, function (Faker\Generator $faker) { |
|
70 | +$factory->define(App\Guitar::class, function(Faker\Generator $faker) { |
|
71 | 71 | return [ |
72 | 72 | 'colour' => $faker->colorName, |
73 | 73 | 'damaged' => $faker->boolean(), |
@@ -76,14 +76,14 @@ discard block |
||
76 | 76 | ]; |
77 | 77 | }); |
78 | 78 | |
79 | -$factory->define(App\Sale::class, function (Faker\Generator $faker) { |
|
79 | +$factory->define(App\Sale::class, function(Faker\Generator $faker) { |
|
80 | 80 | return [ |
81 | 81 | 'name' => $faker->name, |
82 | 82 | 'address' => $faker->address, |
83 | 83 | ]; |
84 | 84 | }); |
85 | 85 | |
86 | -$factory->defineAs(App\Sale::class, 'shop', function (Faker\Generator $faker) { |
|
86 | +$factory->defineAs(App\Sale::class, 'shop', function(Faker\Generator $faker) { |
|
87 | 87 | return [ |
88 | 88 | 'shop_id' => factory(App\Shop::class)->create()->id, |
89 | 89 | ]; |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | /** |
12 | 12 | * @var array |
13 | 13 | */ |
14 | - protected $dates = ['deleted_at']; |
|
14 | + protected $dates = [ 'deleted_at' ]; |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * We do not want any timestamps. |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * |
26 | 26 | * @var array |
27 | 27 | */ |
28 | - protected $guarded = []; |
|
28 | + protected $guarded = [ ]; |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * Sold guitars. |
@@ -107,6 +107,6 @@ discard block |
||
107 | 107 | */ |
108 | 108 | public function isSold() |
109 | 109 | { |
110 | - return ! is_null($this->sale); |
|
110 | + return !is_null($this->sale); |
|
111 | 111 | } |
112 | 112 | } |