Completed
Push — master ( 392340...6e5734 )
by Sherif
07:20
created
src/Modules/V1/Core/ModelObservers/LogObserver.php 1 patch
Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -5,53 +5,53 @@
 block discarded – undo
5 5
  */
6 6
 class LogObserver {
7 7
 
8
-    public function saving($model)
9
-    {
10
-        //
11
-    }
12
-
13
-    public function saved($model)
14
-    {
15
-        //
16
-    }
17
-
18
-    public function creating($model)
19
-    {
20
-        //
21
-    }
22
-
23
-    public function created($model)
24
-    {
25
-        //
26
-    }
27
-
28
-    public function updating($model)
29
-    {
30
-        //
31
-    }
32
-
33
-    public function updated($model)
34
-    {
35
-        //
36
-    }
37
-
38
-    public function deleting($model)
39
-    {
40
-        //
41
-    }
42
-
43
-    public function deleted($model)
44
-    {
45
-        //
46
-    }
47
-
48
-    public function restoring($model)
49
-    {
50
-        //
51
-    }
52
-
53
-    public function restored($model)
54
-    {
55
-        //
56
-    }
8
+	public function saving($model)
9
+	{
10
+		//
11
+	}
12
+
13
+	public function saved($model)
14
+	{
15
+		//
16
+	}
17
+
18
+	public function creating($model)
19
+	{
20
+		//
21
+	}
22
+
23
+	public function created($model)
24
+	{
25
+		//
26
+	}
27
+
28
+	public function updating($model)
29
+	{
30
+		//
31
+	}
32
+
33
+	public function updated($model)
34
+	{
35
+		//
36
+	}
37
+
38
+	public function deleting($model)
39
+	{
40
+		//
41
+	}
42
+
43
+	public function deleted($model)
44
+	{
45
+		//
46
+	}
47
+
48
+	public function restoring($model)
49
+	{
50
+		//
51
+	}
52
+
53
+	public function restored($model)
54
+	{
55
+		//
56
+	}
57 57
 }
58 58
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/V1/Core/ModelObservers/SettingsObserver.php 1 patch
Indentation   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -5,68 +5,68 @@
 block discarded – undo
5 5
  */
6 6
 class SettingsObserver {
7 7
 
8
-    public function saving($model)
9
-    {
10
-        //
11
-    }
8
+	public function saving($model)
9
+	{
10
+		//
11
+	}
12 12
 
13
-    public function saved($model)
14
-    {
15
-        //
16
-    }
13
+	public function saved($model)
14
+	{
15
+		//
16
+	}
17 17
 
18
-    /**
19
-     * Prevent the creating of the settings.
20
-     * 
21
-     * @param  object $model the model beign created.
22
-     * @return void
23
-     */
24
-    public function creating($model)
25
-    {
26
-        \ErrorHandler::cannotCreateSetting();
27
-    }
18
+	/**
19
+	 * Prevent the creating of the settings.
20
+	 * 
21
+	 * @param  object $model the model beign created.
22
+	 * @return void
23
+	 */
24
+	public function creating($model)
25
+	{
26
+		\ErrorHandler::cannotCreateSetting();
27
+	}
28 28
 
29
-    public function created($model)
30
-    {
31
-        //
32
-    }
29
+	public function created($model)
30
+	{
31
+		//
32
+	}
33 33
 
34
-    /**
35
-     * Prevent updating of the setting key.
36
-     * 
37
-     * @param  object $model the model beign updated.
38
-     * @return void
39
-     */
40
-    public function updating($model)
41
-    {
42
-        if ($model->getOriginal('key') !== $model->key) 
43
-        {
44
-            \ErrorHandler::cannotUpdateSettingKey();
45
-        }
46
-    }
34
+	/**
35
+	 * Prevent updating of the setting key.
36
+	 * 
37
+	 * @param  object $model the model beign updated.
38
+	 * @return void
39
+	 */
40
+	public function updating($model)
41
+	{
42
+		if ($model->getOriginal('key') !== $model->key) 
43
+		{
44
+			\ErrorHandler::cannotUpdateSettingKey();
45
+		}
46
+	}
47 47
 
48
-    public function updated($model)
49
-    {
50
-        //
51
-    }
48
+	public function updated($model)
49
+	{
50
+		//
51
+	}
52 52
 
53
-    public function deleting($model)
54
-    {
55
-        //
56
-    }
53
+	public function deleting($model)
54
+	{
55
+		//
56
+	}
57 57
 
58
-    public function deleted($model)
59
-    {
60
-        //
61
-    }
58
+	public function deleted($model)
59
+	{
60
+		//
61
+	}
62 62
 
63
-    public function restoring($model)
64
-    {
65
-        //
66
-    }
63
+	public function restoring($model)
64
+	{
65
+		//
66
+	}
67 67
 
68
-    public function restored($model)
69
-    {
70
-        //
71
-    }
68
+	public function restored($model)
69
+	{
70
+		//
71
+	}
72 72
 }
73 73
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/V1/Core/Utl/CoreConfig.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3,10 +3,10 @@  discard block
 block discarded – undo
3 3
 
4 4
 class CoreConfig
5 5
 {
6
-    public function getConfig()
7
-    {
8
-        return [
9
-        	'resetLink' => '{{link_here}}',
6
+	public function getConfig()
7
+	{
8
+		return [
9
+			'resetLink' => '{{link_here}}',
10 10
 			/**
11 11
 			 * Specify what relations should be used for every model.
12 12
 			 */
@@ -180,5 +180,5 @@  discard block
 block discarded – undo
180 180
 				]
181 181
 			]
182 182
 		];
183
-    }
183
+	}
184 184
 }
185 185
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/V1/Core/Http/Controllers/BaseApiController.php 2 patches
Indentation   +268 added lines, -268 removed lines patch added patch discarded remove patch
@@ -6,298 +6,298 @@
 block discarded – undo
6 6
 
7 7
 class BaseApiController extends Controller
8 8
 {
9
-    /**
10
-     * The config implementation.
11
-     * 
12
-     * @var array
13
-     */
14
-    protected $config;
9
+	/**
10
+	 * The config implementation.
11
+	 * 
12
+	 * @var array
13
+	 */
14
+	protected $config;
15 15
 
16
-    /**
17
-     * The relations implementation.
18
-     * 
19
-     * @var array
20
-     */
21
-    protected $relations;
16
+	/**
17
+	 * The relations implementation.
18
+	 * 
19
+	 * @var array
20
+	 */
21
+	protected $relations;
22 22
 
23
-    /**
24
-     * The repo implementation.
25
-     * 
26
-     * @var array
27
-     */
28
-    protected $repo;
23
+	/**
24
+	 * The repo implementation.
25
+	 * 
26
+	 * @var array
27
+	 */
28
+	protected $repo;
29 29
 
30
-    public function __construct()
31
-    {        
32
-        $this->config              = \CoreConfig::getConfig();
33
-        $this->model               = property_exists($this, 'model') ? $this->model : false;
34
-        $this->validationRules     = property_exists($this, 'validationRules') ? $this->validationRules : false;
35
-        $this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
36
-        $this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
37
-        $this->repo                = call_user_func_array("\Core::{$this->model}", []);
38
-        $route                     = explode('@',\Route::currentRouteAction())[1];
30
+	public function __construct()
31
+	{        
32
+		$this->config              = \CoreConfig::getConfig();
33
+		$this->model               = property_exists($this, 'model') ? $this->model : false;
34
+		$this->validationRules     = property_exists($this, 'validationRules') ? $this->validationRules : false;
35
+		$this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
36
+		$this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
37
+		$this->repo                = call_user_func_array("\Core::{$this->model}", []);
38
+		$route                     = explode('@',\Route::currentRouteAction())[1];
39 39
 
40
-        $this->checkPermission($route);
41
-        $this->setRelations($route);
42
-        $this->setSessions();
43
-    }
40
+		$this->checkPermission($route);
41
+		$this->setRelations($route);
42
+		$this->setSessions();
43
+	}
44 44
 
45
-    /**
46
-     * Fetch all records with relations from storage.
47
-     * 
48
-     * @param  string  $sortBy The name of the column to sort by.
49
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
50
-     * @return \Illuminate\Http\Response
51
-     */
52
-    public function index($sortBy = 'created_at', $desc = 1) 
53
-    {
54
-        if ($this->repo)
55
-        {
56
-            return \Response::json($this->repo->all($this->relations, $sortBy, $desc), 200);
57
-        }
58
-    }
45
+	/**
46
+	 * Fetch all records with relations from storage.
47
+	 * 
48
+	 * @param  string  $sortBy The name of the column to sort by.
49
+	 * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
50
+	 * @return \Illuminate\Http\Response
51
+	 */
52
+	public function index($sortBy = 'created_at', $desc = 1) 
53
+	{
54
+		if ($this->repo)
55
+		{
56
+			return \Response::json($this->repo->all($this->relations, $sortBy, $desc), 200);
57
+		}
58
+	}
59 59
 
60
-    /**
61
-     * Fetch the single object with relations from storage.
62
-     * 
63
-     * @param  integer $id Id of the requested model.
64
-     * @return \Illuminate\Http\Response
65
-     */
66
-    public function find($id) 
67
-    {
68
-        if ($this->repo) 
69
-        {
70
-            return \Response::json($this->repo->find($id, $this->relations), 200);
71
-        }
72
-    }
60
+	/**
61
+	 * Fetch the single object with relations from storage.
62
+	 * 
63
+	 * @param  integer $id Id of the requested model.
64
+	 * @return \Illuminate\Http\Response
65
+	 */
66
+	public function find($id) 
67
+	{
68
+		if ($this->repo) 
69
+		{
70
+			return \Response::json($this->repo->find($id, $this->relations), 200);
71
+		}
72
+	}
73 73
 
74
-    /**
75
-     * Paginate all records with relations from storage
76
-     * that matche the given query.
77
-     * 
78
-     * @param  string  $query   The search text.
79
-     * @param  integer $perPage Number of rows per page default 15.
80
-     * @param  string  $sortBy  The name of the column to sort by.
81
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
82
-     * @return \Illuminate\Http\Response
83
-     */
84
-    public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) 
85
-    {
86
-        if ($this->repo) 
87
-        {
88
-            return \Response::json($this->repo->search($query, $perPage, $this->relations, $sortBy, $desc), 200);
89
-        }
90
-    }
74
+	/**
75
+	 * Paginate all records with relations from storage
76
+	 * that matche the given query.
77
+	 * 
78
+	 * @param  string  $query   The search text.
79
+	 * @param  integer $perPage Number of rows per page default 15.
80
+	 * @param  string  $sortBy  The name of the column to sort by.
81
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
82
+	 * @return \Illuminate\Http\Response
83
+	 */
84
+	public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) 
85
+	{
86
+		if ($this->repo) 
87
+		{
88
+			return \Response::json($this->repo->search($query, $perPage, $this->relations, $sortBy, $desc), 200);
89
+		}
90
+	}
91 91
 
92
-    /**
93
-     * Fetch records from the storage based on the given
94
-     * condition.
95
-     * 
96
-     * @param  \Illuminate\Http\Request  $request
97
-     * @param  string  $sortBy The name of the column to sort by.
98
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
99
-     * @return \Illuminate\Http\Response
100
-     */
101
-    public function findby(Request $request, $sortBy = 'created_at', $desc = 1) 
102
-    {
103
-        if ($this->repo) 
104
-        {
105
-            return \Response::json($this->repo->findBy($request->all(), $this->relations, $sortBy, $desc), 200);
106
-        }
107
-    }
92
+	/**
93
+	 * Fetch records from the storage based on the given
94
+	 * condition.
95
+	 * 
96
+	 * @param  \Illuminate\Http\Request  $request
97
+	 * @param  string  $sortBy The name of the column to sort by.
98
+	 * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
99
+	 * @return \Illuminate\Http\Response
100
+	 */
101
+	public function findby(Request $request, $sortBy = 'created_at', $desc = 1) 
102
+	{
103
+		if ($this->repo) 
104
+		{
105
+			return \Response::json($this->repo->findBy($request->all(), $this->relations, $sortBy, $desc), 200);
106
+		}
107
+	}
108 108
 
109
-    /**
110
-     * Fetch the first record from the storage based on the given
111
-     * condition.
112
-     * 
113
-     * @param  \Illuminate\Http\Request  $request
114
-     * @return \Illuminate\Http\Response
115
-     */
116
-    public function first(Request $request) 
117
-    {
118
-        if ($this->repo) 
119
-        {
120
-            return \Response::json($this->repo->first($request->all(), $this->relations), 200);
121
-        }
122
-    }
109
+	/**
110
+	 * Fetch the first record from the storage based on the given
111
+	 * condition.
112
+	 * 
113
+	 * @param  \Illuminate\Http\Request  $request
114
+	 * @return \Illuminate\Http\Response
115
+	 */
116
+	public function first(Request $request) 
117
+	{
118
+		if ($this->repo) 
119
+		{
120
+			return \Response::json($this->repo->first($request->all(), $this->relations), 200);
121
+		}
122
+	}
123 123
 
124
-    /**
125
-     * Paginate all records with relations from storage.
126
-     * 
127
-     * @param  integer $perPage Number of rows per page default 15.
128
-     * @param  string  $sortBy  The name of the column to sort by.
129
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
130
-     * @return \Illuminate\Http\Response
131
-     */
132
-    public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1) 
133
-    {
134
-        if ($this->repo) 
135
-        {
136
-            return \Response::json($this->repo->paginate($perPage, $this->relations, $sortBy, $desc), 200);
137
-        }
138
-    }
124
+	/**
125
+	 * Paginate all records with relations from storage.
126
+	 * 
127
+	 * @param  integer $perPage Number of rows per page default 15.
128
+	 * @param  string  $sortBy  The name of the column to sort by.
129
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
130
+	 * @return \Illuminate\Http\Response
131
+	 */
132
+	public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1) 
133
+	{
134
+		if ($this->repo) 
135
+		{
136
+			return \Response::json($this->repo->paginate($perPage, $this->relations, $sortBy, $desc), 200);
137
+		}
138
+	}
139 139
 
140
-    /**
141
-     * Fetch all records with relations based on
142
-     * the given condition from storage in pages.
143
-     * 
144
-     * @param  \Illuminate\Http\Request  $request
145
-     * @param  integer $perPage Number of rows per page default 15.
146
-     * @param  string  $sortBy  The name of the column to sort by.
147
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
148
-     * @return \Illuminate\Http\Response
149
-     */
150
-    public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
151
-    {
152
-        if ($this->repo) 
153
-        {
154
-            return \Response::json($this->repo->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc), 200);
155
-        }
156
-    }
140
+	/**
141
+	 * Fetch all records with relations based on
142
+	 * the given condition from storage in pages.
143
+	 * 
144
+	 * @param  \Illuminate\Http\Request  $request
145
+	 * @param  integer $perPage Number of rows per page default 15.
146
+	 * @param  string  $sortBy  The name of the column to sort by.
147
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
148
+	 * @return \Illuminate\Http\Response
149
+	 */
150
+	public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
151
+	{
152
+		if ($this->repo) 
153
+		{
154
+			return \Response::json($this->repo->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc), 200);
155
+		}
156
+	}
157 157
 
158
-    /**
159
-     * Save the given model to storage.
160
-     * 
161
-     * @param  \Illuminate\Http\Request  $request
162
-     * @return \Illuminate\Http\Response
163
-     */
164
-    public function save(Request $request) 
165
-    {
166
-        foreach ($this->validationRules as &$rule) 
167
-        {
168
-            if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
169
-            {
170
-                $rule .= ',deleted_at,NULL';
171
-            }
158
+	/**
159
+	 * Save the given model to storage.
160
+	 * 
161
+	 * @param  \Illuminate\Http\Request  $request
162
+	 * @return \Illuminate\Http\Response
163
+	 */
164
+	public function save(Request $request) 
165
+	{
166
+		foreach ($this->validationRules as &$rule) 
167
+		{
168
+			if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
169
+			{
170
+				$rule .= ',deleted_at,NULL';
171
+			}
172 172
 
173
-            if ($request->has('id')) 
174
-            {
175
-                $rule = str_replace('{id}', $request->get('id'), $rule);
176
-            }
177
-            else
178
-            {
179
-                $rule = str_replace(',{id}', '', $rule);
180
-            }
181
-        }
173
+			if ($request->has('id')) 
174
+			{
175
+				$rule = str_replace('{id}', $request->get('id'), $rule);
176
+			}
177
+			else
178
+			{
179
+				$rule = str_replace(',{id}', '', $rule);
180
+			}
181
+		}
182 182
         
183
-        $this->validate($request, $this->validationRules);
183
+		$this->validate($request, $this->validationRules);
184 184
 
185
-        if ($this->repo) 
186
-        {
187
-            return \Response::json($this->repo->save($request->all()), 200);
188
-        }
189
-    }
185
+		if ($this->repo) 
186
+		{
187
+			return \Response::json($this->repo->save($request->all()), 200);
188
+		}
189
+	}
190 190
 
191
-    /**
192
-     * Delete by the given id from storage.
193
-     * 
194
-     * @param  integer $id Id of the deleted model.
195
-     * @return \Illuminate\Http\Response
196
-     */
197
-    public function delete($id) 
198
-    {
199
-        if ($this->repo) 
200
-        {
201
-            return \Response::json($this->repo->delete($id), 200);
202
-        }
203
-    }
191
+	/**
192
+	 * Delete by the given id from storage.
193
+	 * 
194
+	 * @param  integer $id Id of the deleted model.
195
+	 * @return \Illuminate\Http\Response
196
+	 */
197
+	public function delete($id) 
198
+	{
199
+		if ($this->repo) 
200
+		{
201
+			return \Response::json($this->repo->delete($id), 200);
202
+		}
203
+	}
204 204
 
205
-    /**
206
-     * Return the deleted models in pages based on the given conditions.
207
-     *
208
-     * @param  \Illuminate\Http\Request  $request
209
-     * @param  integer $perPage Number of rows per page default 15.
210
-     * @param  string  $sortBy  The name of the column to sort by.
211
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
212
-     * @return \Illuminate\Http\Response
213
-     */
214
-    public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
215
-    {
216
-        return \Response::json($this->repo->deleted($request->all(), $perPage, $sortBy, $desc), 200);
217
-    }
205
+	/**
206
+	 * Return the deleted models in pages based on the given conditions.
207
+	 *
208
+	 * @param  \Illuminate\Http\Request  $request
209
+	 * @param  integer $perPage Number of rows per page default 15.
210
+	 * @param  string  $sortBy  The name of the column to sort by.
211
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
212
+	 * @return \Illuminate\Http\Response
213
+	 */
214
+	public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
215
+	{
216
+		return \Response::json($this->repo->deleted($request->all(), $perPage, $sortBy, $desc), 200);
217
+	}
218 218
 
219
-    /**
220
-     * Restore the deleted model.
221
-     * 
222
-     * @param  integer $id Id of the restored model.
223
-     * @return \Illuminate\Http\Response
224
-     */
225
-    public function restore($id) 
226
-    {
227
-        if ($this->repo) 
228
-        {
229
-            return \Response::json($this->repo->restore($id), 200);
230
-        }
231
-    }
219
+	/**
220
+	 * Restore the deleted model.
221
+	 * 
222
+	 * @param  integer $id Id of the restored model.
223
+	 * @return \Illuminate\Http\Response
224
+	 */
225
+	public function restore($id) 
226
+	{
227
+		if ($this->repo) 
228
+		{
229
+			return \Response::json($this->repo->restore($id), 200);
230
+		}
231
+	}
232 232
 
233
-    /**
234
-     * Check if the logged in user can do the given permission.
235
-     * 
236
-     * @param  string $permission
237
-     * @return void
238
-     */
239
-    private function checkPermission($permission)
240
-    {
241
-        $permission = $permission !== 'index' ? $permission : 'list';
242
-        if ( ! in_array($permission, $this->skipLoginCheck)) 
243
-        {
244
-            $user = \JWTAuth::parseToken()->authenticate();
245
-            if ($user->blocked)
246
-            {
247
-                \ErrorHandler::userIsBlocked();
248
-            }
233
+	/**
234
+	 * Check if the logged in user can do the given permission.
235
+	 * 
236
+	 * @param  string $permission
237
+	 * @return void
238
+	 */
239
+	private function checkPermission($permission)
240
+	{
241
+		$permission = $permission !== 'index' ? $permission : 'list';
242
+		if ( ! in_array($permission, $this->skipLoginCheck)) 
243
+		{
244
+			$user = \JWTAuth::parseToken()->authenticate();
245
+			if ($user->blocked)
246
+			{
247
+				\ErrorHandler::userIsBlocked();
248
+			}
249 249
             
250
-            if ( ! in_array($permission, $this->skipPermissionCheck) && ! \Core::users()->can($permission, $this->model))
251
-            {
252
-                \ErrorHandler::noPermissions();
253
-            }
254
-        }
255
-    }
250
+			if ( ! in_array($permission, $this->skipPermissionCheck) && ! \Core::users()->can($permission, $this->model))
251
+			{
252
+				\ErrorHandler::noPermissions();
253
+			}
254
+		}
255
+	}
256 256
 
257
-    /**
258
-     * Set sessions based on the given headers in the request.
259
-     * 
260
-     * @return void
261
-     */
262
-    private function setSessions()
263
-    {
264
-        \Session::put('timeZoneDiff', \Request::header('time-zone-diff') ?: 0);
257
+	/**
258
+	 * Set sessions based on the given headers in the request.
259
+	 * 
260
+	 * @return void
261
+	 */
262
+	private function setSessions()
263
+	{
264
+		\Session::put('timeZoneDiff', \Request::header('time-zone-diff') ?: 0);
265 265
 
266
-        $locale = \Request::header('locale');
267
-        switch ($locale) 
268
-        {
269
-            case 'en':
270
-            \App::setLocale('en');
271
-            \Session::put('locale', 'en');
272
-            break;
266
+		$locale = \Request::header('locale');
267
+		switch ($locale) 
268
+		{
269
+			case 'en':
270
+			\App::setLocale('en');
271
+			\Session::put('locale', 'en');
272
+			break;
273 273
 
274
-            case 'ar':
275
-            \App::setLocale('ar');
276
-            \Session::put('locale', 'ar');
277
-            break;
274
+			case 'ar':
275
+			\App::setLocale('ar');
276
+			\Session::put('locale', 'ar');
277
+			break;
278 278
 
279
-            case 'all':
280
-            \App::setLocale('en');
281
-            \Session::put('locale', 'all');
282
-            break;
279
+			case 'all':
280
+			\App::setLocale('en');
281
+			\Session::put('locale', 'all');
282
+			break;
283 283
 
284
-            default:
285
-            \App::setLocale('en');
286
-            \Session::put('locale', 'en');
287
-            break;
288
-        }
289
-    }
284
+			default:
285
+			\App::setLocale('en');
286
+			\Session::put('locale', 'en');
287
+			break;
288
+		}
289
+	}
290 290
 
291
-    /**
292
-     * Set relation based on the called api.
293
-     * 
294
-     * @param  string $route
295
-     * @return void
296
-     */
297
-    private function setRelations($route)
298
-    {
299
-        $route           = $route !== 'index' ? $route : 'list';
300
-        $relations       = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
301
-        $this->relations = $relations && $relations[$route] ? $relations[$route] : [];
302
-    }
291
+	/**
292
+	 * Set relation based on the called api.
293
+	 * 
294
+	 * @param  string $route
295
+	 * @return void
296
+	 */
297
+	private function setRelations($route)
298
+	{
299
+		$route           = $route !== 'index' ? $route : 'list';
300
+		$relations       = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
301
+		$this->relations = $relations && $relations[$route] ? $relations[$route] : [];
302
+	}
303 303
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
         $this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
36 36
         $this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
37 37
         $this->repo                = call_user_func_array("\Core::{$this->model}", []);
38
-        $route                     = explode('@',\Route::currentRouteAction())[1];
38
+        $route                     = explode('@', \Route::currentRouteAction())[1];
39 39
 
40 40
         $this->checkPermission($route);
41 41
         $this->setRelations($route);
Please login to merge, or discard this patch.
src/Modules/V1/Core/Console/Commands/GenerateDoc.php 2 patches
Indentation   +238 added lines, -238 removed lines patch added patch discarded remove patch
@@ -6,270 +6,270 @@
 block discarded – undo
6 6
 
7 7
 class GenerateDoc extends Command
8 8
 {
9
-    /**
10
-     * The name and signature of the console command.
11
-     *
12
-     * @var string
13
-     */
14
-    protected $signature = 'doc:generate';
9
+	/**
10
+	 * The name and signature of the console command.
11
+	 *
12
+	 * @var string
13
+	 */
14
+	protected $signature = 'doc:generate';
15 15
 
16
-    /**
17
-     * The console command description.
18
-     *
19
-     * @var string
20
-     */
21
-    protected $description = 'Generate api documentation';
16
+	/**
17
+	 * The console command description.
18
+	 *
19
+	 * @var string
20
+	 */
21
+	protected $description = 'Generate api documentation';
22 22
 
23
-    /**
24
-     * Create a new command instance.
25
-     *
26
-     * @return void
27
-     */
28
-    public function __construct()
29
-    {
30
-        parent::__construct();
31
-    }
23
+	/**
24
+	 * Create a new command instance.
25
+	 *
26
+	 * @return void
27
+	 */
28
+	public function __construct()
29
+	{
30
+		parent::__construct();
31
+	}
32 32
 
33
-    /**
34
-     * Execute the console command.
35
-     *
36
-     * @return mixed
37
-     */
38
-    public function handle()
39
-    {
40
-        $docData           = [];
41
-        $docData['models'] = [];
42
-        $routes            = $this->getRoutes();
43
-        foreach ($routes as $route) 
44
-        {
45
-            if ($route) 
46
-            {
47
-                $actoinArray       = explode('@', $route['action']);
48
-                $controller        = $actoinArray[0];
49
-                $method            = $actoinArray[1];
50
-                $route['name']     = $method !== 'index' ? $method : 'list';
33
+	/**
34
+	 * Execute the console command.
35
+	 *
36
+	 * @return mixed
37
+	 */
38
+	public function handle()
39
+	{
40
+		$docData           = [];
41
+		$docData['models'] = [];
42
+		$routes            = $this->getRoutes();
43
+		foreach ($routes as $route) 
44
+		{
45
+			if ($route) 
46
+			{
47
+				$actoinArray       = explode('@', $route['action']);
48
+				$controller        = $actoinArray[0];
49
+				$method            = $actoinArray[1];
50
+				$route['name']     = $method !== 'index' ? $method : 'list';
51 51
                 
52
-                $reflectionClass   = new \ReflectionClass($controller);
53
-                $reflectionMethod  = $reflectionClass->getMethod($method);
54
-                $classProperties   = $reflectionClass->getDefaultProperties();
55
-                $skipLoginCheck    = array_key_exists('skipLoginCheck', $classProperties) ? $classProperties['skipLoginCheck'] : false;
56
-                $validationRules   = array_key_exists('validationRules', $classProperties) ? $classProperties['validationRules'] : false;
52
+				$reflectionClass   = new \ReflectionClass($controller);
53
+				$reflectionMethod  = $reflectionClass->getMethod($method);
54
+				$classProperties   = $reflectionClass->getDefaultProperties();
55
+				$skipLoginCheck    = array_key_exists('skipLoginCheck', $classProperties) ? $classProperties['skipLoginCheck'] : false;
56
+				$validationRules   = array_key_exists('validationRules', $classProperties) ? $classProperties['validationRules'] : false;
57 57
                 
58
-                $route['response'] = $this->getResponseObject($classProperties['model'], $route['name']);
58
+				$route['response'] = $this->getResponseObject($classProperties['model'], $route['name']);
59 59
 
60
-                $this->processDocBlock($route, $reflectionMethod);
61
-                $this->getHeaders($route, $reflectionClass, $method, $skipLoginCheck);
62
-                $this->getPostData($route, $reflectionMethod, $validationRules);
60
+				$this->processDocBlock($route, $reflectionMethod);
61
+				$this->getHeaders($route, $reflectionClass, $method, $skipLoginCheck);
62
+				$this->getPostData($route, $reflectionMethod, $validationRules);
63 63
 
64
-                preg_match('/api\/v1\/([^#]+)\//iU', $route['uri'], $module);
65
-                preg_match('/api\/v1\/' . $module[1] . '\/([^#]+)\//iU', $route['uri'], $model);
66
-                $docData['modules'][$module[1]][$model[1]][] = $route;
64
+				preg_match('/api\/v1\/([^#]+)\//iU', $route['uri'], $module);
65
+				preg_match('/api\/v1\/' . $module[1] . '\/([^#]+)\//iU', $route['uri'], $model);
66
+				$docData['modules'][$module[1]][$model[1]][] = $route;
67 67
 
68
-                $this->getModels($classProperties['model'], $docData);
69
-            }
70
-        }
68
+				$this->getModels($classProperties['model'], $docData);
69
+			}
70
+		}
71 71
         
72
-        $docData['errors'] = $this->getErrors();
73
-        \File::put(app_path('Modules/V1/Core/Resources/api.json'), json_encode($docData));
74
-    }
72
+		$docData['errors'] = $this->getErrors();
73
+		\File::put(app_path('Modules/V1/Core/Resources/api.json'), json_encode($docData));
74
+	}
75 75
 
76
-    /**
77
-     * Get list of all registered routes.
78
-     * 
79
-     * @return collection
80
-     */
81
-    protected function getRoutes()
82
-    {
83
-        return collect(\Route::getRoutes())->map(function ($route) {
84
-            if (strpos($route->uri(), 'api/v') !== false) 
85
-            {
86
-                return [
87
-                    'method' => $route->methods()[0],
88
-                    'uri'    => $route->uri(),
89
-                    'action' => $route->getActionName()
90
-                ];
91
-            }
92
-            return false;
93
-        })->all();
94
-    }
76
+	/**
77
+	 * Get list of all registered routes.
78
+	 * 
79
+	 * @return collection
80
+	 */
81
+	protected function getRoutes()
82
+	{
83
+		return collect(\Route::getRoutes())->map(function ($route) {
84
+			if (strpos($route->uri(), 'api/v') !== false) 
85
+			{
86
+				return [
87
+					'method' => $route->methods()[0],
88
+					'uri'    => $route->uri(),
89
+					'action' => $route->getActionName()
90
+				];
91
+			}
92
+			return false;
93
+		})->all();
94
+	}
95 95
 
96
-    /**
97
-     * Generate headers for the given route.
98
-     * 
99
-     * @param  array  &$route
100
-     * @param  object $reflectionClass
101
-     * @param  string $method
102
-     * @param  array  $skipLoginCheck
103
-     * @return void
104
-     */
105
-    protected function getHeaders(&$route, $reflectionClass, $method, $skipLoginCheck)
106
-    {
107
-        $route['headers'] = [
108
-        'Accept'         => 'application/json',
109
-        'Content-Type'   => 'application/json',
110
-        'locale'         => 'The language of the returned data: ar, en or all.',
111
-        'time-zone-diff' => 'Timezone difference between UTC and Local Time',
112
-        ];
96
+	/**
97
+	 * Generate headers for the given route.
98
+	 * 
99
+	 * @param  array  &$route
100
+	 * @param  object $reflectionClass
101
+	 * @param  string $method
102
+	 * @param  array  $skipLoginCheck
103
+	 * @return void
104
+	 */
105
+	protected function getHeaders(&$route, $reflectionClass, $method, $skipLoginCheck)
106
+	{
107
+		$route['headers'] = [
108
+		'Accept'         => 'application/json',
109
+		'Content-Type'   => 'application/json',
110
+		'locale'         => 'The language of the returned data: ar, en or all.',
111
+		'time-zone-diff' => 'Timezone difference between UTC and Local Time',
112
+		];
113 113
 
114 114
 
115
-        if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) 
116
-        {
117
-            $route['headers']['Authrization'] = 'bearer {token}';
118
-        }
119
-    }
115
+		if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) 
116
+		{
117
+			$route['headers']['Authrization'] = 'bearer {token}';
118
+		}
119
+	}
120 120
 
121
-    /**
122
-     * Generate description and params for the given route
123
-     * based on the docblock.
124
-     * 
125
-     * @param  array  &$route
126
-     * @param  object $reflectionMethod]
127
-     * @return void
128
-     */
129
-    protected function processDocBlock(&$route, $reflectionMethod)
130
-    {
131
-        $factory              = \phpDocumentor\Reflection\DocBlockFactory::createInstance();
132
-        $docblock             = $factory->create($reflectionMethod->getDocComment());
133
-        $route['description'] = trim(preg_replace('/\s+/', ' ', $docblock->getSummary()));
134
-        $params               = $docblock->getTagsByName('param');
135
-        foreach ($params as $param) 
136
-        {
137
-            $name = $param->getVariableName();
138
-            if ($name !== 'request') 
139
-            {
140
-                $route['parametars'][$param->getVariableName()] = $param->getDescription()->render();
141
-            }
142
-        }
143
-    }
121
+	/**
122
+	 * Generate description and params for the given route
123
+	 * based on the docblock.
124
+	 * 
125
+	 * @param  array  &$route
126
+	 * @param  object $reflectionMethod]
127
+	 * @return void
128
+	 */
129
+	protected function processDocBlock(&$route, $reflectionMethod)
130
+	{
131
+		$factory              = \phpDocumentor\Reflection\DocBlockFactory::createInstance();
132
+		$docblock             = $factory->create($reflectionMethod->getDocComment());
133
+		$route['description'] = trim(preg_replace('/\s+/', ' ', $docblock->getSummary()));
134
+		$params               = $docblock->getTagsByName('param');
135
+		foreach ($params as $param) 
136
+		{
137
+			$name = $param->getVariableName();
138
+			if ($name !== 'request') 
139
+			{
140
+				$route['parametars'][$param->getVariableName()] = $param->getDescription()->render();
141
+			}
142
+		}
143
+	}
144 144
 
145
-    /**
146
-     * Generate post body for the given route.
147
-     * 
148
-     * @param  array  &$route
149
-     * @param  object $reflectionMethod
150
-     * @param  array  $validationRules
151
-     * @return void
152
-     */
153
-    protected function getPostData(&$route, $reflectionMethod, $validationRules)
154
-    {
155
-        if ($route['method'] == 'POST') 
156
-        {
157
-            $body = $this->getMethodBody($reflectionMethod);
145
+	/**
146
+	 * Generate post body for the given route.
147
+	 * 
148
+	 * @param  array  &$route
149
+	 * @param  object $reflectionMethod
150
+	 * @param  array  $validationRules
151
+	 * @return void
152
+	 */
153
+	protected function getPostData(&$route, $reflectionMethod, $validationRules)
154
+	{
155
+		if ($route['method'] == 'POST') 
156
+		{
157
+			$body = $this->getMethodBody($reflectionMethod);
158 158
 
159
-            preg_match('/\$this->validate\(\$request,([^#]+)\);/iU', $body, $match);
160
-            if (count($match)) 
161
-            {
162
-                if ($match[1] == '$this->validationRules')
163
-                {
164
-                    $route['body'] = $validationRules;
165
-                }
166
-                else
167
-                {
168
-                    $route['body'] = eval('return ' . $match[1] . ';');
169
-                }
159
+			preg_match('/\$this->validate\(\$request,([^#]+)\);/iU', $body, $match);
160
+			if (count($match)) 
161
+			{
162
+				if ($match[1] == '$this->validationRules')
163
+				{
164
+					$route['body'] = $validationRules;
165
+				}
166
+				else
167
+				{
168
+					$route['body'] = eval('return ' . $match[1] . ';');
169
+				}
170 170
 
171
-                foreach ($route['body'] as &$rule) 
172
-                {
173
-                    if(strpos($rule, 'unique'))
174
-                    {
175
-                        $rule = substr($rule, 0, strpos($rule, 'unique') + 6);
176
-                    }
177
-                    elseif(strpos($rule, 'exists'))
178
-                    {
179
-                        $rule = substr($rule, 0, strpos($rule, 'exists') - 1);
180
-                    }
181
-                }
182
-            }
183
-            else
184
-            {
185
-                $route['body'] = 'conditions';
186
-            }
187
-        }
188
-    }
171
+				foreach ($route['body'] as &$rule) 
172
+				{
173
+					if(strpos($rule, 'unique'))
174
+					{
175
+						$rule = substr($rule, 0, strpos($rule, 'unique') + 6);
176
+					}
177
+					elseif(strpos($rule, 'exists'))
178
+					{
179
+						$rule = substr($rule, 0, strpos($rule, 'exists') - 1);
180
+					}
181
+				}
182
+			}
183
+			else
184
+			{
185
+				$route['body'] = 'conditions';
186
+			}
187
+		}
188
+	}
189 189
 
190
-    /**
191
-     * Generate application errors.
192
-     * 
193
-     * @return array
194
-     */
195
-    protected function getErrors()
196
-    {
197
-        $errors          = [];
198
-        $reflectionClass = new \ReflectionClass('App\Modules\V1\Core\Utl\ErrorHandler');
199
-        foreach ($reflectionClass->getMethods() as $method) 
200
-        {
201
-            $methodName       = $method->getName();
202
-            $reflectionMethod = $reflectionClass->getMethod($methodName);
203
-            $body             = $this->getMethodBody($reflectionMethod);
190
+	/**
191
+	 * Generate application errors.
192
+	 * 
193
+	 * @return array
194
+	 */
195
+	protected function getErrors()
196
+	{
197
+		$errors          = [];
198
+		$reflectionClass = new \ReflectionClass('App\Modules\V1\Core\Utl\ErrorHandler');
199
+		foreach ($reflectionClass->getMethods() as $method) 
200
+		{
201
+			$methodName       = $method->getName();
202
+			$reflectionMethod = $reflectionClass->getMethod($methodName);
203
+			$body             = $this->getMethodBody($reflectionMethod);
204 204
 
205
-            preg_match('/\$error=\[\'status\'=>([^#]+)\,/iU', $body, $match);
205
+			preg_match('/\$error=\[\'status\'=>([^#]+)\,/iU', $body, $match);
206 206
 
207
-            if (count($match)) 
208
-            {
209
-                $errors[$match[1]][] = $methodName;
210
-            }
211
-        }
207
+			if (count($match)) 
208
+			{
209
+				$errors[$match[1]][] = $methodName;
210
+			}
211
+		}
212 212
 
213
-        return $errors;
214
-    }
213
+		return $errors;
214
+	}
215 215
 
216
-    /**
217
-     * Get the given method body code.
218
-     * 
219
-     * @param  object $reflectionMethod
220
-     * @return string
221
-     */
222
-    protected function getMethodBody($reflectionMethod)
223
-    {
224
-        $filename   = $reflectionMethod->getFileName();
225
-        $start_line = $reflectionMethod->getStartLine() - 1;
226
-        $end_line   = $reflectionMethod->getEndLine();
227
-        $length     = $end_line - $start_line;         
228
-        $source     = file($filename);
229
-        $body       = implode("", array_slice($source, $start_line, $length));
230
-        $body       = trim(preg_replace('/\s+/', '', $body));
216
+	/**
217
+	 * Get the given method body code.
218
+	 * 
219
+	 * @param  object $reflectionMethod
220
+	 * @return string
221
+	 */
222
+	protected function getMethodBody($reflectionMethod)
223
+	{
224
+		$filename   = $reflectionMethod->getFileName();
225
+		$start_line = $reflectionMethod->getStartLine() - 1;
226
+		$end_line   = $reflectionMethod->getEndLine();
227
+		$length     = $end_line - $start_line;         
228
+		$source     = file($filename);
229
+		$body       = implode("", array_slice($source, $start_line, $length));
230
+		$body       = trim(preg_replace('/\s+/', '', $body));
231 231
 
232
-        return $body;
233
-    }
232
+		return $body;
233
+	}
234 234
 
235
-    /**
236
-     * Get example object of all availble models.
237
-     * 
238
-     * @param  string $modelName
239
-     * @param  object $docData
240
-     * @return string
241
-     */
242
-    protected function getModels($modelName, &$docData)
243
-    {
244
-        if ($modelName && ! array_key_exists($modelName, $docData['models'])) 
245
-        {
246
-            $modelClass = call_user_func_array("\Core::{$modelName}", [])->modelClass;
247
-            $model      = factory($modelClass)->make();
248
-            $modelArr   = $model->toArray();
235
+	/**
236
+	 * Get example object of all availble models.
237
+	 * 
238
+	 * @param  string $modelName
239
+	 * @param  object $docData
240
+	 * @return string
241
+	 */
242
+	protected function getModels($modelName, &$docData)
243
+	{
244
+		if ($modelName && ! array_key_exists($modelName, $docData['models'])) 
245
+		{
246
+			$modelClass = call_user_func_array("\Core::{$modelName}", [])->modelClass;
247
+			$model      = factory($modelClass)->make();
248
+			$modelArr   = $model->toArray();
249 249
 
250
-            if ( $model->trans && ! $model->trans->count()) 
251
-            {
252
-                $modelArr['trans'] = [
253
-                    'en' => factory($modelClass . 'Translation')->make()->toArray()
254
-                ];
255
-            }
250
+			if ( $model->trans && ! $model->trans->count()) 
251
+			{
252
+				$modelArr['trans'] = [
253
+					'en' => factory($modelClass . 'Translation')->make()->toArray()
254
+				];
255
+			}
256 256
 
257
-            $docData['models'][$modelName] = json_encode($modelArr, JSON_PRETTY_PRINT);
258
-        }
259
-    }
257
+			$docData['models'][$modelName] = json_encode($modelArr, JSON_PRETTY_PRINT);
258
+		}
259
+	}
260 260
 
261
-    /**
262
-     * Get the route response object type.
263
-     * 
264
-     * @param  string $modelName
265
-     * @param  string $method
266
-     * @return array
267
-     */
268
-    protected function getResponseObject($modelName, $method)
269
-    {
270
-        $config    = \CoreConfig::getConfig();
271
-        $relations = array_key_exists($modelName, $config['relations']) ? array_key_exists($method, $config['relations'][$modelName]) ? $config['relations'][$modelName] : false : false;
261
+	/**
262
+	 * Get the route response object type.
263
+	 * 
264
+	 * @param  string $modelName
265
+	 * @param  string $method
266
+	 * @return array
267
+	 */
268
+	protected function getResponseObject($modelName, $method)
269
+	{
270
+		$config    = \CoreConfig::getConfig();
271
+		$relations = array_key_exists($modelName, $config['relations']) ? array_key_exists($method, $config['relations'][$modelName]) ? $config['relations'][$modelName] : false : false;
272 272
 
273
-        return $relations ? [$modelName => $relations && $relations[$method] ? $relations[$method] : []] : false;
274
-    }
273
+		return $relations ? [$modelName => $relations && $relations[$method] ? $relations[$method] : []] : false;
274
+	}
275 275
 }
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
                 $this->getPostData($route, $reflectionMethod, $validationRules);
63 63
 
64 64
                 preg_match('/api\/v1\/([^#]+)\//iU', $route['uri'], $module);
65
-                preg_match('/api\/v1\/' . $module[1] . '\/([^#]+)\//iU', $route['uri'], $model);
65
+                preg_match('/api\/v1\/'.$module[1].'\/([^#]+)\//iU', $route['uri'], $model);
66 66
                 $docData['modules'][$module[1]][$model[1]][] = $route;
67 67
 
68 68
                 $this->getModels($classProperties['model'], $docData);
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
      */
81 81
     protected function getRoutes()
82 82
     {
83
-        return collect(\Route::getRoutes())->map(function ($route) {
83
+        return collect(\Route::getRoutes())->map(function($route) {
84 84
             if (strpos($route->uri(), 'api/v') !== false) 
85 85
             {
86 86
                 return [
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
         ];
113 113
 
114 114
 
115
-        if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) 
115
+        if ( ! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) 
116 116
         {
117 117
             $route['headers']['Authrization'] = 'bearer {token}';
118 118
         }
@@ -165,16 +165,16 @@  discard block
 block discarded – undo
165 165
                 }
166 166
                 else
167 167
                 {
168
-                    $route['body'] = eval('return ' . $match[1] . ';');
168
+                    $route['body'] = eval('return '.$match[1].';');
169 169
                 }
170 170
 
171 171
                 foreach ($route['body'] as &$rule) 
172 172
                 {
173
-                    if(strpos($rule, 'unique'))
173
+                    if (strpos($rule, 'unique'))
174 174
                     {
175 175
                         $rule = substr($rule, 0, strpos($rule, 'unique') + 6);
176 176
                     }
177
-                    elseif(strpos($rule, 'exists'))
177
+                    elseif (strpos($rule, 'exists'))
178 178
                     {
179 179
                         $rule = substr($rule, 0, strpos($rule, 'exists') - 1);
180 180
                     }
@@ -247,10 +247,10 @@  discard block
 block discarded – undo
247 247
             $model      = factory($modelClass)->make();
248 248
             $modelArr   = $model->toArray();
249 249
 
250
-            if ( $model->trans && ! $model->trans->count()) 
250
+            if ($model->trans && ! $model->trans->count()) 
251 251
             {
252 252
                 $modelArr['trans'] = [
253
-                    'en' => factory($modelClass . 'Translation')->make()->toArray()
253
+                    'en' => factory($modelClass.'Translation')->make()->toArray()
254 254
                 ];
255 255
             }
256 256
 
Please login to merge, or discard this patch.