Completed
Push — master ( 2f8355...903338 )
by Sherif
03:21
created
src/Modules/V1/Notifications/Repositories/NotificationRepository.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
      * Set the notification notified to true.
19 19
      * 
20 20
      * @param  integer  $id
21
-     * @return object
21
+     * @return boolean
22 22
      */
23 23
     public function notified($id)
24 24
     {
Please login to merge, or discard this patch.
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -15,23 +15,23 @@
 block discarded – undo
15 15
 	}
16 16
 
17 17
 	/**
18
-     * Set the notification notified to true.
19
-     * 
20
-     * @param  integer  $id
21
-     * @return object
22
-     */
23
-    public function notified($id)
24
-    {
25
-        return $this->save(['id' => $id, 'notified' => 1]);
26
-    }
18
+	 * Set the notification notified to true.
19
+	 * 
20
+	 * @param  integer  $id
21
+	 * @return object
22
+	 */
23
+	public function notified($id)
24
+	{
25
+		return $this->save(['id' => $id, 'notified' => 1]);
26
+	}
27 27
 
28
-    /**
29
-     * Set the notification notified to all.
30
-     * 
31
-     * @return void
32
-     */
33
-    public function notifyAll()
34
-    {
35
-        $this->update(false, ['notified' => 1], 'notified');
36
-    }
28
+	/**
29
+	 * Set the notification notified to all.
30
+	 * 
31
+	 * @return void
32
+	 */
33
+	public function notifyAll()
34
+	{
35
+		$this->update(false, ['notified' => 1], 'notified');
36
+	}
37 37
 }
Please login to merge, or discard this patch.
src/Modules/V1/Acl/Http/Controllers/UsersController.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
      * to preform actions like (add, edit ... etc).
13 13
      * @var string
14 14
      */
15
-    protected $model               = 'users';
15
+    protected $model = 'users';
16 16
 
17 17
     /**
18 18
      * List of all route actions that the base api controller
@@ -26,14 +26,14 @@  discard block
 block discarded – undo
26 26
      * will skip login check for them.
27 27
      * @var array
28 28
      */
29
-    protected $skipLoginCheck      = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword'];
29
+    protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword'];
30 30
 
31 31
     /**
32 32
      * The validations rules used by the base api controller
33 33
      * to check before add.
34 34
      * @var array
35 35
      */
36
-    protected $validationRules     = [
36
+    protected $validationRules = [
37 37
     'email'    => 'required|email|unique:users,email,{id}',
38 38
     'password' => 'min:6'
39 39
     ];
Please login to merge, or discard this patch.
Indentation   +169 added lines, -169 removed lines patch added patch discarded remove patch
@@ -7,173 +7,173 @@
 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';
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', 'sendreset'];
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', 'loginSocial', 'register', 'sendreset', 'resetpassword'];
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
-    ];
40
-
41
-    /**
42
-     * Return the logged in user account.
43
-     * 
44
-     * @return \Illuminate\Http\Response
45
-     */
46
-    public function account()
47
-    {
48
-       $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
49
-       return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\JWTAuth::parseToken()->authenticate()->id, $relations), 200);
50
-    }
51
-
52
-    /**
53
-     * Block the user.
54
-     *
55
-     * @param  integer  $id
56
-     * @return \Illuminate\Http\Response
57
-     */
58
-    public function block($id)
59
-    {
60
-        return \Response::json(\Core::users()->block($id), 200);
61
-    }
62
-
63
-    /**
64
-     * Unblock the user.
65
-     *
66
-     * @param  integer  $id
67
-     * @return \Illuminate\Http\Response
68
-     */
69
-    public function unblock($id)
70
-    {
71
-        return \Response::json(\Core::users()->unblock($id), 200);
72
-    }
73
-
74
-    /**
75
-     * Logout the user.
76
-     * 
77
-     * @return \Illuminate\Http\Response
78
-     */
79
-    public function logout()
80
-    {
81
-        return \Response::json(\Core::users()->logout(), 200);
82
-    }
83
-
84
-    /**
85
-     * Handle a registration request.
86
-     *
87
-     * @param  \Illuminate\Http\Request  $request
88
-     * @return \Illuminate\Http\Response
89
-     */
90
-    public function register(Request $request)
91
-    {
92
-        $this->validate($request, [
93
-            'email'    => 'required|email|unique:users,email,{id}', 
94
-            'password' => 'required|min:6'
95
-            ]);
96
-
97
-        return \Response::json(\Core::users()->register($request->only('email', 'password')), 200);
98
-    }
99
-
100
-    /**
101
-     * Handle a login request of the none admin to the application.
102
-     *
103
-     * @param  \Illuminate\Http\Request  $request
104
-     * @return \Illuminate\Http\Response
105
-     */
106
-    public function login(Request $request)
107
-    {
108
-        $this->validate($request, [
109
-            'email'    => 'required|email', 
110
-            'password' => 'required|min:6',
111
-            'admin'    => 'boolean'
112
-            ]);
113
-
114
-        return \Response::json(\Core::users()->login($request->only('email', 'password'), $request->get('admin')), 200);
115
-    }
116
-
117
-    /**
118
-     * Handle a social login request of the none admin to the application.
119
-     *
120
-     * @param  \Illuminate\Http\Request  $request
121
-     * @return \Illuminate\Http\Response
122
-     */
123
-    public function loginSocial(Request $request)
124
-    {
125
-        $this->validate($request, [
126
-            'access_token' => 'required',
127
-            'type'         => 'required|in:facebook,google'
128
-            ]);
129
-
130
-        return \Response::json(\Core::users()->loginSocial($request->only('access_token', 'type')), 200);
131
-    }
132
-
133
-    /**
134
-     * Handle an assign groups to user request.
135
-     *
136
-     * @param  \Illuminate\Http\Request  $request
137
-     * @return \Illuminate\Http\Response
138
-     */
139
-    public function assigngroups(Request $request)
140
-    {
141
-        $this->validate($request, [
142
-            'group_ids' => 'required|exists:groups,id', 
143
-            'user_id'   => 'required|exists:users,id'
144
-            ]);
145
-
146
-        return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
147
-    }
148
-
149
-    /**
150
-     * Send a reset link to the given user.
151
-     *
152
-     * @param  \Illuminate\Http\Request  $request
153
-     * @return \Illuminate\Http\Response
154
-     */
155
-    public function sendreset(Request $request)
156
-    {
157
-        $this->validate($request, ['email' => 'required|email', 'url' => 'required|url']);
158
-
159
-        return \Response::json(\Core::users()->sendReset($request->only('email'), $request->get('url')), 200);
160
-    }
161
-
162
-    /**
163
-     * Reset the given user's password.
164
-     *
165
-     * @param  \Illuminate\Http\Request  $request
166
-     * @return \Illuminate\Http\Response
167
-     */
168
-    public function resetpassword(Request $request)
169
-    {
170
-        $this->validate($request, [
171
-            'token'                 => 'required',
172
-            'email'                 => 'required|email',
173
-            'password'              => 'required|confirmed|min:6',
174
-            'password_confirmation' => 'required',
175
-        ]);
176
-
177
-        return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
178
-    }
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
+
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', 'sendreset'];
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', 'loginSocial', 'register', 'sendreset', 'resetpassword'];
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
+	];
40
+
41
+	/**
42
+	 * Return the logged in user account.
43
+	 * 
44
+	 * @return \Illuminate\Http\Response
45
+	 */
46
+	public function account()
47
+	{
48
+	   $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
49
+	   return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\JWTAuth::parseToken()->authenticate()->id, $relations), 200);
50
+	}
51
+
52
+	/**
53
+	 * Block the user.
54
+	 *
55
+	 * @param  integer  $id
56
+	 * @return \Illuminate\Http\Response
57
+	 */
58
+	public function block($id)
59
+	{
60
+		return \Response::json(\Core::users()->block($id), 200);
61
+	}
62
+
63
+	/**
64
+	 * Unblock the user.
65
+	 *
66
+	 * @param  integer  $id
67
+	 * @return \Illuminate\Http\Response
68
+	 */
69
+	public function unblock($id)
70
+	{
71
+		return \Response::json(\Core::users()->unblock($id), 200);
72
+	}
73
+
74
+	/**
75
+	 * Logout the user.
76
+	 * 
77
+	 * @return \Illuminate\Http\Response
78
+	 */
79
+	public function logout()
80
+	{
81
+		return \Response::json(\Core::users()->logout(), 200);
82
+	}
83
+
84
+	/**
85
+	 * Handle a registration request.
86
+	 *
87
+	 * @param  \Illuminate\Http\Request  $request
88
+	 * @return \Illuminate\Http\Response
89
+	 */
90
+	public function register(Request $request)
91
+	{
92
+		$this->validate($request, [
93
+			'email'    => 'required|email|unique:users,email,{id}', 
94
+			'password' => 'required|min:6'
95
+			]);
96
+
97
+		return \Response::json(\Core::users()->register($request->only('email', 'password')), 200);
98
+	}
99
+
100
+	/**
101
+	 * Handle a login request of the none admin to the application.
102
+	 *
103
+	 * @param  \Illuminate\Http\Request  $request
104
+	 * @return \Illuminate\Http\Response
105
+	 */
106
+	public function login(Request $request)
107
+	{
108
+		$this->validate($request, [
109
+			'email'    => 'required|email', 
110
+			'password' => 'required|min:6',
111
+			'admin'    => 'boolean'
112
+			]);
113
+
114
+		return \Response::json(\Core::users()->login($request->only('email', 'password'), $request->get('admin')), 200);
115
+	}
116
+
117
+	/**
118
+	 * Handle a social login request of the none admin to the application.
119
+	 *
120
+	 * @param  \Illuminate\Http\Request  $request
121
+	 * @return \Illuminate\Http\Response
122
+	 */
123
+	public function loginSocial(Request $request)
124
+	{
125
+		$this->validate($request, [
126
+			'access_token' => 'required',
127
+			'type'         => 'required|in:facebook,google'
128
+			]);
129
+
130
+		return \Response::json(\Core::users()->loginSocial($request->only('access_token', 'type')), 200);
131
+	}
132
+
133
+	/**
134
+	 * Handle an assign groups to user request.
135
+	 *
136
+	 * @param  \Illuminate\Http\Request  $request
137
+	 * @return \Illuminate\Http\Response
138
+	 */
139
+	public function assigngroups(Request $request)
140
+	{
141
+		$this->validate($request, [
142
+			'group_ids' => 'required|exists:groups,id', 
143
+			'user_id'   => 'required|exists:users,id'
144
+			]);
145
+
146
+		return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
147
+	}
148
+
149
+	/**
150
+	 * Send a reset link to the given user.
151
+	 *
152
+	 * @param  \Illuminate\Http\Request  $request
153
+	 * @return \Illuminate\Http\Response
154
+	 */
155
+	public function sendreset(Request $request)
156
+	{
157
+		$this->validate($request, ['email' => 'required|email', 'url' => 'required|url']);
158
+
159
+		return \Response::json(\Core::users()->sendReset($request->only('email'), $request->get('url')), 200);
160
+	}
161
+
162
+	/**
163
+	 * Reset the given user's password.
164
+	 *
165
+	 * @param  \Illuminate\Http\Request  $request
166
+	 * @return \Illuminate\Http\Response
167
+	 */
168
+	public function resetpassword(Request $request)
169
+	{
170
+		$this->validate($request, [
171
+			'token'                 => 'required',
172
+			'email'                 => 'required|email',
173
+			'password'              => 'required|confirmed|min:6',
174
+			'password_confirmation' => 'required',
175
+		]);
176
+
177
+		return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
178
+	}
179 179
 }
Please login to merge, or discard this patch.
src/Modules/V1/Core/Interfaces/RepositoryInterface.php 1 patch
Indentation   +106 added lines, -106 removed lines patch added patch discarded remove patch
@@ -2,119 +2,119 @@
 block discarded – undo
2 2
 
3 3
 interface RepositoryInterface
4 4
 {
5
-    /**
6
-     * Fetch all records with relations from the storage.
7
-     * 
8
-     * @param  array  $relations
9
-     * @param  array  $sortBy
10
-     * @param  array  $desc
11
-     * @param  array  $columns
12
-     * @return collection
13
-     */
14
-    public function all($relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
5
+	/**
6
+	 * Fetch all records with relations from the storage.
7
+	 * 
8
+	 * @param  array  $relations
9
+	 * @param  array  $sortBy
10
+	 * @param  array  $desc
11
+	 * @param  array  $columns
12
+	 * @return collection
13
+	 */
14
+	public function all($relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
15 15
     
16
-    /**
17
-     * Fetch all records with relations from storage in pages 
18
-     * that matche the given query.
19
-     * 
20
-     * @param  string  $query
21
-     * @param  integer $perPage
22
-     * @param  array   $relations
23
-     * @param  array   $sortBy
24
-     * @param  array   $desc
25
-     * @param  array   $columns
26
-     * @return collection
27
-     */
28
-    public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
16
+	/**
17
+	 * Fetch all records with relations from storage in pages 
18
+	 * that matche the given query.
19
+	 * 
20
+	 * @param  string  $query
21
+	 * @param  integer $perPage
22
+	 * @param  array   $relations
23
+	 * @param  array   $sortBy
24
+	 * @param  array   $desc
25
+	 * @param  array   $columns
26
+	 * @return collection
27
+	 */
28
+	public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
29 29
 
30
-    /**
31
-     * Fetch all records with relations from storage in pages.
32
-     * 
33
-     * @param  integer $perPage
34
-     * @param  array   $relations
35
-     * @param  array   $sortBy
36
-     * @param  array   $desc
37
-     * @param  array   $columns
38
-     * @return collection
39
-     */
40
-    public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
30
+	/**
31
+	 * Fetch all records with relations from storage in pages.
32
+	 * 
33
+	 * @param  integer $perPage
34
+	 * @param  array   $relations
35
+	 * @param  array   $sortBy
36
+	 * @param  array   $desc
37
+	 * @param  array   $columns
38
+	 * @return collection
39
+	 */
40
+	public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
41 41
     
42
-    /**
43
-     * Fetch all records with relations based on
44
-     * the given condition from storage in pages.
45
-     * 
46
-     * @param  array   $conditions array of conditions
47
-     * @param  integer $perPage
48
-     * @param  array   $relations
49
-     * @param  array   $sortBy
50
-     * @param  array   $desc
51
-     * @param  array   $columns
52
-     * @return collection
53
-     */
54
-    public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
42
+	/**
43
+	 * Fetch all records with relations based on
44
+	 * the given condition from storage in pages.
45
+	 * 
46
+	 * @param  array   $conditions array of conditions
47
+	 * @param  integer $perPage
48
+	 * @param  array   $relations
49
+	 * @param  array   $sortBy
50
+	 * @param  array   $desc
51
+	 * @param  array   $columns
52
+	 * @return collection
53
+	 */
54
+	public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
55 55
 
56
-     /**
57
-     * Save the given model/models to the storage.
58
-     * 
59
-     * @param  array   $data
60
-     * @param  boolean $saveLog
61
-     * @return object
62
-     */
63
-    public function save(array $data, $saveLog = true);
56
+	 /**
57
+	  * Save the given model/models to the storage.
58
+	  * 
59
+	  * @param  array   $data
60
+	  * @param  boolean $saveLog
61
+	  * @return object
62
+	  */
63
+	public function save(array $data, $saveLog = true);
64 64
 
65
-    /**
66
-     * Update record in the storage based on the given
67
-     * condition.
68
-     * 
69
-     * @param  var     $value condition value
70
-     * @param  array   $data
71
-     * @param  string  $attribute condition column name
72
-     * @return integer affected rows
73
-     */
74
-    public function update($value, array $data, $attribute = 'id');
65
+	/**
66
+	 * Update record in the storage based on the given
67
+	 * condition.
68
+	 * 
69
+	 * @param  var     $value condition value
70
+	 * @param  array   $data
71
+	 * @param  string  $attribute condition column name
72
+	 * @return integer affected rows
73
+	 */
74
+	public function update($value, array $data, $attribute = 'id');
75 75
 
76
-    /**
77
-     * Delete record from the storage based on the given
78
-     * condition.
79
-     * 
80
-     * @param  var     $value condition value
81
-     * @param  string  $attribute condition column name
82
-     * @return integer affected rows
83
-     */
84
-    public function delete($value, $attribute = 'id');
76
+	/**
77
+	 * Delete record from the storage based on the given
78
+	 * condition.
79
+	 * 
80
+	 * @param  var     $value condition value
81
+	 * @param  string  $attribute condition column name
82
+	 * @return integer affected rows
83
+	 */
84
+	public function delete($value, $attribute = 'id');
85 85
     
86
-    /**
87
-     * Fetch records from the storage based on the given
88
-     * id.
89
-     * 
90
-     * @param  integer $id
91
-     * @param  array   $relations
92
-     * @param  array   $columns
93
-     * @return object
94
-     */
95
-    public function find($id, $relations = [], $columns = array('*'));
86
+	/**
87
+	 * Fetch records from the storage based on the given
88
+	 * id.
89
+	 * 
90
+	 * @param  integer $id
91
+	 * @param  array   $relations
92
+	 * @param  array   $columns
93
+	 * @return object
94
+	 */
95
+	public function find($id, $relations = [], $columns = array('*'));
96 96
     
97
-    /**
98
-     * Fetch records from the storage based on the given
99
-     * condition.
100
-     * 
101
-     * @param  array   $conditions array of conditions
102
-     * @param  array   $relations
103
-     * @param  array   $sortBy
104
-     * @param  array   $desc
105
-     * @param  array   $columns
106
-     * @return collection
107
-     */
108
-    public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
97
+	/**
98
+	 * Fetch records from the storage based on the given
99
+	 * condition.
100
+	 * 
101
+	 * @param  array   $conditions array of conditions
102
+	 * @param  array   $relations
103
+	 * @param  array   $sortBy
104
+	 * @param  array   $desc
105
+	 * @param  array   $columns
106
+	 * @return collection
107
+	 */
108
+	public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
109 109
 
110
-    /**
111
-     * Fetch the first record fro the storage based on the given
112
-     * condition.
113
-     * 
114
-     * @param  array   $conditions array of conditions
115
-     * @param  array   $relations
116
-     * @param  array   $columns
117
-     * @return object
118
-     */
119
-    public function first($conditions, $relations = [], $columns = array('*'));
110
+	/**
111
+	 * Fetch the first record fro the storage based on the given
112
+	 * condition.
113
+	 * 
114
+	 * @param  array   $conditions array of conditions
115
+	 * @param  array   $relations
116
+	 * @param  array   $columns
117
+	 * @return object
118
+	 */
119
+	public function first($conditions, $relations = [], $columns = array('*'));
120 120
 }
121 121
\ No newline at end of file
Please login to merge, or discard this patch.