@@ -63,11 +63,11 @@ |
||
| 63 | 63 | |
| 64 | 64 | $app = new Application(); |
| 65 | 65 | $app->setConfigPath(CONFIG_PATH) |
| 66 | - ->setRootPath(ROOT_PATH) |
|
| 67 | - ->setAppPath(APP_PATH) |
|
| 68 | - ->setVendorPath(VENDOR_PATH) |
|
| 69 | - ->setStoragePath(STORAGE_PATH) |
|
| 70 | - ->setEnvironment(ENVIRONMENT); |
|
| 66 | + ->setRootPath(ROOT_PATH) |
|
| 67 | + ->setAppPath(APP_PATH) |
|
| 68 | + ->setVendorPath(VENDOR_PATH) |
|
| 69 | + ->setStoragePath(STORAGE_PATH) |
|
| 70 | + ->setEnvironment(ENVIRONMENT); |
|
| 71 | 71 | |
| 72 | 72 | /** @var HttpKernel $kernel */ |
| 73 | 73 | $kernel = $app->make(HttpKernel::class); |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | public function up(): void |
| 11 | 11 | {
|
| 12 | 12 | //Action when migrate up |
| 13 | - $this->create('roles', function (CreateTable $table) {
|
|
| 13 | + $this->create('roles', function(CreateTable $table) {
|
|
| 14 | 14 | $table->integer('id')
|
| 15 | 15 | ->autoincrement() |
| 16 | 16 | ->primary(); |
@@ -9,18 +9,18 @@ discard block |
||
| 9 | 9 | {
|
| 10 | 10 | public function up(): void |
| 11 | 11 | {
|
| 12 | - //Action when migrate up |
|
| 12 | + //Action when migrate up |
|
| 13 | 13 | $this->create('roles', function (CreateTable $table) {
|
| 14 | 14 | $table->integer('id')
|
| 15 | - ->autoincrement() |
|
| 16 | - ->primary(); |
|
| 15 | + ->autoincrement() |
|
| 16 | + ->primary(); |
|
| 17 | 17 | |
| 18 | 18 | $table->string('name')
|
| 19 | - ->description('The role name')
|
|
| 20 | - ->notNull(); |
|
| 19 | + ->description('The role name')
|
|
| 20 | + ->notNull(); |
|
| 21 | 21 | |
| 22 | 22 | $table->string('description')
|
| 23 | - ->description('The role description');
|
|
| 23 | + ->description('The role description');
|
|
| 24 | 24 | |
| 25 | 25 | $table->timestamps(); |
| 26 | 26 | |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | public function down(): void |
| 32 | 32 | {
|
| 33 | - //Action when migrate down |
|
| 33 | + //Action when migrate down |
|
| 34 | 34 | $this->drop('roles');
|
| 35 | 35 | } |
| 36 | 36 | } |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | public function up(): void |
| 11 | 11 | {
|
| 12 | 12 | //Action when migrate up |
| 13 | - $this->create('users', function (CreateTable $table) {
|
|
| 13 | + $this->create('users', function(CreateTable $table) {
|
|
| 14 | 14 | $table->integer('id')
|
| 15 | 15 | ->autoincrement() |
| 16 | 16 | ->primary(); |
@@ -9,41 +9,41 @@ discard block |
||
| 9 | 9 | {
|
| 10 | 10 | public function up(): void |
| 11 | 11 | {
|
| 12 | - //Action when migrate up |
|
| 12 | + //Action when migrate up |
|
| 13 | 13 | $this->create('users', function (CreateTable $table) {
|
| 14 | 14 | $table->integer('id')
|
| 15 | - ->autoincrement() |
|
| 16 | - ->primary(); |
|
| 15 | + ->autoincrement() |
|
| 16 | + ->primary(); |
|
| 17 | 17 | |
| 18 | 18 | $table->string('username')
|
| 19 | - ->description('The username')
|
|
| 20 | - ->unique() |
|
| 21 | - ->notNull(); |
|
| 19 | + ->description('The username')
|
|
| 20 | + ->unique() |
|
| 21 | + ->notNull(); |
|
| 22 | 22 | |
| 23 | 23 | $table->string('email')
|
| 24 | - ->description('The user email')
|
|
| 25 | - ->unique() |
|
| 26 | - ->notNull(); |
|
| 24 | + ->description('The user email')
|
|
| 25 | + ->unique() |
|
| 26 | + ->notNull(); |
|
| 27 | 27 | |
| 28 | 28 | $table->string('password')
|
| 29 | - ->description('The user password')
|
|
| 30 | - ->notNull(); |
|
| 29 | + ->description('The user password')
|
|
| 30 | + ->notNull(); |
|
| 31 | 31 | |
| 32 | 32 | $table->enum('status', ['A', 'D'])
|
| 33 | - ->description('The user status, A=Active, D=Deactive/Locked')
|
|
| 34 | - ->defaultValue('D')
|
|
| 35 | - ->notNull(); |
|
| 33 | + ->description('The user status, A=Active, D=Deactive/Locked')
|
|
| 34 | + ->defaultValue('D')
|
|
| 35 | + ->notNull(); |
|
| 36 | 36 | |
| 37 | 37 | $table->string('lastname')
|
| 38 | - ->description('The user lastname')
|
|
| 39 | - ->notNull(); |
|
| 38 | + ->description('The user lastname')
|
|
| 39 | + ->notNull(); |
|
| 40 | 40 | |
| 41 | 41 | $table->string('firstname')
|
| 42 | - ->description('The user firstname')
|
|
| 43 | - ->notNull(); |
|
| 42 | + ->description('The user firstname')
|
|
| 43 | + ->notNull(); |
|
| 44 | 44 | |
| 45 | 45 | $table->string('role')
|
| 46 | - ->description('The user role or job');
|
|
| 46 | + ->description('The user role or job');
|
|
| 47 | 47 | |
| 48 | 48 | $table->timestamps(); |
| 49 | 49 | |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | public function down(): void |
| 55 | 55 | {
|
| 56 | - //Action when migrate down |
|
| 56 | + //Action when migrate down |
|
| 57 | 57 | $this->drop('users');
|
| 58 | 58 | } |
| 59 | 59 | } |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | {
|
| 10 | 10 | public function up(): void |
| 11 | 11 | {
|
| 12 | - //Action when migrate up |
|
| 12 | + //Action when migrate up |
|
| 13 | 13 | $this->create('permissions_roles', function (CreateTable $table) {
|
| 14 | 14 | $table->integer('permission_id');
|
| 15 | 15 | $table->integer('role_id');
|
@@ -17,12 +17,12 @@ discard block |
||
| 17 | 17 | $table->primary(['permission_id', 'role_id']); |
| 18 | 18 | |
| 19 | 19 | $table->foreign('permission_id')
|
| 20 | - ->references('permissions', 'id')
|
|
| 21 | - ->onDelete('CASCADE');
|
|
| 20 | + ->references('permissions', 'id')
|
|
| 21 | + ->onDelete('CASCADE');
|
|
| 22 | 22 | |
| 23 | 23 | $table->foreign('role_id')
|
| 24 | - ->references('roles', 'id')
|
|
| 25 | - ->onDelete('CASCADE');
|
|
| 24 | + ->references('roles', 'id')
|
|
| 25 | + ->onDelete('CASCADE');
|
|
| 26 | 26 | |
| 27 | 27 | $table->engine('INNODB');
|
| 28 | 28 | }); |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | public function down(): void |
| 32 | 32 | {
|
| 33 | - //Action when migrate down |
|
| 33 | + //Action when migrate down |
|
| 34 | 34 | $this->drop('permissions_roles');
|
| 35 | 35 | } |
| 36 | 36 | } |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | public function up(): void |
| 11 | 11 | {
|
| 12 | 12 | //Action when migrate up |
| 13 | - $this->create('permissions_roles', function (CreateTable $table) {
|
|
| 13 | + $this->create('permissions_roles', function(CreateTable $table) {
|
|
| 14 | 14 | $table->integer('permission_id');
|
| 15 | 15 | $table->integer('role_id');
|
| 16 | 16 | |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | public function up(): void |
| 11 | 11 | {
|
| 12 | 12 | //Action when migrate up |
| 13 | - $this->create('permissions', function (CreateTable $table) {
|
|
| 13 | + $this->create('permissions', function(CreateTable $table) {
|
|
| 14 | 14 | $table->integer('id')
|
| 15 | 15 | ->autoincrement() |
| 16 | 16 | ->primary(); |
@@ -9,29 +9,29 @@ discard block |
||
| 9 | 9 | {
|
| 10 | 10 | public function up(): void |
| 11 | 11 | {
|
| 12 | - //Action when migrate up |
|
| 12 | + //Action when migrate up |
|
| 13 | 13 | $this->create('permissions', function (CreateTable $table) {
|
| 14 | 14 | $table->integer('id')
|
| 15 | - ->autoincrement() |
|
| 16 | - ->primary(); |
|
| 15 | + ->autoincrement() |
|
| 16 | + ->primary(); |
|
| 17 | 17 | |
| 18 | 18 | $table->string('code')
|
| 19 | - ->description('The permission code')
|
|
| 20 | - ->unique() |
|
| 21 | - ->notNull(); |
|
| 19 | + ->description('The permission code')
|
|
| 20 | + ->unique() |
|
| 21 | + ->notNull(); |
|
| 22 | 22 | |
| 23 | 23 | $table->string('description')
|
| 24 | - ->description('The permission description')
|
|
| 25 | - ->notNull(); |
|
| 24 | + ->description('The permission description')
|
|
| 25 | + ->notNull(); |
|
| 26 | 26 | |
| 27 | 27 | $table->integer('parent_id')
|
| 28 | - ->description('The parent permission');
|
|
| 28 | + ->description('The parent permission');
|
|
| 29 | 29 | |
| 30 | 30 | $table->timestamps(); |
| 31 | 31 | |
| 32 | 32 | $table->foreign('parent_id')
|
| 33 | - ->references('permissions', 'id')
|
|
| 34 | - ->onDelete('CASCADE');
|
|
| 33 | + ->references('permissions', 'id')
|
|
| 34 | + ->onDelete('CASCADE');
|
|
| 35 | 35 | |
| 36 | 36 | $table->engine('INNODB');
|
| 37 | 37 | }); |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | public function down(): void |
| 41 | 41 | {
|
| 42 | - //Action when migrate down |
|
| 42 | + //Action when migrate down |
|
| 43 | 43 | $this->drop('permissions');
|
| 44 | 44 | } |
| 45 | 45 | } |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | {
|
| 10 | 10 | public function up(): void |
| 11 | 11 | {
|
| 12 | - //Action when migrate up |
|
| 12 | + //Action when migrate up |
|
| 13 | 13 | $this->create('roles_users', function (CreateTable $table) {
|
| 14 | 14 | $table->integer('user_id');
|
| 15 | 15 | $table->integer('role_id');
|
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | public function down(): void |
| 32 | 32 | {
|
| 33 | - //Action when migrate down |
|
| 33 | + //Action when migrate down |
|
| 34 | 34 | $this->drop('roles_users');
|
| 35 | 35 | } |
| 36 | 36 | } |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | public function up(): void |
| 11 | 11 | {
|
| 12 | 12 | //Action when migrate up |
| 13 | - $this->create('roles_users', function (CreateTable $table) {
|
|
| 13 | + $this->create('roles_users', function(CreateTable $table) {
|
|
| 14 | 14 | $table->integer('user_id');
|
| 15 | 15 | $table->integer('role_id');
|
| 16 | 16 | |
@@ -14,32 +14,32 @@ discard block |
||
| 14 | 14 | class AuthParam extends BaseParam |
| 15 | 15 | { |
| 16 | 16 | /** |
| 17 | - * The username field |
|
| 18 | - * @var string |
|
| 19 | - */ |
|
| 17 | + * The username field |
|
| 18 | + * @var string |
|
| 19 | + */ |
|
| 20 | 20 | protected string $username; |
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | - * The password field |
|
| 24 | - * @var string |
|
| 25 | - */ |
|
| 23 | + * The password field |
|
| 24 | + * @var string |
|
| 25 | + */ |
|
| 26 | 26 | protected string $password; |
| 27 | 27 | |
| 28 | 28 | |
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | - * Return the username value |
|
| 32 | - * @return string |
|
| 33 | - */ |
|
| 31 | + * Return the username value |
|
| 32 | + * @return string |
|
| 33 | + */ |
|
| 34 | 34 | public function getUsername(): string |
| 35 | 35 | { |
| 36 | 36 | return $this->username; |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * Return the password value |
|
| 41 | - * @return string |
|
| 42 | - */ |
|
| 39 | + /** |
|
| 40 | + * Return the password value |
|
| 41 | + * @return string |
|
| 42 | + */ |
|
| 43 | 43 | public function getPassword(): string |
| 44 | 44 | { |
| 45 | 45 | return $this->password; |
@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | - * Set the username value |
|
| 51 | - * @param string $username |
|
| 52 | - * @return $this |
|
| 53 | - */ |
|
| 50 | + * Set the username value |
|
| 51 | + * @param string $username |
|
| 52 | + * @return $this |
|
| 53 | + */ |
|
| 54 | 54 | public function setUsername(string $username): self |
| 55 | 55 | { |
| 56 | 56 | $this->username = $username; |
@@ -58,11 +58,11 @@ discard block |
||
| 58 | 58 | return $this; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * Set the password value |
|
| 63 | - * @param string $password |
|
| 64 | - * @return $this |
|
| 65 | - */ |
|
| 61 | + /** |
|
| 62 | + * Set the password value |
|
| 63 | + * @param string $password |
|
| 64 | + * @return $this |
|
| 65 | + */ |
|
| 66 | 66 | public function setPassword(string $password): self |
| 67 | 67 | { |
| 68 | 68 | $this->password = $password; |
@@ -15,28 +15,28 @@ discard block |
||
| 15 | 15 | class RoleParam extends BaseParam |
| 16 | 16 | { |
| 17 | 17 | /** |
| 18 | - * The name field |
|
| 19 | - * @var string |
|
| 20 | - */ |
|
| 18 | + * The name field |
|
| 19 | + * @var string |
|
| 20 | + */ |
|
| 21 | 21 | protected string $name; |
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | - * The description field |
|
| 25 | - * @var string|null |
|
| 26 | - */ |
|
| 24 | + * The description field |
|
| 25 | + * @var string|null |
|
| 26 | + */ |
|
| 27 | 27 | protected ?string $description = null; |
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | - * The permissions field |
|
| 31 | - * @var array<int> |
|
| 32 | - */ |
|
| 30 | + * The permissions field |
|
| 31 | + * @var array<int> |
|
| 32 | + */ |
|
| 33 | 33 | protected array $permissions = []; |
| 34 | 34 | |
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | - * @param TEntity $entity |
|
| 38 | - * @return $this |
|
| 39 | - */ |
|
| 37 | + * @param TEntity $entity |
|
| 38 | + * @return $this |
|
| 39 | + */ |
|
| 40 | 40 | public function fromEntity(Entity $entity): self |
| 41 | 41 | { |
| 42 | 42 | $this->name = $entity->name; |
@@ -46,27 +46,27 @@ discard block |
||
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | - * Return the name value |
|
| 50 | - * @return string |
|
| 51 | - */ |
|
| 49 | + * Return the name value |
|
| 50 | + * @return string |
|
| 51 | + */ |
|
| 52 | 52 | public function getName(): string |
| 53 | 53 | { |
| 54 | 54 | return $this->name; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - /** |
|
| 58 | - * Return the description value |
|
| 59 | - * @return string|null |
|
| 60 | - */ |
|
| 57 | + /** |
|
| 58 | + * Return the description value |
|
| 59 | + * @return string|null |
|
| 60 | + */ |
|
| 61 | 61 | public function getDescription(): ?string |
| 62 | 62 | { |
| 63 | 63 | return $this->description; |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | - /** |
|
| 67 | - * Return the permissions value |
|
| 68 | - * @return array<int> |
|
| 69 | - */ |
|
| 66 | + /** |
|
| 67 | + * Return the permissions value |
|
| 68 | + * @return array<int> |
|
| 69 | + */ |
|
| 70 | 70 | public function getPermissions(): array |
| 71 | 71 | { |
| 72 | 72 | return $this->permissions; |
@@ -74,10 +74,10 @@ discard block |
||
| 74 | 74 | |
| 75 | 75 | |
| 76 | 76 | /** |
| 77 | - * Set the name value |
|
| 78 | - * @param string $name |
|
| 79 | - * @return $this |
|
| 80 | - */ |
|
| 77 | + * Set the name value |
|
| 78 | + * @param string $name |
|
| 79 | + * @return $this |
|
| 80 | + */ |
|
| 81 | 81 | public function setName(string $name): self |
| 82 | 82 | { |
| 83 | 83 | $this->name = $name; |
@@ -85,11 +85,11 @@ discard block |
||
| 85 | 85 | return $this; |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - /** |
|
| 89 | - * Set the description value |
|
| 90 | - * @param string|null $description |
|
| 91 | - * @return $this |
|
| 92 | - */ |
|
| 88 | + /** |
|
| 89 | + * Set the description value |
|
| 90 | + * @param string|null $description |
|
| 91 | + * @return $this |
|
| 92 | + */ |
|
| 93 | 93 | public function setDescription(?string $description): self |
| 94 | 94 | { |
| 95 | 95 | $this->description = $description; |
@@ -97,11 +97,11 @@ discard block |
||
| 97 | 97 | return $this; |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - /** |
|
| 101 | - * Set the permissions value |
|
| 102 | - * @param array<int> $permissions |
|
| 103 | - * @return $this |
|
| 104 | - */ |
|
| 100 | + /** |
|
| 101 | + * Set the permissions value |
|
| 102 | + * @param array<int> $permissions |
|
| 103 | + * @return $this |
|
| 104 | + */ |
|
| 105 | 105 | public function setPermissions(array $permissions): self |
| 106 | 106 | { |
| 107 | 107 | $this->permissions = $permissions; |
@@ -18,8 +18,8 @@ discard block |
||
| 18 | 18 | class UserServiceProvider extends ServiceProvider |
| 19 | 19 | { |
| 20 | 20 | /** |
| 21 | - * {@inheritdoc} |
|
| 22 | - */ |
|
| 21 | + * {@inheritdoc} |
|
| 22 | + */ |
|
| 23 | 23 | public function register(): void |
| 24 | 24 | { |
| 25 | 25 | // User |
@@ -35,8 +35,8 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | - * {@inheritdoc} |
|
| 39 | - */ |
|
| 38 | + * {@inheritdoc} |
|
| 39 | + */ |
|
| 40 | 40 | public function addRoutes(Router $router): void |
| 41 | 41 | { |
| 42 | 42 | $router->group('/user', function (Router $router) { |
@@ -43,12 +43,12 @@ |
||
| 43 | 43 | */ |
| 44 | 44 | public function addRoutes(Router $router): void |
| 45 | 45 | { |
| 46 | - $router->group('/user', function (Router $router) { |
|
| 46 | + $router->group('/user', function(Router $router) { |
|
| 47 | 47 | $router->add('/login', AuthAction::class, ['GET', 'POST'], 'user_login'); |
| 48 | 48 | $router->get('/logout', LogoutAction::class, 'user_logout'); |
| 49 | 49 | $router->resource('', UserAction::class, 'user'); |
| 50 | 50 | |
| 51 | - $router->group('/profile', function (Router $router) { |
|
| 51 | + $router->group('/profile', function(Router $router) { |
|
| 52 | 52 | $router->get('', sprintf('%s@detail', UserProfileAction::class), 'user_profile'); |
| 53 | 53 | $router->add( |
| 54 | 54 | '/update', |