Skip to content

Commit 75584bd

Browse files
agungsugiartoagungsugiarto
authored
Merge pull request #53 from agungsugiarto/analysis-ornk5p
Apply fixes from StyleCI
2 parents fc727f9 + 6647c05 commit 75584bd

23 files changed

+156
-156
lines changed

‎src/Controllers/Users/PermissionController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function index()
2626
$length = $this->request->getGet('length');
2727
$search = $this->request->getGet('search[value]');
2828
$collection = new Collection();
29-
29+
3030
return $this->respond($collection->toColection(
3131
model(PermissionModel::class)->findPaginatedData($length, $start, $search),
3232
model(PermissionModel::class)->countAllResults(),

‎src/Controllers/Users/RoleController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function index()
2626
$length = $this->request->getGet('length');
2727
$search = $this->request->getGet('search[value]');
2828
$collection = new Collection();
29-
29+
3030
return $this->respond($collection->toColection(
3131
model(GroupModel::class)->findPaginatedData($length, $start, $search),
3232
model(GroupModel::class)->countAllResults(),

‎src/Controllers/Users/UserController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function index()
3636
$length = $this->request->getGet('length');
3737
$search = $this->request->getGet('search[value]');
3838
$collection = new Collection();
39-
39+
4040
return $this->respond($collection->toColection(
4141
model(UserModel::class)->findPaginatedData($length, $start, $search),
4242
model(UserModel::class)->countAllResults(),

‎src/Models/GroupModel.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function findPaginatedData(int $length, int $start, string $keyword = '')
5252

5353
return $this->builder()->limit($length, $start)->get()->getResultObject();
5454
}
55-
55+
5656
/**
5757
* FInd with count all data.
5858
*
@@ -68,7 +68,7 @@ public function countFindData(string $keyword = ''): int
6868
->orLike('description', $keyword)
6969
->groupEnd()
7070
->countAllResults()
71-
71+
7272
: $this->builder()->countAllResults();
7373
}
7474
}

‎src/Models/PermissionModel.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function findPaginatedData(int $length, int $start, string $keyword = '')
2626

2727
return $this->builder()->limit($length, $start)->get()->getResultObject();
2828
}
29-
29+
3030
/**
3131
* FInd with count all data.
3232
*
@@ -42,7 +42,7 @@ public function countFindData(string $keyword = ''): int
4242
->orLike('description', $keyword)
4343
->groupEnd()
4444
->countAllResults()
45-
45+
4646
: $this->builder()->countAllResults();
4747
}
4848
}

‎src/Models/UserModel.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function findPaginatedData(int $length, int $start, string $keyword = '')
2626

2727
return $this->builder()->where('deleted_at', null)->limit($length, $start)->get()->getResultObject();
2828
}
29-
29+
3030
/**
3131
* FInd with count all data.
3232
*
@@ -43,7 +43,7 @@ public function countFindData(string $keyword = ''): int
4343
->groupEnd()
4444
->where('deleted_at', null)
4545
->countAllResults()
46-
46+
4747
: $this->builder()->where('deleted_at', null)->countAllResults();
4848
}
4949
}

‎src/Views/Authentication/forgot.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<?= $this->extend('agungsugiarto\boilerplate\Views\Authentication\index') ?>
2-
<?= $this->section('content') ?>
1+
<?= $this->extend('agungsugiarto\boilerplate\Views\Authentication\index') ?>
2+
<?= $this->section('content') ?>
33
<!-- /.login-logo -->
44
<div class="card">
55
<div class="card-body login-card-body">
66
<p class="login-box-msg"><?=lang('Auth.forgotPassword')?></p>
77
<p class="login-box-msg"><?=lang('Auth.enterEmailForInstructions')?></p>
8-
<?= $this->include('agungsugiarto\boilerplate\Views\Authentication\message_block') ?>
8+
<?= $this->include('agungsugiarto\boilerplate\Views\Authentication\message_block') ?>
99
<form action="<?= route_to('forgot') ?>" method="post">
10-
<?= csrf_field() ?>
10+
<?= csrf_field() ?>
1111
<div class="input-group mb-3">
1212
<input type="email" name="email"
1313
class="form-control <?= session('errors.email') ? 'is-invalid' : '' ?>"
@@ -18,7 +18,7 @@ class="form-control <?= session('errors.email') ? 'is-invalid' : '' ?>"
1818
</div>
1919
</div>
2020
<div class="invalid-feedback">
21-
<?= session('errors.email') ?>
21+
<?= session('errors.email') ?>
2222
</div>
2323
</div>
2424
<div class="row">
@@ -32,11 +32,11 @@ class="form-control <?= session('errors.email') ? 'is-invalid' : '' ?>"
3232
<p class="mt-3 mb-1">
3333
<a href="<?= route_to('login') ?>"><?=lang('Auth.signIn')?></a>
3434
</p>
35-
<?php if ($config->allowRegistration) : ?>
35+
<?php if ($config->allowRegistration) { ?>
3636
<p class="mb-0">
3737
<a href="<?= route_to('register') ?>" class="text-center"><?=lang('Auth.needAnAccount')?></a>
3838
</p>
39-
<?php endif ?>
39+
<?php } ?>
4040
</div>
4141
<!-- /.login-card-body -->
4242
</div>

‎src/Views/Authentication/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<img src="<?= base_url(config('Boilerplate')->theme['sidebar']['brand']['logo']['icon']) ?>" class="brand-image img-circle elevation-<?= config('Boilerplate')->theme['sidebar']['brand']['logo']['shadow'] ?>">
2727
<b><?= config('Boilerplate')->appName ?></b>
2828
</div>
29-
<?= $this->renderSection('content') ?>
29+
<?= $this->renderSection('content') ?>
3030
</div>
3131
<!-- /.login-box -->
3232

‎src/Views/Authentication/login.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<?= $this->include('agungsugiarto\boilerplate\Views\Authentication\message_block') ?>
88
<form action="<?= route_to('login') ?>" method="post">
99
<?= csrf_field() ?>
10-
<?php if ($config->validFields === ['email']) : ?>
10+
<?php if ($config->validFields === ['email']) { ?>
1111
<div class="input-group mb-3">
1212
<input type="email" name="login"
1313
class="form-control <?= session('error.login') || session('errors.login') ? 'is-invalid' : '' ?>"
@@ -21,7 +21,7 @@ class="form-control <?= session('error.login') || session('errors.login') ? 'is-
2121
<?= session('errors.login') ?>
2222
</div>
2323
</div>
24-
<?php else : ?>
24+
<?php } else { ?>
2525
<div class="input-group mb-3">
2626
<input type="text" name="login"
2727
class="form-control <?= session('error.login') || session('errors.login') ? 'is-invalid' : '' ?>"
@@ -35,7 +35,7 @@ class="form-control <?= session('error.login') || session('errors.login') ? 'is-
3535
<?= session('errors.login') ?>
3636
</div>
3737
</div>
38-
<?php endif ?>
38+
<?php } ?>
3939
<div class="input-group mb-3">
4040
<input type="password" name="password"
4141
class="form-control <?= session('errors.password') ? 'is-invalid' : '' ?>"
@@ -50,7 +50,7 @@ class="form-control <?= session('errors.password') ? 'is-invalid' : '' ?>"
5050
</div>
5151
</div>
5252
<div class="row">
53-
<?php if ($config->allowRemembering) : ?>
53+
<?php if ($config->allowRemembering) { ?>
5454
<div class="col-8">
5555
<div class="icheck-primary">
5656
<input type="checkbox" name="remember" id="remember" <?= old('remember') ? 'checked' : '' ?> >
@@ -59,7 +59,7 @@ class="form-control <?= session('errors.password') ? 'is-invalid' : '' ?>"
5959
</label>
6060
</div>
6161
</div>
62-
<?php endif ?>
62+
<?php } ?>
6363
<!-- /.col -->
6464
<div class="col-4">
6565
<button type="submit" class="btn btn-primary btn-block"><?= lang('Auth.signIn') ?></button>
@@ -71,11 +71,11 @@ class="form-control <?= session('errors.password') ? 'is-invalid' : '' ?>"
7171
<p class="mb-1">
7272
<a href="<?= route_to('forgot') ?>"><?=lang('Auth.forgotYourPassword')?></a>
7373
</p>
74-
<?php if ($config->allowRegistration) : ?>
74+
<?php if ($config->allowRegistration) { ?>
7575
<p class="mb-0">
7676
<a href="<?= route_to('register') ?>" class="text-center"><?=lang('Auth.needAnAccount')?></a>
7777
</p>
78-
<?php endif ?>
78+
<?php } ?>
7979
</div>
8080
<!-- /.login-card-body -->
8181
</div>

‎src/Views/Authentication/message_block.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<?php if (session()->has('message')) : ?>
1+
<?php if (session()->has('message')) { ?>
22
<div class="alert alert-success">
33
<?= session('message') ?>
44
</div>
5-
<?php endif ?>
5+
<?php } ?>
66

7-
<?php if (session()->has('error')) : ?>
7+
<?php if (session()->has('error')) { ?>
88
<div class="alert alert-danger">
99
<?= session('error') ?>
1010
</div>
11-
<?php endif ?>
11+
<?php } ?>
1212

13-
<?php if (session()->has('errors')) : ?>
13+
<?php if (session()->has('errors')) { ?>
1414
<ul class="alert alert-danger">
15-
<?php foreach (session('errors') as $error) : ?>
15+
<?php foreach (session('errors') as $error) { ?>
1616
<li><?= $error ?></li>
17-
<?php endforeach ?>
17+
<?php } ?>
1818
</ul>
19-
<?php endif ?>
19+
<?php } ?>

‎src/Views/Menu/index.php

+14-14
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,18 @@
4949
<div class="col-sm-10">
5050
<select class="form-control parent" name="parent_id" style="width: 100%;">
5151
<option selcted value="0">ROOT</option>
52-
<?php foreach ($menus as $menu) : ?>
52+
<?php foreach ($menus as $menu) { ?>
5353
<option <?= ($menu->id == old('parent_id')) ? 'selected' : '' ?> value="<?= $menu->id ?>"><?= $menu->title ?></option>
54-
<?php endforeach ?>
54+
<?php } ?>
5555
</select>
5656
<span class="help-block">
5757
<i class="fas fa-exclamation-triangle text-danger"></i>&nbsp;<?= lang('menu.warning_parent') ?>
5858
</span>
59-
<?php if (session('error.parent_id')) : ?>
59+
<?php if (session('error.parent_id')) { ?>
6060
<div class="invalid-feedback">
6161
<h6><?= session('error.parent_id') ?></h6>
6262
</div>
63-
<?php endif ?>
63+
<?php } ?>
6464
</div>
6565
</div>
6666
<div class="form-group row">
@@ -80,11 +80,11 @@
8080
<span class="input-group-text"><i class="fab fa-font-awesome-flag"></i></span>
8181
</div>
8282
<input type="text" name="icon" class="icon-picker form-control <?= session('error.icon') ? 'is-invalid' : '' ?>" value="<?= old('icon') ?>" placeholder="<?= lang('menu.place_icon') ?>" autocomplete="off">
83-
<?php if (session('error.icon')) : ?>
83+
<?php if (session('error.icon')) { ?>
8484
<div class="invalid-feedback">
8585
<h6><?= session('error.icon') ?></h6>
8686
</div>
87-
<?php endif ?>
87+
<?php } ?>
8888
</div>
8989
<span class="help-block">
9090
<i class="fa fa-info-circle text-info"></i>&nbsp;<?= lang('menu.info_icon') ?> <a href="http://fontawesome.io/icons" target="_blank">http://fontawesome.io/icons</a>
@@ -99,11 +99,11 @@
9999
<span class="input-group-text"><i class="fas fa-pencil-alt"></i></span>
100100
</div>
101101
<input type="text" name="title" class="form-control <?= session('error.title') ? 'is-invalid' : '' ?>" value="<?= old('title') ?>" placeholder="<?= lang('menu.place_title') ?>" autocomplete="off">
102-
<?php if (session('error.title')) : ?>
102+
<?php if (session('error.title')) { ?>
103103
<div class="invalid-feedback">
104104
<h6><?= session('error.title') ?></h6>
105105
</div>
106-
<?php endif ?>
106+
<?php } ?>
107107
</div>
108108
</div>
109109
</div>
@@ -115,25 +115,25 @@
115115
<span class="input-group-text"><i class="fas fa-link"></i></span>
116116
</div>
117117
<input type="text" name="route" class="form-control <?= session('error.route') ? 'is-invalid' : '' ?>" value="<?= old('route') ?>" placeholder="<?= lang('menu.place_route') ?>" autocomplete="off">
118-
<?php if (session('error.route')) : ?>
118+
<?php if (session('error.route')) { ?>
119119
<div class="invalid-feedback">
120120
<h6><?= session('error.route') ?></h6>
121121
</div>
122-
<?php endif ?>
122+
<?php } ?>
123123
</div>
124124
</div>
125125
</div>
126126
<div class="form-group row">
127127
<label class="col-sm-2 col-form-label"><?= lang('menu.role') ?></label>
128128
<div class="col-sm-10">
129129
<select multiple="multiple" class="form-control parent" name="groups_menu[]" data-placeholder="<?= lang('menu.select_role') ?>" style="width: 100%;">
130-
<?php foreach ($roles as $role) : ?>
130+
<?php foreach ($roles as $role) { ?>
131131
<option <?= in_array($role->id, old('groups_menu', [])) ? 'selected' : '' ?> value="<?= $role->id ?>"><?= $role->name ?></option>
132-
<?php endforeach ?>
132+
<?php } ?>
133133
</select>
134-
<?php if (session('error.groups_menu')) : ?>
134+
<?php if (session('error.groups_menu')) { ?>
135135
<h6 class="text-danger"><?= session('error.groups_menu') ?></h6>
136-
<?php endif ?>
136+
<?php } ?>
137137
</div>
138138
</div>
139139
<div class="form-group row">

‎src/Views/Permission/index.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!-- Include -->
2-
<?= $this->include('agungsugiarto\boilerplate\Views\load\datatables') ?>
2+
<?= $this->include('agungsugiarto\boilerplate\Views\load\datatables') ?>
33
<!-- Extend from layout index -->
4-
<?= $this->extend('agungsugiarto\boilerplate\Views\layout\index') ?>
4+
<?= $this->extend('agungsugiarto\boilerplate\Views\layout\index') ?>
55

66
<!-- Section content -->
7-
<?= $this->section('content') ?>
8-
<?= $this->include('agungsugiarto\boilerplate\Views\Permission\create') ?>
7+
<?= $this->section('content') ?>
8+
<?= $this->include('agungsugiarto\boilerplate\Views\Permission\create') ?>
99
<div class="row">
1010
<div class="col-12">
1111
<div class="card">
@@ -14,7 +14,7 @@
1414
<div class="btn-group">
1515
<button type="button" class="btn btn-sm btn-block btn-primary" id="create-book"
1616
data-toggle="modal" data-target="#modal-create-permission"><i class="fa fa-plus"></i>
17-
<?= lang('permission.add') ?>
17+
<?= lang('permission.add') ?>
1818
</button>
1919
</div>
2020
</div>
@@ -38,10 +38,10 @@
3838
</div>
3939
</div>
4040
</div>
41-
<?= $this->endSection() ?>
41+
<?= $this->endSection() ?>
4242

4343
<!-- Push section js -->
44-
<?= $this->section('js') ?>
44+
<?= $this->section('js') ?>
4545
<script>
4646
$.get('https://www.google.com/');
4747

@@ -208,4 +208,4 @@ function slugify(text) {
208208
}
209209
</script>
210210

211-
<?= $this->endSection() ?>
211+
<?= $this->endSection() ?>

‎src/Views/Role/create.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
<span class="input-group-text"><i class="fas fa-pencil-alt"></i></span>
2929
</div>
3030
<input type="text" name="name" class="form-control <?= session('error.name') ? 'is-invalid' : '' ?>" value="<?= old('name') ?>" placeholder="<?= lang('role.place_name') ?>">
31-
<?php if (session('error.name')) : ?>
31+
<?php if (session('error.name')) { ?>
3232
<div class="invalid-feedback">
3333
<h6><?= session('error.name') ?></h6>
3434
</div>
35-
<?php endif ?>
35+
<?php } ?>
3636
</div>
3737
</div>
3838
</div>
@@ -44,11 +44,11 @@
4444
<span class="input-group-text"><i class="far fa-comment-alt"></i></span>
4545
</div>
4646
<textarea type="text" name="description" class="form-control <?= session('error.description') ? 'is-invalid' : '' ?>" value="<?= old('description') ?>" placeholder="<?= lang('role.place_description') ?>"><?= old('description') ?></textarea>
47-
<?php if (session('error.description')) : ?>
47+
<?php if (session('error.description')) { ?>
4848
<div class="invalid-feedback">
4949
<h6><?= session('error.description') ?></h6>
5050
</div>
51-
<?php endif ?>
51+
<?php } ?>
5252
</div>
5353
</div>
5454
</div>
@@ -57,13 +57,13 @@
5757
<div class="col-sm-10">
5858
<div class="textarea-group">
5959
<select multiple="multiple" name="permission[]" title="permission[]">
60-
<?php foreach ($data as $permission) : ?>
60+
<?php foreach ($data as $permission) { ?>
6161
<option <?= in_array($permission['id'], old('permission', [])) ? 'selected' : '' ?> value="<?= $permission['id'] ?>"><?= $permission['name'] ?></option>
62-
<?php endforeach ?>
62+
<?php } ?>
6363
</select>
64-
<?php if (session('error.permission')) : ?>
64+
<?php if (session('error.permission')) { ?>
6565
<h6 class="text-danger"><?= session('error.permission') ?></h6>
66-
<?php endif ?>
66+
<?php } ?>
6767
</div>
6868
</div>
6969
</div>

0 commit comments

Comments
 (0)