@@ -51,7 +51,6 @@ |
||
51 | 51 | /** |
52 | 52 | * Execute the console command. |
53 | 53 | * |
54 | - |
|
55 | 54 | */ |
56 | 55 | public function handle() |
57 | 56 | { |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | */ |
56 | 56 | public function handle() |
57 | 57 | { |
58 | - $file = explode("/", (string)$this->argument('name')); |
|
58 | + $file = explode("/", (string) $this->argument('name')); |
|
59 | 59 | |
60 | 60 | $this->repoName = $file[count($file) - 1]; |
61 | 61 | unset($file[count($file) - 1]); |
@@ -65,11 +65,11 @@ discard block |
||
65 | 65 | $this->repoNamespace = ''; |
66 | 66 | } else { |
67 | 67 | $this->repoNamespace = $file[count($file) - 1]; |
68 | - $this->repoNamespace = "\\".implode("\\", $file); |
|
68 | + $this->repoNamespace = "\\" . implode("\\", $file); |
|
69 | 69 | } |
70 | - $model= str_plural(\Config::get('repository.model')); |
|
71 | - $interface= str_plural(\Config::get('repository.interface')); |
|
72 | - $repository= str_plural(\Config::get('repository.repository')); |
|
70 | + $model = str_plural(\Config::get('repository.model')); |
|
71 | + $interface = str_plural(\Config::get('repository.interface')); |
|
72 | + $repository = str_plural(\Config::get('repository.repository')); |
|
73 | 73 | |
74 | 74 | $this->generate($path, \Config::get('repository.controllers_path'), 'Controller'); |
75 | 75 | $this->generate($path, $model, 'Entity'); |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | $this->generate($path, $repository, 'Repository'); |
79 | 79 | |
80 | 80 | $this->repoNamespace = stripslashes($this->repoNamespace); |
81 | - if($this->repoNamespace) |
|
82 | - $this->repoNamespace = $this->repoNamespace."\\"; |
|
81 | + if ($this->repoNamespace) |
|
82 | + $this->repoNamespace = $this->repoNamespace . "\\"; |
|
83 | 83 | File::append(\Config::get('repository.route_path') . '/web.php', "\n" . 'Route::resource(\'' . strtolower(str_plural($this->repoName)) . "', '{$this->repoNamespace}{$this->repoName}Controller');"); |
84 | 84 | |
85 | 85 | } |
@@ -114,10 +114,10 @@ discard block |
||
114 | 114 | $this->getStub($type) |
115 | 115 | ); |
116 | 116 | $filePath = $this->checkFolder(\Config::get('repository.app_path') . "/{$folder}/{$path}/"); |
117 | - if($type == 'Entity') |
|
117 | + if ($type == 'Entity') |
|
118 | 118 | { |
119 | 119 | file_put_contents($filePath . "{$this->repoName}.php", $template); |
120 | - }else |
|
120 | + } else |
|
121 | 121 | { |
122 | 122 | file_put_contents($filePath . "{$this->repoName}{$type}.php", $template); |
123 | 123 | } |
@@ -78,8 +78,9 @@ discard block |
||
78 | 78 | $this->generate($path, $repository, 'Repository'); |
79 | 79 | |
80 | 80 | $this->repoNamespace = stripslashes($this->repoNamespace); |
81 | - if($this->repoNamespace) |
|
82 | - $this->repoNamespace = $this->repoNamespace."\\"; |
|
81 | + if($this->repoNamespace) { |
|
82 | + $this->repoNamespace = $this->repoNamespace."\\"; |
|
83 | + } |
|
83 | 84 | File::append(\Config::get('repository.route_path') . '/web.php', "\n" . 'Route::resource(\'' . strtolower(str_plural($this->repoName)) . "', '{$this->repoNamespace}{$this->repoName}Controller');"); |
84 | 85 | |
85 | 86 | } |
@@ -117,7 +118,7 @@ discard block |
||
117 | 118 | if($type == 'Entity') |
118 | 119 | { |
119 | 120 | file_put_contents($filePath . "{$this->repoName}.php", $template); |
120 | - }else |
|
121 | + } else |
|
121 | 122 | { |
122 | 123 | file_put_contents($filePath . "{$this->repoName}{$type}.php", $template); |
123 | 124 | } |
@@ -6,9 +6,9 @@ |
||
6 | 6 | * Time: 09:58 am |
7 | 7 | */ |
8 | 8 | return [ |
9 | - 'app_path' => realpath(__DIR__.'/../app/'), |
|
9 | + 'app_path' => realpath(__DIR__ . '/../app/'), |
|
10 | 10 | 'route_path' => realpath('routes/'), |
11 | - 'resources_path' => realpath(__DIR__.'/../vendor/shamaseen/repository-generator/stubs'), |
|
11 | + 'resources_path' => realpath(__DIR__ . '/../vendor/shamaseen/repository-generator/stubs'), |
|
12 | 12 | |
13 | 13 | //relative to app path |
14 | 14 | 'interface' => 'Interface', |
@@ -35,12 +35,12 @@ |
||
35 | 35 | parent::__construct($app); |
36 | 36 | |
37 | 37 | if ($this->app['config']->get('repository') === null) { |
38 | - $this->app['config']->set('repository', require __DIR__.'/config/repository.php'); |
|
38 | + $this->app['config']->set('repository', require __DIR__ . '/config/repository.php'); |
|
39 | 39 | } |
40 | - $interfaces= str_plural(Config::get('repository.interface')); |
|
41 | - $repositories= str_plural(Config::get('repository.repository')); |
|
42 | - $interface= Config::get('repository.interface'); |
|
43 | - $repository= Config::get('repository.repository'); |
|
40 | + $interfaces = str_plural(Config::get('repository.interface')); |
|
41 | + $repositories = str_plural(Config::get('repository.repository')); |
|
42 | + $interface = Config::get('repository.interface'); |
|
43 | + $repository = Config::get('repository.repository'); |
|
44 | 44 | |
45 | 45 | $contractsFolder = realpath(__DIR__ . '/../../../../app/' . $interfaces); |
46 | 46 | if ($contractsFolder) { |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | protected function failedValidation(Validator $validator) |
30 | 30 | { |
31 | 31 | |
32 | - if (strpos($this->path(),'api') !== false) { |
|
32 | + if (strpos($this->path(), 'api') !== false) { |
|
33 | 33 | $errors = (new ValidationException($validator))->errors(); |
34 | 34 | throw new HttpResponseException(response()->json(['success' => false, 'errors' => $errors, |
35 | 35 | ], JsonResponse::HTTP_UNPROCESSABLE_ENTITY)); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | parent::failedValidation($validator); |
38 | 38 | } |
39 | 39 | |
40 | - public function rules(){ |
|
41 | - \App::setLocale($this->header('Language','en')); |
|
40 | + public function rules() { |
|
41 | + \App::setLocale($this->header('Language', 'en')); |
|
42 | 42 | } |
43 | 43 | } |
@@ -344,9 +344,10 @@ |
||
344 | 344 | } |
345 | 345 | |
346 | 346 | if ($entity) { |
347 | - if($appendEntity) |
|
348 | - return response()->json( ['status' => true, 'message' => __('messages.success'), 'data' => $entity], |
|
347 | + if($appendEntity) { |
|
348 | + return response()->json( ['status' => true, 'message' => __('messages.success'), 'data' => $entity], |
|
349 | 349 | JsonResponse::HTTP_OK); |
350 | + } |
|
350 | 351 | return response()->json(null, JsonResponse::HTTP_NO_CONTENT); |
351 | 352 | } |
352 | 353 |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $this->breadcrumbs = new Collection(); |
59 | 59 | |
60 | 60 | $language = $request->header('Language', 'en'); |
61 | - if (! in_array($language, \Config::get('app.locales', []))) { |
|
61 | + if (!in_array($language, \Config::get('app.locales', []))) { |
|
62 | 62 | $language = 'en'; |
63 | 63 | } |
64 | 64 | $limit = $request->get('limit', 10); |
@@ -81,10 +81,10 @@ discard block |
||
81 | 81 | $this->interface = $interface; |
82 | 82 | $this->isAPI = $request->expectsJson(); |
83 | 83 | |
84 | - if (! $this->isAPI) { |
|
84 | + if (!$this->isAPI) { |
|
85 | 85 | $this->breadcrumbs = new Collection(); |
86 | 86 | $this->search = new Collection(); |
87 | - \View::share('pageTitle', $this->pageTitle.' | '.\Config::get('app.name')); |
|
87 | + \View::share('pageTitle', $this->pageTitle . ' | ' . \Config::get('app.name')); |
|
88 | 88 | \View::share('breadcrumbs', $this->breadcrumbs); |
89 | 89 | \View::share('menu', $this->menu); |
90 | 90 | \View::share('search', $this->search); |
@@ -102,8 +102,8 @@ discard block |
||
102 | 102 | public function index() |
103 | 103 | { |
104 | 104 | $data = $this->interface->simplePaginate($this->limit, $this->request->all()); |
105 | - if (! $this->isAPI) { |
|
106 | - \View::share('pageTitle', 'List '.$this->pageTitle.' | '.\Config::get('app.name')); |
|
105 | + if (!$this->isAPI) { |
|
106 | + \View::share('pageTitle', 'List ' . $this->pageTitle . ' | ' . \Config::get('app.name')); |
|
107 | 107 | $this->breadcrumbs->put('index', [ |
108 | 108 | 'link' => $this->routeIndex, |
109 | 109 | 'text' => $this->pageTitle, |
@@ -131,8 +131,8 @@ discard block |
||
131 | 131 | */ |
132 | 132 | public function create() |
133 | 133 | { |
134 | - if (! $this->isAPI) { |
|
135 | - \View::share('pageTitle', 'Create '.$this->pageTitle.' | '.\Config::get('app.name')); |
|
134 | + if (!$this->isAPI) { |
|
135 | + \View::share('pageTitle', 'Create ' . $this->pageTitle . ' | ' . \Config::get('app.name')); |
|
136 | 136 | $this->breadcrumbs->put('create', [ |
137 | 137 | 'link' => $this->createRoute, |
138 | 138 | 'text' => trans('common/others.create'), |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | public function store() |
153 | 153 | { |
154 | 154 | $entity = $this->interface->create($this->request->except(['_token', '_method'])); |
155 | - return $this->makeResponse($entity,true); |
|
155 | + return $this->makeResponse($entity, true); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | /** |
@@ -165,11 +165,11 @@ discard block |
||
165 | 165 | public function show($entityId) |
166 | 166 | { |
167 | 167 | $entity = $this->interface->find($entityId); |
168 | - if (! $this->isAPI) { |
|
169 | - if (! $entity) { |
|
168 | + if (!$this->isAPI) { |
|
169 | + if (!$entity) { |
|
170 | 170 | return \Redirect::to($this->routeIndex)->with('warning', __('messages.not_found')); |
171 | 171 | } |
172 | - \View::share('pageTitle', 'View '.$this->pageTitle.' | '.\Config::get('app.name')); |
|
172 | + \View::share('pageTitle', 'View ' . $this->pageTitle . ' | ' . \Config::get('app.name')); |
|
173 | 173 | $this->breadcrumbs->put('view', [ |
174 | 174 | 'link' => '', |
175 | 175 | 'text' => $entity->name ?? $entity->title ?? __('messages.view'), |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | return view($this->viewShow, $this->params) |
179 | 179 | ->with('entity', $entity); |
180 | 180 | } |
181 | - if (! $entity) { |
|
181 | + if (!$entity) { |
|
182 | 182 | return response()->json(null, JsonResponse::HTTP_NOT_FOUND); |
183 | 183 | } |
184 | 184 | |
@@ -198,8 +198,8 @@ discard block |
||
198 | 198 | public function edit($entityId) |
199 | 199 | { |
200 | 200 | $entity = $this->interface->find($entityId); |
201 | - if (! $this->isAPI) { |
|
202 | - if (! $entity) { |
|
201 | + if (!$this->isAPI) { |
|
202 | + if (!$entity) { |
|
203 | 203 | return \Redirect::to($this->routeIndex)->with('warning', __('messages.not_found')); |
204 | 204 | } |
205 | 205 | $this->breadcrumbs->put('edit', [ |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | { |
226 | 226 | $entity = $this->interface->update($entityId, $this->request->except(['_token', '_method'])); |
227 | 227 | |
228 | - return $this->makeResponse($entity,true); |
|
228 | + return $this->makeResponse($entity, true); |
|
229 | 229 | } |
230 | 230 | |
231 | 231 | /** |
@@ -279,9 +279,9 @@ discard block |
||
279 | 279 | * |
280 | 280 | * @return \Illuminate\Http\RedirectResponse |
281 | 281 | */ |
282 | - function makeResponse($entity,$appendEntity = false) |
|
282 | + function makeResponse($entity, $appendEntity = false) |
|
283 | 283 | { |
284 | - if (! $this->isAPI) { |
|
284 | + if (!$this->isAPI) { |
|
285 | 285 | if ($entity) { |
286 | 286 | return \Redirect::to($this->routeIndex)->with('message', __('messages.success')); |
287 | 287 | } |
@@ -294,8 +294,8 @@ discard block |
||
294 | 294 | } |
295 | 295 | |
296 | 296 | if ($entity) { |
297 | - if($appendEntity) |
|
298 | - return response()->json( ['status' => true, 'message' => __('messages.success'), 'data' => $entity], |
|
297 | + if ($appendEntity) |
|
298 | + return response()->json(['status' => true, 'message' => __('messages.success'), 'data' => $entity], |
|
299 | 299 | JsonResponse::HTTP_OK); |
300 | 300 | return response()->json(null, JsonResponse::HTTP_NO_CONTENT); |
301 | 301 | } |
@@ -26,16 +26,16 @@ |
||
26 | 26 | } |
27 | 27 | |
28 | 28 | $this->publishes([ |
29 | - __DIR__.'/config' => realpath('config'), |
|
30 | - ],'repository-config'); |
|
29 | + __DIR__ . '/config' => realpath('config'), |
|
30 | + ], 'repository-config'); |
|
31 | 31 | |
32 | 32 | if ($this->app['config']->get('repository') === null) { |
33 | - $this->app['config']->set('repository', require __DIR__.'/config/repository.php'); |
|
33 | + $this->app['config']->set('repository', require __DIR__ . '/config/repository.php'); |
|
34 | 34 | } |
35 | - $this->mergeConfigFrom(__DIR__.'/config/repository.php', 'repository-config'); |
|
35 | + $this->mergeConfigFrom(__DIR__ . '/config/repository.php', 'repository-config'); |
|
36 | 36 | $this->publishes([ |
37 | - realpath(__DIR__ . '/../stubs') => \Config::get('repository.resources_path',realpath(__DIR__.'/../../../../resources/')), |
|
38 | - ],'repository-stub'); |
|
37 | + realpath(__DIR__ . '/../stubs') => \Config::get('repository.resources_path', realpath(__DIR__ . '/../../../../resources/')), |
|
38 | + ], 'repository-stub'); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | */ |
79 | 79 | public function filter($criteria = []) |
80 | 80 | { |
81 | - $criteria= $this->order($criteria); |
|
81 | + $criteria = $this->order($criteria); |
|
82 | 82 | |
83 | 83 | /** @var Entity $latest */ |
84 | 84 | $latest = $this->model->with($this->with); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * |
112 | 112 | * @return array |
113 | 113 | */ |
114 | - private function order($criteria=[]){ |
|
114 | + private function order($criteria = []) { |
|
115 | 115 | |
116 | 116 | if (isset($criteria['order'])) { |
117 | 117 | $this->order = $criteria['order']; |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | { |
159 | 159 | $item = $this->model->findOrFail('id'); |
160 | 160 | |
161 | - if($item->update($attributes)) |
|
161 | + if ($item->update($attributes)) |
|
162 | 162 | { |
163 | 163 | return $item; |
164 | 164 | } |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | */ |
222 | 222 | public function find($entityId = 0, $columns = ['*']) |
223 | 223 | { |
224 | - return $this->model->with($this->with)->find($entityId,$columns); |
|
224 | + return $this->model->with($this->with)->find($entityId, $columns); |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | /** |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | */ |
233 | 233 | public function findOrFail($entityId = 0, $columns = ['*']) |
234 | 234 | { |
235 | - return $this->model->with($this->with)->findOrFail($entityId,$columns); |
|
235 | + return $this->model->with($this->with)->findOrFail($entityId, $columns); |
|
236 | 236 | } |
237 | 237 | /** |
238 | 238 | * @param array $filter |