@@ -8,12 +8,16 @@ discard block |
||
| 8 | 8 | /** |
| 9 | 9 | * Forbidden to create new instances |
| 10 | 10 | */ |
| 11 | - private function __construct() {} |
|
| 11 | + private function __construct() |
|
| 12 | + { |
|
| 13 | +} |
|
| 12 | 14 | |
| 13 | 15 | /** |
| 14 | 16 | * Forbidden to cloned instances |
| 15 | 17 | */ |
| 16 | - private function __clone() {} |
|
| 18 | + private function __clone() |
|
| 19 | + { |
|
| 20 | +} |
|
| 17 | 21 | |
| 18 | 22 | /** |
| 19 | 23 | * @var User |
@@ -49,7 +53,7 @@ discard block |
||
| 49 | 53 | */ |
| 50 | 54 | public static function getUserId() |
| 51 | 55 | { |
| 52 | - if(self::checkUser()){ |
|
| 56 | + if(self::checkUser()) { |
|
| 53 | 57 | return self::$user->id; |
| 54 | 58 | } else { |
| 55 | 59 | return null; |
@@ -50,10 +50,12 @@ |
||
| 50 | 50 | ob_start(); |
| 51 | 51 | $this->protectedIncludeScope($this->templatePath . $template, $data); |
| 52 | 52 | $output = ob_get_clean(); |
| 53 | - } catch(\Throwable $e) { // PHP 7+ |
|
| 53 | + } catch(\Throwable $e) { |
|
| 54 | +// PHP 7+ |
|
| 54 | 55 | ob_end_clean(); |
| 55 | 56 | throw $e; |
| 56 | - } catch(\Exception $e) { // PHP < 7 |
|
| 57 | + } catch(\Exception $e) { |
|
| 58 | +// PHP < 7 |
|
| 57 | 59 | ob_end_clean(); |
| 58 | 60 | throw $e; |
| 59 | 61 | } |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | public function creating(BaseModel $model) |
| 16 | 16 | { |
| 17 | 17 | $user = Auth::getUser(); |
| 18 | - if(!is_null($user)){ |
|
| 18 | + if(!is_null($user)) { |
|
| 19 | 19 | $model->created_by = $user->id; |
| 20 | 20 | } |
| 21 | 21 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | public function updating(BaseModel $model) |
| 31 | 31 | { |
| 32 | 32 | $user = Auth::getUser(); |
| 33 | - if(!is_null($user)){ |
|
| 33 | + if(!is_null($user)) { |
|
| 34 | 34 | $model->updated_by = $user->id; |
| 35 | 35 | } |
| 36 | 36 | } |
@@ -8,8 +8,7 @@ |
||
| 8 | 8 | */ |
| 9 | 9 | public function up() |
| 10 | 10 | { |
| 11 | - Capsule::schema()->create('rights', function($table) |
|
| 12 | - { |
|
| 11 | + Capsule::schema()->create('rights', function($table) { |
|
| 13 | 12 | $table->increments('id'); |
| 14 | 13 | $table->string('name')->unique(); |
| 15 | 14 | $table->string('description'); |
@@ -8,8 +8,7 @@ |
||
| 8 | 8 | */ |
| 9 | 9 | public function up() |
| 10 | 10 | { |
| 11 | - Capsule::schema()->create('users', function($table) |
|
| 12 | - { |
|
| 11 | + Capsule::schema()->create('users', function($table) { |
|
| 13 | 12 | $table->increments('id'); |
| 14 | 13 | $table->string('email')->unique(); |
| 15 | 14 | $table->string('full_name'); |
@@ -8,8 +8,7 @@ |
||
| 8 | 8 | */ |
| 9 | 9 | public function up() |
| 10 | 10 | { |
| 11 | - Capsule::schema()->create('logs', function($table) |
|
| 12 | - { |
|
| 11 | + Capsule::schema()->create('logs', function($table) { |
|
| 13 | 12 | $table->increments('id'); |
| 14 | 13 | $table->string('action'); |
| 15 | 14 | $table->morphs('entity'); |
@@ -8,8 +8,7 @@ |
||
| 8 | 8 | */ |
| 9 | 9 | public function up() |
| 10 | 10 | { |
| 11 | - Capsule::schema()->create('roles_to_rights', function($table) |
|
| 12 | - { |
|
| 11 | + Capsule::schema()->create('roles_to_rights', function($table) { |
|
| 13 | 12 | $table->integer('role_id')->unsigned(); |
| 14 | 13 | $table->integer('right_id')->unsigned(); |
| 15 | 14 | $table->primary(['role_id', 'right_id']); |