Skip to content

Commit 66b3361

Browse files
developeruzdeveloperuz
committed
PSR-2
1 parent c29823d commit 66b3361

File tree

5 files changed

+54
-48
lines changed

5 files changed

+54
-48
lines changed

‎Yii2DbRbac.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function init()
2323
parent::init();
2424
$this->registerTranslations();
2525

26-
if($this->theme){
26+
if ($this->theme) {
2727
Yii::$app->view->theme = new \yii\base\Theme($this->theme);
2828
}
2929
}

‎behaviors/AccessBehavior.php

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
use yii\filters\AccessControl;
1919
use yii\web\ForbiddenHttpException;
2020

21-
class AccessBehavior extends AttributeBehavior {
21+
class AccessBehavior extends AttributeBehavior
22+
{
2223

23-
public $rules=[];
24+
public $rules = [];
2425
public $redirect_url = false;
2526
public $login_url = false;
2627

@@ -35,7 +36,7 @@ public function events()
3536

3637
public function interception($event)
3738
{
38-
if(!isset( Yii::$app->i18n->translations['db_rbac'])){
39+
if (!isset(Yii::$app->i18n->translations['db_rbac'])) {
3940
Yii::$app->i18n->translations['db_rbac'] = [
4041
'class' => 'yii\i18n\PhpMessageSource',
4142
'sourceLanguage' => 'ru-Ru',
@@ -51,20 +52,19 @@ public function interception($event)
5152
$request = Yii::$app->getRequest();
5253
$action = $event->action;
5354

54-
if(!$this->cheсkByRule($action, $user, $request))
55-
{
55+
if (!$this->cheсkByRule($action, $user, $request)) {
5656
//И по AuthManager
57-
if(!$this->checkPermission($route)){
57+
if (!$this->checkPermission($route)) {
5858
//Если задан $login_url и пользователь не авторизован
59-
if(Yii::$app->user->isGuest && $this->login_url){
59+
if (Yii::$app->user->isGuest && $this->login_url) {
6060
Yii::$app->response->redirect($this->login_url)->send();
6161
exit();
6262
}
6363
//Если задан $redirect_url
64-
if($this->redirect_url){
64+
if ($this->redirect_url) {
6565
Yii::$app->response->redirect($this->redirect_url)->send();
6666
exit();
67-
}else {
67+
} else {
6868
throw new ForbiddenHttpException(Yii::t('db_rbac', 'Недостаточно прав'));
6969
}
7070
}
@@ -73,8 +73,7 @@ public function interception($event)
7373

7474
protected function createRule()
7575
{
76-
foreach($this->rules as $controller => $rule)
77-
{
76+
foreach ($this->rules as $controller => $rule) {
7877
foreach ($rule as $singleRule) {
7978
if (is_array($singleRule)) {
8079
$option = [
@@ -90,8 +89,9 @@ protected function createRule()
9089
protected function cheсkByRule($action, $user, $request)
9190
{
9291
foreach ($this->_rules as $rule) {
93-
if ($rule->allows($action, $user, $request))
92+
if ($rule->allows($action, $user, $request)) {
9493
return true;
94+
}
9595
}
9696
return false;
9797
}
@@ -102,16 +102,17 @@ protected function checkPermission($route)
102102

103103
$routePathTmp = explode('/', $route[0]);
104104
$routeVariant = array_shift($routePathTmp);
105-
if(Yii::$app->user->can($routeVariant, $route[1]))
105+
if (Yii::$app->user->can($routeVariant, $route[1])) {
106106
return true;
107+
}
107108

108-
foreach($routePathTmp as $routePart)
109-
{
110-
$routeVariant .= '/'.$routePart;
111-
if(Yii::$app->user->can($routeVariant, $route[1]))
109+
foreach ($routePathTmp as $routePart) {
110+
$routeVariant .= '/' . $routePart;
111+
if (Yii::$app->user->can($routeVariant, $route[1])) {
112112
return true;
113+
}
113114
}
114115

115116
return false;
116117
}
117-
}
118+
}

‎controllers/AccessController.php

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class AccessController extends Controller
2626

2727
public function behaviors()
2828
{
29-
if(!empty(Yii::$app->controller->module->params['accessRoles'])) {
29+
if (!empty(Yii::$app->controller->module->params['accessRoles'])) {
3030
return [
3131
'access' => [
3232
'class' => \yii\filters\AccessControl::className(),
@@ -168,8 +168,7 @@ public function actionUpdatePermission($name)
168168
$permission = $this->clear(Yii::$app->request->post('name'));
169169
if ($permission && $this->validate($permission, $this->pattern4Permission)
170170
) {
171-
if($permission!= $name && !$this->isUnique($permission))
172-
{
171+
if ($permission != $name && !$this->isUnique($permission)) {
173172
return $this->render('updatePermission', [
174173
'permit' => $permit,
175174
'error' => $this->error
@@ -189,14 +188,17 @@ public function actionUpdatePermission($name)
189188
'permit' => $permit,
190189
'error' => $this->error
191190
]);
192-
} else throw new BadRequestHttpException(Yii::t('db_rbac', 'Страница не найдена'));
191+
} else {
192+
throw new BadRequestHttpException(Yii::t('db_rbac', 'Страница не найдена'));
193+
}
193194
}
194195

195196
public function actionDeletePermission($name)
196197
{
197198
$permit = Yii::$app->authManager->getPermission($name);
198-
if ($permit)
199+
if ($permit) {
199200
Yii::$app->authManager->remove($permit);
201+
}
200202
return $this->redirect(Url::toRoute(['permission']));
201203
}
202204

@@ -219,11 +221,11 @@ protected function updatePermissions($allPermissions, $selectedPermissions, $rol
219221
{
220222
foreach ($allPermissions as $permit => $description) {
221223
$permission = Yii::$app->authManager->getPermission($permit);
222-
if(in_array($permit, $selectedPermissions)) {
223-
if (!Yii::$app->authManager->hasChild($role, $permission)){
224+
if (in_array($permit, $selectedPermissions)) {
225+
if (!Yii::$app->authManager->hasChild($role, $permission)) {
224226
Yii::$app->authManager->addChild($role, $permission);
225227
}
226-
} elseif(Yii::$app->authManager->hasChild($role, $permission)){
228+
} elseif (Yii::$app->authManager->hasChild($role, $permission)) {
227229
Yii::$app->authManager->removeChild($role, $permission);
228230
}
229231
}
@@ -232,9 +234,9 @@ protected function updatePermissions($allPermissions, $selectedPermissions, $rol
232234
protected function validate($field, $regex)
233235
{
234236
$validator = new RegularExpressionValidator(['pattern' => $regex]);
235-
if ($validator->validate($field, $error))
237+
if ($validator->validate($field)) {
236238
return true;
237-
else {
239+
} else {
238240
$this->error[] = Yii::t('db_rbac', 'Значение "{field}" содержит недопустимые символы', ['field' => $field]);
239241
return false;
240242
}
@@ -244,12 +246,12 @@ protected function isUnique($name)
244246
{
245247
$role = Yii::$app->authManager->getRole($name);
246248
$permission = Yii::$app->authManager->getPermission($name);
247-
if ($permission instanceof Permission){
248-
$this->error[] = Yii::t('db_rbac', 'Разрешение с таким именем уже существует') .':'. $name;
249+
if ($permission instanceof Permission) {
250+
$this->error[] = Yii::t('db_rbac', 'Разрешение с таким именем уже существует') . ':' . $name;
249251
return false;
250252
}
251253
if ($role instanceof Role) {
252-
$this->error[] = Yii::t('db_rbac', 'Роль с таким именем уже существует') .':'. $name;
254+
$this->error[] = Yii::t('db_rbac', 'Роль с таким именем уже существует') . ':' . $name;
253255
return false;
254256
}
255257
return true;

‎controllers/UserController.php

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ class UserController extends Controller
2424

2525
public function beforeAction($action)
2626
{
27-
if(empty(Yii::$app->controller->module->params['userClass'])){
28-
throw new BadRequestHttpException(Yii::t('db_rbac','Необходимо указать класс User в настройках модуля'));
27+
if (empty(Yii::$app->controller->module->params['userClass'])) {
28+
throw new BadRequestHttpException(Yii::t('db_rbac', 'Необходимо указать класс User в настройках модуля'));
2929
}
3030

3131
$user = new Yii::$app->controller->module->params['userClass']();
3232

33-
if(! $user instanceof UserRbacInterface)
34-
{
35-
throw new BadRequestHttpException(Yii::t('db_rbac', 'UserClass должен реализовывать интерфейс developeruz\db_rbac\UserRbacInterface'));
33+
if (!$user instanceof UserRbacInterface) {
34+
throw new BadRequestHttpException(Yii::t('db_rbac',
35+
'UserClass должен реализовывать интерфейс developeruz\db_rbac\UserRbacInterface'));
3636
}
3737

3838
return parent::beforeAction($action);
@@ -57,9 +57,9 @@ public function behaviors()
5757
'*' => ['get'],
5858
],
5959
]
60-
];
60+
];
6161

62-
if(!empty(Yii::$app->controller->module->params['accessRoles'])) {
62+
if (!empty(Yii::$app->controller->module->params['accessRoles'])) {
6363
$behavior['access'] = [
6464
'class' => \yii\filters\AccessControl::className(),
6565
'rules' => [
@@ -91,21 +91,23 @@ public function actionUpdate($id)
9191
{
9292
$user = $this->findUser($id);
9393
Yii::$app->authManager->revokeAll($user->getId());
94-
if(Yii::$app->request->post('roles')){
95-
foreach(Yii::$app->request->post('roles') as $role)
96-
{
94+
if (Yii::$app->request->post('roles')) {
95+
foreach (Yii::$app->request->post('roles') as $role) {
9796
$new_role = Yii::$app->authManager->getRole($role);
9897
Yii::$app->authManager->assign($new_role, $user->getId());
9998
}
10099
}
101-
return $this->redirect(Url::to(["/".Yii::$app->controller->module->id."/user/view", 'id' => $user->getId()]));
100+
return $this->redirect(Url::to([
101+
"/" . Yii::$app->controller->module->id . "/user/view",
102+
'id' => $user->getId()
103+
]));
102104
}
103105

104106
private function findUser($id)
105107
{
106108
$class = new Yii::$app->controller->module->params['userClass']();
107109
$user = $class::findIdentity($id);
108-
if(empty($user)){
110+
if (empty($user)) {
109111
throw new NotFoundHttpException(Yii::t('db_rbac', 'Пользователь не найден'));
110112
} else {
111113
return $user;

‎interfaces/UserRbacInterface.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
22
namespace developeruz\db_rbac\interfaces;
33

4-
5-
interface UserRbacInterface {
6-
4+
interface UserRbacInterface
5+
{
76
public function getId();
7+
88
public function getUserName();
9+
910
public static function findIdentity($id);
10-
}
11+
}

0 commit comments

Comments
 (0)