@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | use Illuminate\Database\Eloquent\Model; |
| 4 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
| 5 | 5 | |
| 6 | -class AclGroup extends Model{ |
|
| 6 | +class AclGroup extends Model { |
|
| 7 | 7 | |
| 8 | 8 | use SoftDeletes; |
| 9 | 9 | protected $table = 'groups'; |
@@ -29,12 +29,12 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | public function users() |
| 31 | 31 | { |
| 32 | - return $this->belongsToMany('\App\Modules\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 32 | + return $this->belongsToMany('\App\Modules\Acl\AclUser', 'users_groups', 'group_id', 'user_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public function permissions() |
| 36 | 36 | { |
| 37 | - return $this->belongsToMany('\App\Modules\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 37 | + return $this->belongsToMany('\App\Modules\Acl\AclPermission', 'groups_permissions', 'group_id', 'permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | public static function boot() |
@@ -13,14 +13,14 @@ |
||
| 13 | 13 | * to preform actions like (add, edit ... etc). |
| 14 | 14 | * @var string |
| 15 | 15 | */ |
| 16 | - protected $model = 'groups'; |
|
| 16 | + protected $model = 'groups'; |
|
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * The validations rules used by the base api controller |
| 20 | 20 | * to check before add. |
| 21 | 21 | * @var array |
| 22 | 22 | */ |
| 23 | - protected $validationRules = [ |
|
| 23 | + protected $validationRules = [ |
|
| 24 | 24 | 'name' => 'required|string|max:100|unique:groups,name,{id}' |
| 25 | 25 | ]; |
| 26 | 26 | |
@@ -12,15 +12,15 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('permissions', function (Blueprint $table) { |
|
| 15 | + Schema::create('permissions', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | - $table->string('name',100); |
|
| 18 | - $table->string('model',100); |
|
| 17 | + $table->string('name', 100); |
|
| 18 | + $table->string('model', 100); |
|
| 19 | 19 | $table->softDeletes(); |
| 20 | 20 | $table->timestamps(); |
| 21 | 21 | $table->unique(array('name', 'model')); |
| 22 | 22 | }); |
| 23 | - Schema::create('groups_permissions', function (Blueprint $table) { |
|
| 23 | + Schema::create('groups_permissions', function(Blueprint $table) { |
|
| 24 | 24 | $table->increments('id'); |
| 25 | 25 | $table->integer('group_id'); |
| 26 | 26 | $table->integer('permission_id'); |
@@ -12,14 +12,14 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('groups', function (Blueprint $table) { |
|
| 15 | + Schema::create('groups', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | - $table->string('name',100)->unique(); |
|
| 17 | + $table->string('name', 100)->unique(); |
|
| 18 | 18 | $table->softDeletes(); |
| 19 | 19 | $table->timestamps(); |
| 20 | 20 | }); |
| 21 | 21 | |
| 22 | - Schema::create('users_groups', function (Blueprint $table) { |
|
| 22 | + Schema::create('users_groups', function(Blueprint $table) { |
|
| 23 | 23 | $table->increments('id'); |
| 24 | 24 | $table->integer('user_id'); |
| 25 | 25 | $table->integer('group_id'); |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | |
| 30 | 30 | public function groups() |
| 31 | 31 | { |
| 32 | - return $this->belongsToMany('\App\Modules\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 32 | + return $this->belongsToMany('\App\Modules\Acl\AclGroup', 'groups_permissions', 'permission_id', 'group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public static function boot() |
@@ -12,10 +12,10 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('reports', function (Blueprint $table) { |
|
| 15 | + Schema::create('reports', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | - $table->string('report_name',100); |
|
| 18 | - $table->string('view_name',100); |
|
| 17 | + $table->string('report_name', 100); |
|
| 18 | + $table->string('view_name', 100); |
|
| 19 | 19 | $table->softDeletes(); |
| 20 | 20 | $table->timestamps(); |
| 21 | 21 | }); |
@@ -123,6 +123,7 @@ discard block |
||
| 123 | 123 | * |
| 124 | 124 | * @param array &$route |
| 125 | 125 | * @param object $reflectionMethod] |
| 126 | + * @param \ReflectionMethod $reflectionMethod |
|
| 126 | 127 | * @return void |
| 127 | 128 | */ |
| 128 | 129 | protected function processDocBlock(&$route, $reflectionMethod) |
@@ -145,7 +146,7 @@ discard block |
||
| 145 | 146 | * Generate post body for the given route. |
| 146 | 147 | * |
| 147 | 148 | * @param array &$route |
| 148 | - * @param object $reflectionMethod |
|
| 149 | + * @param \ReflectionMethod $reflectionMethod |
|
| 149 | 150 | * @param array $validationRules |
| 150 | 151 | * @return void |
| 151 | 152 | */ |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | if ($route) |
| 46 | 46 | { |
| 47 | 47 | $actoinArray = explode('@', $route['action']); |
| 48 | - if(array_get($actoinArray, 1, false)) |
|
| 48 | + if (array_get($actoinArray, 1, false)) |
|
| 49 | 49 | { |
| 50 | 50 | $controller = $actoinArray[0]; |
| 51 | 51 | $method = $actoinArray[1]; |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | $route['response'] = $this->getResponseObject($classProperties['model'], $route['name'], $route['returnDocBlock']); |
| 65 | 65 | |
| 66 | 66 | preg_match('/api\/([^#]+)\//iU', $route['uri'], $module); |
| 67 | - $docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/' . $module[1] . '/') - 1)][] = $route; |
|
| 67 | + $docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/'.$module[1].'/') - 1)][] = $route; |
|
| 68 | 68 | |
| 69 | 69 | $this->getModels($classProperties['model'], $docData); |
| 70 | 70 | } |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | */ |
| 83 | 83 | protected function getRoutes() |
| 84 | 84 | { |
| 85 | - return collect(\Route::getRoutes())->map(function ($route) { |
|
| 85 | + return collect(\Route::getRoutes())->map(function($route) { |
|
| 86 | 86 | if (strpos($route->uri(), 'api') !== false) |
| 87 | 87 | { |
| 88 | 88 | return [ |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | ]; |
| 115 | 115 | |
| 116 | 116 | |
| 117 | - if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) |
|
| 117 | + if ( ! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) |
|
| 118 | 118 | { |
| 119 | 119 | $route['headers']['Authorization'] = 'Bearer {token}'; |
| 120 | 120 | } |
@@ -168,16 +168,16 @@ discard block |
||
| 168 | 168 | } |
| 169 | 169 | else |
| 170 | 170 | { |
| 171 | - $route['body'] = eval('return ' . str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]) . ';'); |
|
| 171 | + $route['body'] = eval('return '.str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]).';'); |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | foreach ($route['body'] as &$rule) |
| 175 | 175 | { |
| 176 | - if(strpos($rule, 'unique')) |
|
| 176 | + if (strpos($rule, 'unique')) |
|
| 177 | 177 | { |
| 178 | 178 | $rule = substr($rule, 0, strpos($rule, 'unique') + 6); |
| 179 | 179 | } |
| 180 | - elseif(strpos($rule, 'exists')) |
|
| 180 | + elseif (strpos($rule, 'exists')) |
|
| 181 | 181 | { |
| 182 | 182 | $rule = substr($rule, 0, strpos($rule, 'exists') - 1); |
| 183 | 183 | } |
@@ -250,10 +250,10 @@ discard block |
||
| 250 | 250 | $model = factory($modelClass)->make(); |
| 251 | 251 | $modelArr = $model->toArray(); |
| 252 | 252 | |
| 253 | - if ( $model->trans && ! $model->trans->count()) |
|
| 253 | + if ($model->trans && ! $model->trans->count()) |
|
| 254 | 254 | { |
| 255 | 255 | $modelArr['trans'] = [ |
| 256 | - 'en' => factory($modelClass . 'Translation')->make()->toArray() |
|
| 256 | + 'en' => factory($modelClass.'Translation')->make()->toArray() |
|
| 257 | 257 | ]; |
| 258 | 258 | } |
| 259 | 259 | |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | * Get the notification's delivery channels. |
| 29 | 29 | * |
| 30 | 30 | * @param mixed $notifiable |
| 31 | - * @return array |
|
| 31 | + * @return string[] |
|
| 32 | 32 | */ |
| 33 | 33 | public function via($notifiable) |
| 34 | 34 | { |
@@ -47,6 +47,6 @@ |
||
| 47 | 47 | ->subject('Reset passowrd') |
| 48 | 48 | ->line('Reset passowrd') |
| 49 | 49 | ->line('To reset your password click on the button below') |
| 50 | - ->action('Reset password', config('skeleton.reset_password_url') . '/' . $this->token); |
|
| 50 | + ->action('Reset password', config('skeleton.reset_password_url').'/'.$this->token); |
|
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | \ No newline at end of file |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | * Register the given device to the logged in user. |
| 22 | 22 | * |
| 23 | 23 | * @param string $data |
| 24 | - * @return void |
|
| 24 | + * @return boolean |
|
| 25 | 25 | */ |
| 26 | 26 | public function registerDevice($data) |
| 27 | 27 | { |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | $notificationBuilder = new PayloadNotificationBuilder($title); |
| 50 | 50 | $dataBuilder = new PayloadDataBuilder(); |
| 51 | 51 | |
| 52 | - $optionBuilder->setTimeToLive(60*20); |
|
| 52 | + $optionBuilder->setTimeToLive(60 * 20); |
|
| 53 | 53 | $notificationBuilder->setBody($message); |
| 54 | 54 | $dataBuilder->addData($data); |
| 55 | 55 | |