Completed
Pull Request — master (#1)
by
unknown
02:48 queued 20s
created
src/Modules/Acl/AclGroup.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 use Illuminate\Database\Eloquent\Model;
4 4
 use Illuminate\Database\Eloquent\SoftDeletes;
5 5
 
6
-class AclGroup extends Model{
6
+class AclGroup extends Model {
7 7
 
8 8
 	use SoftDeletes;
9 9
 	protected $table    = 'groups';
@@ -30,12 +30,12 @@  discard block
 block discarded – undo
30 30
 
31 31
 	public function users()
32 32
 	{
33
-		return $this->belongsToMany('\App\Modules\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
33
+		return $this->belongsToMany('\App\Modules\Acl\AclUser', 'users_groups', 'group_id', 'user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
34 34
 	}
35 35
 
36 36
 	public function permissions()
37 37
 	{
38
-		return $this->belongsToMany('\App\Modules\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
38
+		return $this->belongsToMany('\App\Modules\Acl\AclPermission', 'groups_permissions', 'group_id', 'permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
39 39
 	}
40 40
 
41 41
 	public static function boot()
Please login to merge, or discard this patch.
src/Modules/Acl/Http/Controllers/UsersController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 	 * to preform actions like (add, edit ... etc).
14 14
 	 * @var string
15 15
 	 */
16
-	protected $model               = 'users';
16
+	protected $model = 'users';
17 17
 
18 18
 	/**
19 19
 	 * List of all route actions that the base api controller
@@ -27,14 +27,14 @@  discard block
 block discarded – undo
27 27
 	 * will skip login check for them.
28 28
 	 * @var array
29 29
 	 */
30
-	protected $skipLoginCheck      = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken', 'confirmEmail', 'resendEmailConfirmation'];
30
+	protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken', 'confirmEmail', 'resendEmailConfirmation'];
31 31
 
32 32
 	/**
33 33
 	 * The validations rules used by the base api controller
34 34
 	 * to check before add.
35 35
 	 * @var array
36 36
 	 */
37
-	protected $validationRules     = [
37
+	protected $validationRules = [
38 38
 		'name'     => 'nullable|string', 
39 39
 		'email'    => 'required|email|unique:users,email,{id}', 
40 40
 		'password' => 'nullable|min:6'
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 		$this->validate($request, [
282 282
 			'profile_picture' => 'nullable|string',
283 283
 			'name'            => 'nullable|string', 
284
-			'email'           => 'required|email|unique:users,email,' . \Auth::id()
284
+			'email'           => 'required|email|unique:users,email,'.\Auth::id()
285 285
 		]);
286 286
 
287 287
 		return \Response::json($this->repo->saveProfile($request->only('name', 'email', 'profile_picture')), 200);
Please login to merge, or discard this patch.
src/Modules/Acl/Http/Controllers/GroupsController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,14 +13,14 @@
 block discarded – undo
13 13
 	 * to preform actions like (add, edit ... etc).
14 14
 	 * @var string
15 15
 	 */
16
-	protected $model               = 'groups';
16
+	protected $model = 'groups';
17 17
 
18 18
 	/**
19 19
 	 * The validations rules used by the base api controller
20 20
 	 * to check before add.
21 21
 	 * @var array
22 22
 	 */
23
-	protected $validationRules  = [
23
+	protected $validationRules = [
24 24
 	'name' => 'required|string|max:100|unique:groups,name,{id}'
25 25
 	];
26 26
 
Please login to merge, or discard this patch.
src/Modules/Acl/Http/Controllers/OauthClientsController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,14 +13,14 @@
 block discarded – undo
13 13
 	 * to preform actions like (add, edit ... etc).
14 14
 	 * @var string
15 15
 	 */
16
-	protected $model               = 'oauthClients';
16
+	protected $model = 'oauthClients';
17 17
 
18 18
 	/**
19 19
 	 * The validations rules used by the base api controller
20 20
 	 * to check before add.
21 21
 	 * @var array
22 22
 	 */
23
-	protected $validationRules  = [
23
+	protected $validationRules = [
24 24
 		'name'     => 'required|max:255',
25 25
 		'redirect' => 'required|url',
26 26
 		'user_id'  => 'required|exists:users,id',
Please login to merge, or discard this patch.
src/Modules/Acl/Database/Factories/PermissionFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$factory->define(App\Modules\Acl\AclPermission::class, function (Faker\Generator $faker) {
3
+$factory->define(App\Modules\Acl\AclPermission::class, function(Faker\Generator $faker) {
4 4
 	return [
5 5
 		'name'       => $faker->randomElement(['save', 'delete', 'find', 'paginate']),
6 6
 		'model'      => $faker->randomElement(['users', 'groups', 'settings', 'notifications']),
Please login to merge, or discard this patch.
src/Modules/Acl/Database/Factories/UserFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$factory->define(App\Modules\Acl\AclUser::class, function (Faker\Generator $faker) {
3
+$factory->define(App\Modules\Acl\AclUser::class, function(Faker\Generator $faker) {
4 4
 	return [
5 5
 		'profile_picture' => 'http://lorempixel.com/400/200/',
6 6
 		'name'            => $faker->name(),
Please login to merge, or discard this patch.
src/Modules/Acl/Database/Factories/OauthClientFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$factory->define(App\Modules\Acl\OauthClient::class, function (Faker\Generator $faker) {
3
+$factory->define(App\Modules\Acl\OauthClient::class, function(Faker\Generator $faker) {
4 4
 	return [
5 5
 		'user_id'                => $faker->randomDigit(),
6 6
 		'name'                   => $faker->name(),
Please login to merge, or discard this patch.
src/Modules/Acl/Database/Factories/GroupFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$factory->define(App\Modules\Acl\AclGroup::class, function (Faker\Generator $faker) {
3
+$factory->define(App\Modules\Acl\AclGroup::class, function(Faker\Generator $faker) {
4 4
 	return [
5 5
 		'name'       => $faker->unique->word(),
6 6
 		'created_at' => $faker->dateTimeBetween('-1 years', 'now'),
Please login to merge, or discard this patch.
src/Modules/Acl/Database/Seeds/AssignRelationsSeeder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 		/**
19 19
 		 * Assign the permissions to the admin group.
20 20
 		 */
21
-		\DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['users', 'permissions', 'groups', 'oauthClients'])->each(function ($permission) use ($adminGroupId) {
21
+		\DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['users', 'permissions', 'groups', 'oauthClients'])->each(function($permission) use ($adminGroupId) {
22 22
 			\DB::table('groups_permissions')->insert(
23 23
 				[
24 24
 				'permission_id' => $permission->id,
Please login to merge, or discard this patch.