Completed
Push — master ( 2f9ece...c4baa4 )
by Sherif
05:12 queued 45s
created
src/ApiSkeletonServiceProvider.php 1 patch
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -6,30 +6,30 @@
 block discarded – undo
6 6
 
7 7
 class ApiSkeletonServiceProvider extends ServiceProvider
8 8
 {
9
-    /**
10
-     * Perform post-registration booting of services.
11
-     *
12
-     * @return void
13
-     */
14
-    public function boot()
15
-    {
16
-     $this->publishes([
17
-        __DIR__.'/Exceptions'    => app_path('Exceptions'),
18
-        __DIR__.'/Modules'       => app_path('Modules'),
19
-        __DIR__.'/notifications' => app_path('notifications'),
20
-        __DIR__.'/Kernel.php'    => app_path('Http/Kernel.php'),
9
+	/**
10
+	 * Perform post-registration booting of services.
11
+	 *
12
+	 * @return void
13
+	 */
14
+	public function boot()
15
+	{
16
+	 $this->publishes([
17
+		__DIR__.'/Exceptions'    => app_path('Exceptions'),
18
+		__DIR__.'/Modules'       => app_path('Modules'),
19
+		__DIR__.'/notifications' => app_path('notifications'),
20
+		__DIR__.'/Kernel.php'    => app_path('Http/Kernel.php'),
21 21
 
22
-        ]);
22
+		]);
23 23
 
24
-    }
24
+	}
25 25
 
26
-    /**
27
-     * Register any package services.
28
-     *
29
-     * @return void
30
-     */
31
-    public function register()
32
-    {
33
-        //
34
-    }
26
+	/**
27
+	 * Register any package services.
28
+	 *
29
+	 * @return void
30
+	 */
31
+	public function register()
32
+	{
33
+		//
34
+	}
35 35
 }
36 36
\ No newline at end of file
Please login to merge, or discard this patch.
src/Exceptions/Handler.php 1 patch
Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -10,56 +10,56 @@
 block discarded – undo
10 10
 
11 11
 class Handler extends ExceptionHandler
12 12
 {
13
-    /**
14
-     * A list of the exception types that should not be reported.
15
-     *
16
-     * @var array
17
-     */
18
-    protected $dontReport = [
19
-        HttpException::class,
20
-        ModelNotFoundException::class,
21
-    ];
13
+	/**
14
+	 * A list of the exception types that should not be reported.
15
+	 *
16
+	 * @var array
17
+	 */
18
+	protected $dontReport = [
19
+		HttpException::class,
20
+		ModelNotFoundException::class,
21
+	];
22 22
 
23
-    /**
24
-     * Report or log an exception.
25
-     *
26
-     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
27
-     *
28
-     * @param  \Exception  $e
29
-     * @return void
30
-     */
31
-    public function report(Exception $e)
32
-    {
33
-        return parent::report($e);
34
-    }
23
+	/**
24
+	 * Report or log an exception.
25
+	 *
26
+	 * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
27
+	 *
28
+	 * @param  \Exception  $e
29
+	 * @return void
30
+	 */
31
+	public function report(Exception $e)
32
+	{
33
+		return parent::report($e);
34
+	}
35 35
 
36
-    /**
37
-     * Render an exception into an HTTP response.
38
-     *
39
-     * @param  \Illuminate\Http\Request  $request
40
-     * @param  \Exception  $e
41
-     * @return \Illuminate\Http\Response
42
-     */
43
-    public function render($request, Exception $e)
44
-    {
45
-        if ($e instanceof ModelNotFoundException) {
46
-            $e = new NotFoundHttpException($e->getMessage(), $e);
47
-        }
36
+	/**
37
+	 * Render an exception into an HTTP response.
38
+	 *
39
+	 * @param  \Illuminate\Http\Request  $request
40
+	 * @param  \Exception  $e
41
+	 * @return \Illuminate\Http\Response
42
+	 */
43
+	public function render($request, Exception $e)
44
+	{
45
+		if ($e instanceof ModelNotFoundException) {
46
+			$e = new NotFoundHttpException($e->getMessage(), $e);
47
+		}
48 48
 
49
-        if ($request->wantsJson())
50
-        {
51
-            if ($e instanceof \Illuminate\Database\QueryException) 
52
-            {
53
-                return \Response::json('Please check the given inputes', '400');
54
-            }
55
-            else if ($e instanceof \predis\connection\connectionexception) 
56
-            {
57
-                return \Response::json('Your redis notification server isn\'t running', '400');
58
-            }
49
+		if ($request->wantsJson())
50
+		{
51
+			if ($e instanceof \Illuminate\Database\QueryException) 
52
+			{
53
+				return \Response::json('Please check the given inputes', '400');
54
+			}
55
+			else if ($e instanceof \predis\connection\connectionexception) 
56
+			{
57
+				return \Response::json('Your redis notification server isn\'t running', '400');
58
+			}
59 59
             
60
-            return \Response::json($e->getMessage(), $e->getStatusCode());
61
-        }
60
+			return \Response::json($e->getMessage(), $e->getStatusCode());
61
+		}
62 62
 
63
-        return parent::render($request, $e);
64
-    }
63
+		return parent::render($request, $e);
64
+	}
65 65
 }
Please login to merge, or discard this patch.
src/Kernel.php 1 patch
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -6,28 +6,28 @@
 block discarded – undo
6 6
 
7 7
 class Kernel extends HttpKernel
8 8
 {
9
-    /**
10
-     * The application's global HTTP middleware stack.
11
-     *
12
-     * @var array
13
-     */
14
-    protected $middleware = [
15
-        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
16
-        \App\Http\Middleware\EncryptCookies::class,
17
-        \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
18
-        \Illuminate\Session\Middleware\StartSession::class,
19
-        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
20
-        //\App\Http\Middleware\VerifyCsrfToken::class,
21
-    ];
9
+	/**
10
+	 * The application's global HTTP middleware stack.
11
+	 *
12
+	 * @var array
13
+	 */
14
+	protected $middleware = [
15
+		\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
16
+		\App\Http\Middleware\EncryptCookies::class,
17
+		\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
18
+		\Illuminate\Session\Middleware\StartSession::class,
19
+		\Illuminate\View\Middleware\ShareErrorsFromSession::class,
20
+		//\App\Http\Middleware\VerifyCsrfToken::class,
21
+	];
22 22
 
23
-    /**
24
-     * The application's route middleware.
25
-     *
26
-     * @var array
27
-     */
28
-    protected $routeMiddleware = [
29
-        'auth' => \App\Http\Middleware\Authenticate::class,
30
-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
31
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
32
-    ];
23
+	/**
24
+	 * The application's route middleware.
25
+	 *
26
+	 * @var array
27
+	 */
28
+	protected $routeMiddleware = [
29
+		'auth' => \App\Http\Middleware\Authenticate::class,
30
+		'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
31
+		'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
32
+	];
33 33
 }
Please login to merge, or discard this patch.
src/Modules/Acl/AclGroup.php 1 patch
Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -5,47 +5,47 @@
 block discarded – undo
5 5
 
6 6
 class AclGroup extends Model{
7 7
 
8
-    use SoftDeletes;
9
-    protected $table    = 'groups';
10
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
11
-    protected $hidden   = ['deleted_at'];
12
-    protected $guarded  = ['id'];
13
-    protected $fillable = ['name'];
14
-
15
-    public function getCreatedAtAttribute($value)
16
-    {
17
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
18
-    }
19
-
20
-    public function getUpdatedAtAttribute($value)
21
-    {
22
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
23
-    }
24
-
25
-    public function getDeletedAtAttribute($value)
26
-    {
27
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
28
-    }
29
-
30
-    public function users()
31
-    {
32
-        return $this->belongsToMany('\App\Modules\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
33
-    }
34
-
35
-    public function permissions()
36
-    {
37
-        return $this->belongsToMany('\App\Modules\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
38
-    }
39
-
40
-    public static function boot()
41
-    {
42
-        parent::boot();
43
-
44
-        AclGroup::deleting(function($group)
45
-        {
46
-            \DB::table('groups_permissions')
47
-            ->where('group_id', $group->id)
48
-            ->update(array('deleted_at' => \DB::raw('NOW()')));
49
-        });
50
-    }
8
+	use SoftDeletes;
9
+	protected $table    = 'groups';
10
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
11
+	protected $hidden   = ['deleted_at'];
12
+	protected $guarded  = ['id'];
13
+	protected $fillable = ['name'];
14
+
15
+	public function getCreatedAtAttribute($value)
16
+	{
17
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
18
+	}
19
+
20
+	public function getUpdatedAtAttribute($value)
21
+	{
22
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
23
+	}
24
+
25
+	public function getDeletedAtAttribute($value)
26
+	{
27
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
28
+	}
29
+
30
+	public function users()
31
+	{
32
+		return $this->belongsToMany('\App\Modules\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
33
+	}
34
+
35
+	public function permissions()
36
+	{
37
+		return $this->belongsToMany('\App\Modules\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
38
+	}
39
+
40
+	public static function boot()
41
+	{
42
+		parent::boot();
43
+
44
+		AclGroup::deleting(function($group)
45
+		{
46
+			\DB::table('groups_permissions')
47
+			->where('group_id', $group->id)
48
+			->update(array('deleted_at' => \DB::raw('NOW()')));
49
+		});
50
+	}
51 51
 }
Please login to merge, or discard this patch.
src/Modules/Acl/Repositories/UserRepository.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,6 +61,6 @@
 block discarded – undo
61 61
 			$user->groups()->attach($group_ids);
62 62
 		});
63 63
 
64
-        return \Core::users()->find($user_id);
64
+		return \Core::users()->find($user_id);
65 65
 	}
66 66
 }
Please login to merge, or discard this patch.
src/Modules/Acl/Repositories/GroupRepository.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,6 +29,6 @@
 block discarded – undo
29 29
 			$group->permissions()->attach($permission_ids);
30 30
 		});
31 31
 
32
-        return \Core::groups()->find($group_id);
32
+		return \Core::groups()->find($group_id);
33 33
 	}
34 34
 }
Please login to merge, or discard this patch.
src/Modules/Acl/Http/Controllers/GroupsController.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -8,35 +8,35 @@
 block discarded – undo
8 8
 
9 9
 class GroupsController extends BaseApiController
10 10
 {
11
-    /**
12
-     * The name of the model that is used by the base api controller 
13
-     * to preform actions like (add, edit ... etc).
14
-     * @var string
15
-     */
16
-    protected $model               = 'groups';
11
+	/**
12
+	 * The name of the model that is used by the base api controller 
13
+	 * to preform actions like (add, edit ... etc).
14
+	 * @var string
15
+	 */
16
+	protected $model               = 'groups';
17 17
 
18
-    /**
19
-     * The validations rules used by the base api controller
20
-     * to check before add.
21
-     * @var array
22
-     */
23
-    protected $validationRules  = [
24
-    'name' => 'required|string|max:100|unique:groups,name,{id}'
25
-    ];
18
+	/**
19
+	 * The validations rules used by the base api controller
20
+	 * to check before add.
21
+	 * @var array
22
+	 */
23
+	protected $validationRules  = [
24
+	'name' => 'required|string|max:100|unique:groups,name,{id}'
25
+	];
26 26
 
27
-    /**
28
-     * Handle an assign permissions to group request.
29
-     *
30
-     * @param  \Illuminate\Http\Request  $request
31
-     * @return \Illuminate\Http\Response
32
-     */
33
-    public function postAssignpermissions(Request $request)
34
-    {
35
-        $this->validate($request, [
36
-            'permission_ids' => 'required|exists:permissions,id', 
37
-            'group_id'       => 'required|exists:groups,id'
38
-            ]);
27
+	/**
28
+	 * Handle an assign permissions to group request.
29
+	 *
30
+	 * @param  \Illuminate\Http\Request  $request
31
+	 * @return \Illuminate\Http\Response
32
+	 */
33
+	public function postAssignpermissions(Request $request)
34
+	{
35
+		$this->validate($request, [
36
+			'permission_ids' => 'required|exists:permissions,id', 
37
+			'group_id'       => 'required|exists:groups,id'
38
+			]);
39 39
 
40
-        return \Response::json(\Core::groups()->assignPermissions($request->get('group_id'), $request->get('permission_ids')), 200);
41
-    }
40
+		return \Response::json(\Core::groups()->assignPermissions($request->get('group_id'), $request->get('permission_ids')), 200);
41
+	}
42 42
 }
Please login to merge, or discard this patch.
src/Modules/Acl/Http/Controllers/UsersController.php 1 patch
Indentation   +90 added lines, -90 removed lines patch added patch discarded remove patch
@@ -7,104 +7,104 @@
 block discarded – undo
7 7
 
8 8
 class UsersController extends BaseApiController
9 9
 {
10
-    /**
11
-     * The name of the model that is used by the base api controller 
12
-     * to preform actions like (add, edit ... etc).
13
-     * @var string
14
-     */
15
-    protected $model               = 'users';
10
+	/**
11
+	 * The name of the model that is used by the base api controller 
12
+	 * to preform actions like (add, edit ... etc).
13
+	 * @var string
14
+	 */
15
+	protected $model               = 'users';
16 16
 
17
-    /**
18
-     * List of all route actions that the base api controller
19
-     * will skip permissions check for them.
20
-     * @var array
21
-     */
22
-    protected $skipPermissionCheck = ['account', 'logout'];
17
+	/**
18
+	 * List of all route actions that the base api controller
19
+	 * will skip permissions check for them.
20
+	 * @var array
21
+	 */
22
+	protected $skipPermissionCheck = ['account', 'logout'];
23 23
 
24
-    /**
25
-     * List of all route actions that the base api controller
26
-     * will skip login check for them.
27
-     * @var array
28
-     */
29
-    protected $skipLoginCheck = ['login', 'register'];
24
+	/**
25
+	 * List of all route actions that the base api controller
26
+	 * will skip login check for them.
27
+	 * @var array
28
+	 */
29
+	protected $skipLoginCheck = ['login', 'register'];
30 30
 
31
-    /**
32
-     * The validations rules used by the base api controller
33
-     * to check before add.
34
-     * @var array
35
-     */
36
-    protected $validationRules  = [
37
-    'email'    => 'required|email|unique:users,email,{id}',
38
-    'password' => 'min:6'
39
-    ];
31
+	/**
32
+	 * The validations rules used by the base api controller
33
+	 * to check before add.
34
+	 * @var array
35
+	 */
36
+	protected $validationRules  = [
37
+	'email'    => 'required|email|unique:users,email,{id}',
38
+	'password' => 'min:6'
39
+	];
40 40
 
41
-    /**
42
-     * Return the logged in user account.
43
-     * 
44
-     * @return object
45
-     */
46
-    public function getAccount()
47
-    {
48
-       $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
49
-       return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\Auth::id(), $relations), 200);
50
-    }
41
+	/**
42
+	 * Return the logged in user account.
43
+	 * 
44
+	 * @return object
45
+	 */
46
+	public function getAccount()
47
+	{
48
+	   $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
49
+	   return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\Auth::id(), $relations), 200);
50
+	}
51 51
 
52
-    /**
53
-     * Logout the user.
54
-     * 
55
-     * @return void
56
-     */
57
-    public function getLogout()
58
-    {
59
-        return \Response::json(\Auth::logout(), 200);
60
-    }
52
+	/**
53
+	 * Logout the user.
54
+	 * 
55
+	 * @return void
56
+	 */
57
+	public function getLogout()
58
+	{
59
+		return \Response::json(\Auth::logout(), 200);
60
+	}
61 61
 
62
-    /**
63
-     * Handle a registration request.
64
-     *
65
-     * @param  \Illuminate\Http\Request  $request
66
-     * @return \Illuminate\Http\Response
67
-     */
68
-    public function postRegister(Request $request)
69
-    {
70
-        $this->validate($request, ['email' => 'required|email|unique:users,email,{id}','password' => 'required|min:6']);
62
+	/**
63
+	 * Handle a registration request.
64
+	 *
65
+	 * @param  \Illuminate\Http\Request  $request
66
+	 * @return \Illuminate\Http\Response
67
+	 */
68
+	public function postRegister(Request $request)
69
+	{
70
+		$this->validate($request, ['email' => 'required|email|unique:users,email,{id}','password' => 'required|min:6']);
71 71
 
72
-        return \Response::json(\Auth::loginUsingId(\Core::users()->create($request->all())->id), 200);
73
-    }
72
+		return \Response::json(\Auth::loginUsingId(\Core::users()->create($request->all())->id), 200);
73
+	}
74 74
 
75
-    /**
76
-     * Handle a login request to the application.
77
-     *
78
-     * @param  \Illuminate\Http\Request  $request
79
-     * @return \Illuminate\Http\Response
80
-     */
81
-    public function postLogin(Request $request)
82
-    {
83
-        if (\Auth::attempt($request->all())) 
84
-        {
85
-            $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
86
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\Auth::id(), $relations), 200);
87
-        }
88
-        else
89
-        {
90
-            $error = $this->errorHandler->loginFailed();
91
-            abort($error['status'], $error['message']);
92
-        }
93
-    }
75
+	/**
76
+	 * Handle a login request to the application.
77
+	 *
78
+	 * @param  \Illuminate\Http\Request  $request
79
+	 * @return \Illuminate\Http\Response
80
+	 */
81
+	public function postLogin(Request $request)
82
+	{
83
+		if (\Auth::attempt($request->all())) 
84
+		{
85
+			$relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
86
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\Auth::id(), $relations), 200);
87
+		}
88
+		else
89
+		{
90
+			$error = $this->errorHandler->loginFailed();
91
+			abort($error['status'], $error['message']);
92
+		}
93
+	}
94 94
 
95
-    /**
96
-     * Handle an assign groups to user request.
97
-     *
98
-     * @param  \Illuminate\Http\Request  $request
99
-     * @return \Illuminate\Http\Response
100
-     */
101
-    public function postAssigngroups(Request $request)
102
-    {
103
-        $this->validate($request, [
104
-            'group_ids' => 'required|exists:groups,id', 
105
-            'user_id'   => 'required|exists:users,id'
106
-            ]);
95
+	/**
96
+	 * Handle an assign groups to user request.
97
+	 *
98
+	 * @param  \Illuminate\Http\Request  $request
99
+	 * @return \Illuminate\Http\Response
100
+	 */
101
+	public function postAssigngroups(Request $request)
102
+	{
103
+		$this->validate($request, [
104
+			'group_ids' => 'required|exists:groups,id', 
105
+			'user_id'   => 'required|exists:users,id'
106
+			]);
107 107
 
108
-        return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
109
-    }
108
+		return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
109
+	}
110 110
 }
Please login to merge, or discard this patch.
src/Modules/Acl/Http/Controllers/PermissionsController.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -7,10 +7,10 @@
 block discarded – undo
7 7
 
8 8
 class PermissionsController extends BaseApiController
9 9
 {
10
-    /**
11
-     * The name of the model that is used by the base api controller 
12
-     * to preform actions like (add, edit ... etc).
13
-     * @var string
14
-     */
15
-    protected $model = 'permissions';
10
+	/**
11
+	 * The name of the model that is used by the base api controller 
12
+	 * to preform actions like (add, edit ... etc).
13
+	 * @var string
14
+	 */
15
+	protected $model = 'permissions';
16 16
 }
Please login to merge, or discard this patch.