yii2mod / yii2-rbac

models/RouteModel.php

Spacing +15 added lines, -15 removed lines

@@ -64,7 +64,7 @@ 
     public function addNew(array $routes): bool
     {
         foreach ($routes as $route) {
-            $this->manager->add($this->manager->createPermission('/' . trim($route, ' /')));
+            $this->manager->add($this->manager->createPermission('/'.trim($route, ' /')));
         }
 
         $this->invalidate();
@@ -82,7 +82,7 @@ 
     public function remove(array $routes): bool
     {
         foreach ($routes as $route) {
-            $item = $this->manager->createPermission('/' . trim($route, '/'));
+            $item = $this->manager->createPermission('/'.trim($route, '/'));
             $this->manager->remove($item);
         }
         $this->invalidate();
@@ -164,7 +164,7 @@ 
     protected function getRouteRecursive(Module $module, &$result)
     {
         if (!in_array($module->id, $this->excludeModules)) {
-            $token = "Get Route of '" . get_class($module) . "' with id '" . $module->uniqueId . "'";
+            $token = "Get Route of '".get_class($module)."' with id '".$module->uniqueId."'";
             Yii::beginProfile($token, __METHOD__);
 
             try {
@@ -178,9 +178,9 @@ 
                     $this->getControllerActions($type, $id, $module, $result);
                 }
 
-                $namespace = trim($module->controllerNamespace, '\\') . '\\';
+                $namespace = trim($module->controllerNamespace, '\\').'\\';
                 $this->getControllerFiles($module, $namespace, '', $result);
-                $all = '/' . ltrim($module->uniqueId . '/*', '/');
+                $all = '/'.ltrim($module->uniqueId.'/*', '/');
                 $result[$all] = $all;
             } catch (\Exception $exc) {
                 Yii::error($exc->getMessage(), __METHOD__);
@@ -200,7 +200,7 @@ 
      */
     protected function getControllerFiles(Module $module, string $namespace, string $prefix, &$result)
     {
-        $path = Yii::getAlias('@' . str_replace('\\', '/', $namespace), false);
+        $path = Yii::getAlias('@'.str_replace('\\', '/', $namespace), false);
         $token = "Get controllers from '$path'";
         Yii::beginProfile($token, __METHOD__);
 
@@ -213,15 +213,15 @@ 
                 if ($file == '.' || $file == '..') {
                     continue;
                 }
-                if (is_dir($path . '/' . $file) && preg_match('%^[a-z0-9_/]+$%i', $file . '/')) {
-                    $this->getControllerFiles($module, $namespace . $file . '\\', $prefix . $file . '/', $result);
+                if (is_dir($path.'/'.$file) && preg_match('%^[a-z0-9_/]+$%i', $file.'/')) {
+                    $this->getControllerFiles($module, $namespace.$file.'\\', $prefix.$file.'/', $result);
                 } elseif (strcmp(substr($file, -14), 'Controller.php') === 0) {
                     $baseName = substr(basename($file), 0, -14);
                     $name = strtolower(preg_replace('/(?<![A-Z])[A-Z]/', ' \0', $baseName));
                     $id = ltrim(str_replace(' ', '-', $name), '-');
-                    $className = $namespace . $baseName . 'Controller';
+                    $className = $namespace.$baseName.'Controller';
                     if (strpos($className, '-') === false && class_exists($className) && is_subclass_of($className, 'yii\base\Controller')) {
-                        $this->getControllerActions($className, $prefix . $id, $module, $result);
+                        $this->getControllerActions($className, $prefix.$id, $module, $result);
                     }
                 }
             }
@@ -242,7 +242,7 @@ 
      */
     protected function getControllerActions($type, $id, Module $module, &$result)
     {
-        $token = 'Create controller with config=' . VarDumper::dumpAsString($type) . " and id='$id'";
+        $token = 'Create controller with config='.VarDumper::dumpAsString($type)." and id='$id'";
         Yii::beginProfile($token, __METHOD__);
 
         try {
@@ -266,13 +266,13 @@ 
      */
     protected function getActionRoutes(Controller $controller, &$result)
     {
-        $token = "Get actions of controller '" . $controller->uniqueId . "'";
+        $token = "Get actions of controller '".$controller->uniqueId."'";
         Yii::beginProfile($token, __METHOD__);
 
         try {
-            $prefix = '/' . $controller->uniqueId . '/';
+            $prefix = '/'.$controller->uniqueId.'/';
             foreach ($controller->actions() as $id => $value) {
-                $result[$prefix . $id] = $prefix . $id;
+                $result[$prefix.$id] = $prefix.$id;
             }
             $class = new \ReflectionClass($controller);
 
@@ -280,7 +280,7 @@ 
                 $name = $method->getName();
                 if ($method->isPublic() && !$method->isStatic() && strpos($name, 'action') === 0 && $name !== 'actions') {
                     $name = strtolower(preg_replace('/(?<![A-Z])[A-Z]/', ' \0', substr($name, 6)));
-                    $id = $prefix . ltrim(str_replace(' ', '-', $name), '-');
+                    $id = $prefix.ltrim(str_replace(' ', '-', $name), '-');
                     $result[$id] = $id;
                 }
             }

tests/bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -6,10 +6,10 @@
 define('YII_ENABLE_ERROR_HANDLER', false);
 define('YII_DEBUG', true);
 
-$_SERVER['SCRIPT_NAME'] = '/' . __DIR__;
+$_SERVER['SCRIPT_NAME'] = '/'.__DIR__;
 $_SERVER['SCRIPT_FILENAME'] = __FILE__;
 
-require_once(__DIR__ . '/../vendor/autoload.php');
-require_once(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require_once(__DIR__.'/../vendor/autoload.php');
+require_once(__DIR__.'/../vendor/yiisoft/yii2/Yii.php');
 
 Yii::setAlias('@yii2mod/rbac', dirname(__DIR__));

base/ItemController.php

Doc Comments +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
 	/**
 	 * Lists of all auth items
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public function actionIndex()
 	{
@@ -85,7 +85,7 @@ 
 	 *
 	 * @param string $id
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public function actionView(string $id)
 	{
@@ -144,7 +144,7 @@ 
 	 *
 	 * @param string $id
 	 *
-	 * @return mixed
+	 * @return Response
 	 */
 	public function actionDelete(string $id)
 	{

Indentation +228 added lines, -228 removed lines

@@ -18,232 +18,232 @@
  */
 class ItemController extends Controller
 {
-	/**
-	 * @var string search class name for auth items search
-	 */
-	public $searchClass = [
-		'class' => AuthItemSearch::class,
-	];
-
-	/**
-	 * @var int Type of Auth Item
-	 */
-	protected $type;
-
-	/**
-	 * @var array labels use in view
-	 */
-	protected $labels;
-
-	/**
-	 * @inheritdoc
-	 */
-	public function behaviors(): array
-	{
-		return [
-			'verbs' => [
-				'class' => VerbFilter::class,
-				'actions' => [
-					'index' => ['get'],
-					'view' => ['get'],
-					'create' => ['get', 'post'],
-					'update' => ['get', 'post'],
-					'delete' => ['post'],
-					'assign' => ['post'],
-					'remove' => ['post'],
-				],
-			],
-			'contentNegotiator' => [
-				'class' => 'yii\filters\ContentNegotiator',
-				'only' => ['assign', 'remove'],
-				'formats' => [
-					'application/json' => Response::FORMAT_JSON,
-				],
-			],
-		];
-	}
-
-	/**
-	 * Lists of all auth items
-	 *
-	 * @return mixed
-	 */
-	public function actionIndex()
-	{
-		$searchModel = Yii::createObject($this->searchClass);
-		$searchModel->type = $this->type;
-		$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
-
-		return $this->render('index', [
-			'dataProvider' => $dataProvider,
-			'searchModel' => $searchModel,
-		]);
-	}
-
-	/**
-	 * Displays a single AuthItem model.
-	 *
-	 * @param string $id
-	 *
-	 * @return mixed
-	 */
-	public function actionView(string $id)
-	{
-		$model = $this->findModel($id);
-
-		return $this->render('view', ['model' => $model]);
-	}
-
-	/**
-	 * Creates a new AuthItem model.
-	 *
-	 * If creation is successful, the browser will be redirected to the 'view' page.
-	 *
-	 * @return mixed
-	 */
-	public function actionCreate()
-	{
-		$model = new AuthItemModel();
-		$model->type = $this->type;
-
-		if ($model->load(Yii::$app->request->post()) && $model->save()) {
-			Yii::$app->session->setFlash('success', Yii::t('yii2mod.rbac', 'Item has been saved.'));
-
-			return $this->redirect(['view', 'id' => $model->name]);
-		}
-
-		return $this->render('create', ['model' => $model]);
-	}
-
-	/**
-	 * Updates an existing AuthItem model.
-	 *
-	 * If update is successful, the browser will be redirected to the 'view' page.
-	 *
-	 * @param string $id
-	 *
-	 * @return mixed
-	 */
-	public function actionUpdate(string $id)
-	{
-		$model = $this->findModel($id);
-
-		if ($model->load(Yii::$app->request->post()) && $model->save()) {
-			Yii::$app->session->setFlash('success', Yii::t('yii2mod.rbac', 'Item has been saved.'));
-
-			return $this->redirect(['view', 'id' => $model->name]);
-		}
-
-		return $this->render('update', ['model' => $model]);
-	}
-
-	/**
-	 * Deletes an existing AuthItem model.
-	 *
-	 * If deletion is successful, the browser will be redirected to the 'index' page.
-	 *
-	 * @param string $id
-	 *
-	 * @return mixed
-	 */
-	public function actionDelete(string $id)
-	{
-		$model = $this->findModel($id);
-		Yii::$app->getAuthManager()->remove($model->item);
-		Yii::$app->session->setFlash('success', Yii::t('yii2mod.rbac', 'Item has been removed.'));
-
-		return $this->redirect(['index']);
-	}
-
-	/**
-	 * Assign items
-	 *
-	 * @param string $id
-	 *
-	 * @return array
-	 */
-	public function actionAssign(string $id)
-	{
-		$items = Yii::$app->getRequest()->post('items', []);
-		$model = $this->findModel($id);
-		$model->addChildren($items);
-
-		return array_merge($model->getItems());
-	}
-
-	/**
-	 * Remove items
-	 *
-	 * @param string $id
-	 *
-	 * @return array
-	 */
-	public function actionRemove(string $id): array
-	{
-		$items = Yii::$app->getRequest()->post('items', []);
-		$model = $this->findModel($id);
-		$model->removeChildren($items);
-
-		return array_merge($model->getItems());
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getViewPath(): string
-	{
-		return $this->module->getViewPath() . DIRECTORY_SEPARATOR . 'item';
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getType(): int
-	{
-		return $this->type;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getLabels(): array
-	{
-		return $this->labels;
-	}
-
-	/**
-	 * Finds the AuthItem model based on its primary key value.
-	 *
-	 * If the model is not found, a 404 HTTP exception will be thrown.
-	 *
-	 * @param string $id
-	 *
-	 * @return AuthItemModel the loaded model
-	 *
-	 * @throws NotFoundHttpException if the model cannot be found
-	 */
-	protected function findModel(string $id): AuthItemModel
-	{
-		$auth = Yii::$app->getAuthManager();
-		$item = $this->type === Item::TYPE_ROLE ? $auth->getRole($id) : $auth->getPermission($id);
-
-		if (empty($item)) {
-			throw new NotFoundHttpException(Yii::t('yii2mod.rbac', 'The requested page does not exist.'));
-		}
-
-		return new AuthItemModel($item);
-	}
-
-	public function beforeAction($action)
-	{
-		if (!parent::beforeAction($action)) {
-			return false;
-		}
-
-		if (!\app\controllers\UsersController::test('admin')) {
-			throw new \yii\web\ForbiddenHttpException('You are not allowed to access this page.');
-		}
-
-		return true;
-	}
+    /**
+     * @var string search class name for auth items search
+     */
+    public $searchClass = [
+        'class' => AuthItemSearch::class,
+    ];
+
+    /**
+     * @var int Type of Auth Item
+     */
+    protected $type;
+
+    /**
+     * @var array labels use in view
+     */
+    protected $labels;
+
+    /**
+     * @inheritdoc
+     */
+    public function behaviors(): array
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::class,
+                'actions' => [
+                    'index' => ['get'],
+                    'view' => ['get'],
+                    'create' => ['get', 'post'],
+                    'update' => ['get', 'post'],
+                    'delete' => ['post'],
+                    'assign' => ['post'],
+                    'remove' => ['post'],
+                ],
+            ],
+            'contentNegotiator' => [
+                'class' => 'yii\filters\ContentNegotiator',
+                'only' => ['assign', 'remove'],
+                'formats' => [
+                    'application/json' => Response::FORMAT_JSON,
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists of all auth items
+     *
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = Yii::createObject($this->searchClass);
+        $searchModel->type = $this->type;
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'dataProvider' => $dataProvider,
+            'searchModel' => $searchModel,
+        ]);
+    }
+
+    /**
+     * Displays a single AuthItem model.
+     *
+     * @param string $id
+     *
+     * @return mixed
+     */
+    public function actionView(string $id)
+    {
+        $model = $this->findModel($id);
+
+        return $this->render('view', ['model' => $model]);
+    }
+
+    /**
+     * Creates a new AuthItem model.
+     *
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     *
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new AuthItemModel();
+        $model->type = $this->type;
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            Yii::$app->session->setFlash('success', Yii::t('yii2mod.rbac', 'Item has been saved.'));
+
+            return $this->redirect(['view', 'id' => $model->name]);
+        }
+
+        return $this->render('create', ['model' => $model]);
+    }
+
+    /**
+     * Updates an existing AuthItem model.
+     *
+     * If update is successful, the browser will be redirected to the 'view' page.
+     *
+     * @param string $id
+     *
+     * @return mixed
+     */
+    public function actionUpdate(string $id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            Yii::$app->session->setFlash('success', Yii::t('yii2mod.rbac', 'Item has been saved.'));
+
+            return $this->redirect(['view', 'id' => $model->name]);
+        }
+
+        return $this->render('update', ['model' => $model]);
+    }
+
+    /**
+     * Deletes an existing AuthItem model.
+     *
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     *
+     * @param string $id
+     *
+     * @return mixed
+     */
+    public function actionDelete(string $id)
+    {
+        $model = $this->findModel($id);
+        Yii::$app->getAuthManager()->remove($model->item);
+        Yii::$app->session->setFlash('success', Yii::t('yii2mod.rbac', 'Item has been removed.'));
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Assign items
+     *
+     * @param string $id
+     *
+     * @return array
+     */
+    public function actionAssign(string $id)
+    {
+        $items = Yii::$app->getRequest()->post('items', []);
+        $model = $this->findModel($id);
+        $model->addChildren($items);
+
+        return array_merge($model->getItems());
+    }
+
+    /**
+     * Remove items
+     *
+     * @param string $id
+     *
+     * @return array
+     */
+    public function actionRemove(string $id): array
+    {
+        $items = Yii::$app->getRequest()->post('items', []);
+        $model = $this->findModel($id);
+        $model->removeChildren($items);
+
+        return array_merge($model->getItems());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getViewPath(): string
+    {
+        return $this->module->getViewPath() . DIRECTORY_SEPARATOR . 'item';
+    }
+
+    /**
+     * @return int
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return array
+     */
+    public function getLabels(): array
+    {
+        return $this->labels;
+    }
+
+    /**
+     * Finds the AuthItem model based on its primary key value.
+     *
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     *
+     * @param string $id
+     *
+     * @return AuthItemModel the loaded model
+     *
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel(string $id): AuthItemModel
+    {
+        $auth = Yii::$app->getAuthManager();
+        $item = $this->type === Item::TYPE_ROLE ? $auth->getRole($id) : $auth->getPermission($id);
+
+        if (empty($item)) {
+            throw new NotFoundHttpException(Yii::t('yii2mod.rbac', 'The requested page does not exist.'));
+        }
+
+        return new AuthItemModel($item);
+    }
+
+    public function beforeAction($action)
+    {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
+        if (!\app\controllers\UsersController::test('admin')) {
+            throw new \yii\web\ForbiddenHttpException('You are not allowed to access this page.');
+        }
+
+        return true;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -192,7 +192,7 @@
 	 */
 	public function getViewPath(): string
 	{
-		return $this->module->getViewPath() . DIRECTORY_SEPARATOR . 'item';
+		return $this->module->getViewPath().DIRECTORY_SEPARATOR.'item';
 	}
 
 	/**

controllers/AssignmentController.php

Doc Comments +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
 	 *
 	 * @param $id
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public function actionView($id)
 	{

Indentation +176 added lines, -176 removed lines

@@ -16,180 +16,180 @@
  */
 class AssignmentController extends Controller
 {
-	/**
-	 * @var \yii\web\IdentityInterface the class name of the [[identity]] object
-	 */
-	public $userIdentityClass;
-
-	/**
-	 * @var string search class name for assignments search
-	 */
-	public $searchClass = [
-		'class' => AssignmentSearch::class,
-	];
-
-	/**
-	 * @var string id column name
-	 */
-	public $idField = 'id';
-
-	/**
-	 * @var string username column name
-	 */
-	public $usernameField = 'username';
-
-	/**
-	 * @var array assignments GridView columns
-	 */
-	public $gridViewColumns = [];
-
-	/**
-	 * @inheritdoc
-	 */
-	public function init()
-	{
-		parent::init();
-
-		if ($this->userIdentityClass === null) {
-			$this->userIdentityClass = Yii::$app->user->identityClass;
-		}
-
-		if (empty($this->gridViewColumns)) {
-			$this->gridViewColumns = [
-				$this->idField,
-				$this->usernameField,
-			];
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function behaviors(): array
-	{
-		return [
-			'verbs' => [
-				'class' => 'yii\filters\VerbFilter',
-				'actions' => [
-					'index' => ['get'],
-					'view' => ['get'],
-					'assign' => ['post'],
-					'remove' => ['post'],
-				],
-			],
-			'contentNegotiator' => [
-				'class' => 'yii\filters\ContentNegotiator',
-				'only' => ['assign', 'remove'],
-				'formats' => [
-					'application/json' => Response::FORMAT_JSON,
-				],
-			],
-		];
-	}
-
-	/**
-	 * List of all assignments
-	 *
-	 * @return string
-	 */
-	public function actionIndex()
-	{
-		/* @var AssignmentSearch */
-		$searchModel = Yii::createObject($this->searchClass);
-
-		if ($searchModel instanceof AssignmentSearch) {
-			$dataProvider = $searchModel->search(Yii::$app->request->queryParams, $this->userIdentityClass, $this->idField, $this->usernameField);
-		} else {
-			$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
-		}
-
-		return $this->render('index', [
-			'dataProvider' => $dataProvider,
-			'searchModel' => $searchModel,
-			'gridViewColumns' => $this->gridViewColumns,
-		]);
-	}
-
-	/**
-	 * Displays a single Assignment model.
-	 *
-	 * @param $id
-	 *
-	 * @return mixed
-	 */
-	public function actionView($id)
-	{
-		$model = $this->findModel($id);
-
-		return $this->render('view', [
-			'model' => $model,
-			'usernameField' => $this->usernameField,
-		]);
-	}
-
-	/**
-	 * Assign items
-	 *
-	 * @param $id
-	 *
-	 * @return array
-	 */
-	public function actionAssign($id)
-	{
-		$items = Yii::$app->getRequest()->post('items', []);
-		$assignmentModel = $this->findModel($id);
-		$assignmentModel->assign($items);
-
-		return $assignmentModel->getItems();
-	}
-
-	/**
-	 * Remove items
-	 *
-	 * @param $id
-	 *
-	 * @return array
-	 */
-	public function actionRemove($id)
-	{
-		$items = Yii::$app->getRequest()->post('items', []);
-		$assignmentModel = $this->findModel($id);
-		$assignmentModel->revoke($items);
-
-		return $assignmentModel->getItems();
-	}
-
-	/**
-	 * Finds the Assignment model based on its primary key value.
-	 * If the model is not found, a 404 HTTP exception will be thrown.
-	 *
-	 * @param $id
-	 *
-	 * @return AssignmentModel the loaded model
-	 *
-	 * @throws NotFoundHttpException if the model cannot be found
-	 */
-	protected function findModel($id)
-	{
-		$class = $this->userIdentityClass;
-
-		if (($user = $class::findIdentity($id)) !== null) {
-			return new AssignmentModel($user);
-		}
-
-		throw new NotFoundHttpException(Yii::t('yii2mod.rbac', 'The requested page does not exist.'));
-	}
-
-	public function beforeAction($action)
-	{
-		if (!parent::beforeAction($action)) {
-			return false;
-		}
-
-		if (!\app\controllers\UsersController::test('admin')) {
-			throw new \yii\web\ForbiddenHttpException('You are not allowed to access this page.');
-		}
-
-		return true;
-	}
+    /**
+     * @var \yii\web\IdentityInterface the class name of the [[identity]] object
+     */
+    public $userIdentityClass;
+
+    /**
+     * @var string search class name for assignments search
+     */
+    public $searchClass = [
+        'class' => AssignmentSearch::class,
+    ];
+
+    /**
+     * @var string id column name
+     */
+    public $idField = 'id';
+
+    /**
+     * @var string username column name
+     */
+    public $usernameField = 'username';
+
+    /**
+     * @var array assignments GridView columns
+     */
+    public $gridViewColumns = [];
+
+    /**
+     * @inheritdoc
+     */
+    public function init()
+    {
+        parent::init();
+
+        if ($this->userIdentityClass === null) {
+            $this->userIdentityClass = Yii::$app->user->identityClass;
+        }
+
+        if (empty($this->gridViewColumns)) {
+            $this->gridViewColumns = [
+                $this->idField,
+                $this->usernameField,
+            ];
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function behaviors(): array
+    {
+        return [
+            'verbs' => [
+                'class' => 'yii\filters\VerbFilter',
+                'actions' => [
+                    'index' => ['get'],
+                    'view' => ['get'],
+                    'assign' => ['post'],
+                    'remove' => ['post'],
+                ],
+            ],
+            'contentNegotiator' => [
+                'class' => 'yii\filters\ContentNegotiator',
+                'only' => ['assign', 'remove'],
+                'formats' => [
+                    'application/json' => Response::FORMAT_JSON,
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * List of all assignments
+     *
+     * @return string
+     */
+    public function actionIndex()
+    {
+        /* @var AssignmentSearch */
+        $searchModel = Yii::createObject($this->searchClass);
+
+        if ($searchModel instanceof AssignmentSearch) {
+            $dataProvider = $searchModel->search(Yii::$app->request->queryParams, $this->userIdentityClass, $this->idField, $this->usernameField);
+        } else {
+            $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+        }
+
+        return $this->render('index', [
+            'dataProvider' => $dataProvider,
+            'searchModel' => $searchModel,
+            'gridViewColumns' => $this->gridViewColumns,
+        ]);
+    }
+
+    /**
+     * Displays a single Assignment model.
+     *
+     * @param $id
+     *
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        $model = $this->findModel($id);
+
+        return $this->render('view', [
+            'model' => $model,
+            'usernameField' => $this->usernameField,
+        ]);
+    }
+
+    /**
+     * Assign items
+     *
+     * @param $id
+     *
+     * @return array
+     */
+    public function actionAssign($id)
+    {
+        $items = Yii::$app->getRequest()->post('items', []);
+        $assignmentModel = $this->findModel($id);
+        $assignmentModel->assign($items);
+
+        return $assignmentModel->getItems();
+    }
+
+    /**
+     * Remove items
+     *
+     * @param $id
+     *
+     * @return array
+     */
+    public function actionRemove($id)
+    {
+        $items = Yii::$app->getRequest()->post('items', []);
+        $assignmentModel = $this->findModel($id);
+        $assignmentModel->revoke($items);
+
+        return $assignmentModel->getItems();
+    }
+
+    /**
+     * Finds the Assignment model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     *
+     * @param $id
+     *
+     * @return AssignmentModel the loaded model
+     *
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        $class = $this->userIdentityClass;
+
+        if (($user = $class::findIdentity($id)) !== null) {
+            return new AssignmentModel($user);
+        }
+
+        throw new NotFoundHttpException(Yii::t('yii2mod.rbac', 'The requested page does not exist.'));
+    }
+
+    public function beforeAction($action)
+    {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
+        if (!\app\controllers\UsersController::test('admin')) {
+            throw new \yii\web\ForbiddenHttpException('You are not allowed to access this page.');
+        }
+
+        return true;
+    }
 }

controllers/RuleController.php

Doc Comments +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
 	/**
 	 * List of all rules
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public function actionIndex()
 	{
@@ -65,7 +65,7 @@ 
 	 *
 	 * @param string $id
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public function actionView(string $id)
 	{
@@ -123,7 +123,7 @@ 
 	 *
 	 * @param string $id
 	 *
-	 * @return mixed
+	 * @return \yii\web\Response
 	 */
 	public function actionDelete(string $id)
 	{

Indentation +152 added lines, -152 removed lines

@@ -16,156 +16,156 @@
  */
 class RuleController extends Controller
 {
-	/**
-	 * @var string search class name for rules search
-	 */
-	public $searchClass = [
-		'class' => BizRuleSearch::class,
-	];
-
-	/**
-	 * Returns a list of behaviors that this component should behave as.
-	 *
-	 * @return array
-	 */
-	public function behaviors(): array
-	{
-		return [
-			'verbs' => [
-				'class' => VerbFilter::class,
-				'actions' => [
-					'index' => ['get'],
-					'view' => ['get'],
-					'create' => ['get', 'post'],
-					'update' => ['get', 'post'],
-					'delete' => ['post'],
-				],
-			],
-		];
-	}
-
-	/**
-	 * List of all rules
-	 *
-	 * @return mixed
-	 */
-	public function actionIndex()
-	{
-		$searchModel = Yii::createObject($this->searchClass);
-		$dataProvider = $searchModel->search(Yii::$app->request->getQueryParams());
-
-		return $this->render('index', [
-			'dataProvider' => $dataProvider,
-			'searchModel' => $searchModel,
-		]);
-	}
-
-	/**
-	 * Displays a single Rule item.
-	 *
-	 * @param string $id
-	 *
-	 * @return mixed
-	 */
-	public function actionView(string $id)
-	{
-		$model = $this->findModel($id);
-
-		return $this->render('view', ['model' => $model]);
-	}
-
-	/**
-	 * Creates a new Rule item.
-	 *
-	 * If creation is successful, the browser will be redirected to the 'view' page.
-	 *
-	 * @return mixed
-	 */
-	public function actionCreate()
-	{
-		$model = new BizRuleModel();
-
-		if ($model->load(Yii::$app->request->post()) && $model->save()) {
-			Yii::$app->session->setFlash('success', Yii::t('yii2mod.rbac', 'Rule has been saved.'));
-
-			return $this->redirect(['view', 'id' => $model->name]);
-		}
-
-		return $this->render('create', ['model' => $model]);
-	}
-
-	/**
-	 * Updates an existing Rule item.
-	 *
-	 * If update is successful, the browser will be redirected to the 'view' page.
-	 *
-	 * @param string $id
-	 *
-	 * @return mixed
-	 */
-	public function actionUpdate(string $id)
-	{
-		$model = $this->findModel($id);
-
-		if ($model->load(Yii::$app->request->post()) && $model->save()) {
-			Yii::$app->session->setFlash('success', Yii::t('yii2mod.rbac', 'Rule has been saved.'));
-
-			return $this->redirect(['view', 'id' => $model->name]);
-		}
-
-		return $this->render('update', ['model' => $model]);
-	}
-
-	/**
-	 * Deletes an existing Rule item.
-	 *
-	 * If deletion is successful, the browser will be redirected to the 'index' page.
-	 *
-	 * @param string $id
-	 *
-	 * @return mixed
-	 */
-	public function actionDelete(string $id)
-	{
-		$model = $this->findModel($id);
-		Yii::$app->authManager->remove($model->item);
-		Yii::$app->session->setFlash('success', Yii::t('yii2mod.rbac', 'Rule has been deleted.'));
-
-		return $this->redirect(['index']);
-	}
-
-	/**
-	 * Finds the BizRuleModel based on its primary key value.
-	 *
-	 * If the model is not found, a 404 HTTP exception will be thrown.
-	 *
-	 * @param string $id
-	 *
-	 * @return BizRuleModel the loaded model
-	 *
-	 * @throws \yii\web\NotFoundHttpException
-	 */
-	protected function findModel(string $id)
-	{
-		$item = Yii::$app->authManager->getRule($id);
-
-		if (!empty($item)) {
-			return new BizRuleModel($item);
-		}
-
-		throw new NotFoundHttpException(Yii::t('yii2mod.rbac', 'The requested page does not exist.'));
-	}
-
-	public function beforeAction($action)
-	{
-		if (!parent::beforeAction($action)) {
-			return false;
-		}
-
-		if (!\app\controllers\UsersController::test('admin')) {
-			throw new \yii\web\ForbiddenHttpException('You are not allowed to access this page.');
-		}
-
-		return true;
-	}
+    /**
+     * @var string search class name for rules search
+     */
+    public $searchClass = [
+        'class' => BizRuleSearch::class,
+    ];
+
+    /**
+     * Returns a list of behaviors that this component should behave as.
+     *
+     * @return array
+     */
+    public function behaviors(): array
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::class,
+                'actions' => [
+                    'index' => ['get'],
+                    'view' => ['get'],
+                    'create' => ['get', 'post'],
+                    'update' => ['get', 'post'],
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * List of all rules
+     *
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = Yii::createObject($this->searchClass);
+        $dataProvider = $searchModel->search(Yii::$app->request->getQueryParams());
+
+        return $this->render('index', [
+            'dataProvider' => $dataProvider,
+            'searchModel' => $searchModel,
+        ]);
+    }
+
+    /**
+     * Displays a single Rule item.
+     *
+     * @param string $id
+     *
+     * @return mixed
+     */
+    public function actionView(string $id)
+    {
+        $model = $this->findModel($id);
+
+        return $this->render('view', ['model' => $model]);
+    }
+
+    /**
+     * Creates a new Rule item.
+     *
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     *
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new BizRuleModel();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            Yii::$app->session->setFlash('success', Yii::t('yii2mod.rbac', 'Rule has been saved.'));
+
+            return $this->redirect(['view', 'id' => $model->name]);
+        }
+
+        return $this->render('create', ['model' => $model]);
+    }
+
+    /**
+     * Updates an existing Rule item.
+     *
+     * If update is successful, the browser will be redirected to the 'view' page.
+     *
+     * @param string $id
+     *
+     * @return mixed
+     */
+    public function actionUpdate(string $id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            Yii::$app->session->setFlash('success', Yii::t('yii2mod.rbac', 'Rule has been saved.'));
+
+            return $this->redirect(['view', 'id' => $model->name]);
+        }
+
+        return $this->render('update', ['model' => $model]);
+    }
+
+    /**
+     * Deletes an existing Rule item.
+     *
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     *
+     * @param string $id
+     *
+     * @return mixed
+     */
+    public function actionDelete(string $id)
+    {
+        $model = $this->findModel($id);
+        Yii::$app->authManager->remove($model->item);
+        Yii::$app->session->setFlash('success', Yii::t('yii2mod.rbac', 'Rule has been deleted.'));
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the BizRuleModel based on its primary key value.
+     *
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     *
+     * @param string $id
+     *
+     * @return BizRuleModel the loaded model
+     *
+     * @throws \yii\web\NotFoundHttpException
+     */
+    protected function findModel(string $id)
+    {
+        $item = Yii::$app->authManager->getRule($id);
+
+        if (!empty($item)) {
+            return new BizRuleModel($item);
+        }
+
+        throw new NotFoundHttpException(Yii::t('yii2mod.rbac', 'The requested page does not exist.'));
+    }
+
+    public function beforeAction($action)
+    {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
+
+        if (!\app\controllers\UsersController::test('admin')) {
+            throw new \yii\web\ForbiddenHttpException('You are not allowed to access this page.');
+        }
+
+        return true;
+    }
 }

controllers/RouteController.php

Indentation +88 added lines, -88 removed lines

@@ -15,104 +15,104 @@
  */
 class RouteController extends Controller
 {
-	/**
-	 * @var array route model class
-	 */
-	public $modelClass = [
-		'class' => RouteModel::class,
-	];
+    /**
+     * @var array route model class
+     */
+    public $modelClass = [
+        'class' => RouteModel::class,
+    ];
 
-	/**
-	 * Returns a list of behaviors that this component should behave as.
-	 *
-	 * @return array
-	 */
-	public function behaviors(): array
-	{
-		return [
-			'verbs' => [
-				'class' => VerbFilter::class,
-				'actions' => [
-					'index' => ['get', 'post'],
-					'create' => ['post'],
-					'assign' => ['post'],
-					'remove' => ['post'],
-					'refresh' => ['post'],
-				],
-			],
-			'contentNegotiator' => [
-				'class' => 'yii\filters\ContentNegotiator',
-				'only' => ['assign', 'remove', 'refresh'],
-				'formats' => [
-					'application/json' => Response::FORMAT_JSON,
-				],
-			],
-		];
-	}
+    /**
+     * Returns a list of behaviors that this component should behave as.
+     *
+     * @return array
+     */
+    public function behaviors(): array
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::class,
+                'actions' => [
+                    'index' => ['get', 'post'],
+                    'create' => ['post'],
+                    'assign' => ['post'],
+                    'remove' => ['post'],
+                    'refresh' => ['post'],
+                ],
+            ],
+            'contentNegotiator' => [
+                'class' => 'yii\filters\ContentNegotiator',
+                'only' => ['assign', 'remove', 'refresh'],
+                'formats' => [
+                    'application/json' => Response::FORMAT_JSON,
+                ],
+            ],
+        ];
+    }
 
-	/**
-	 * Lists all Route models.
-	 *
-	 * @return mixed
-	 */
-	public function actionIndex()
-	{
-		$model = Yii::createObject($this->modelClass);
+    /**
+     * Lists all Route models.
+     *
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $model = Yii::createObject($this->modelClass);
 
-		return $this->render('index', ['routes' => $model->getAvailableAndAssignedRoutes()]);
-	}
+        return $this->render('index', ['routes' => $model->getAvailableAndAssignedRoutes()]);
+    }
 
-	/**
-	 * Assign routes
-	 *
-	 * @return array
-	 */
-	public function actionAssign(): array
-	{
-		$routes = Yii::$app->getRequest()->post('routes', []);
-		$model = Yii::createObject($this->modelClass);
-		$model->addNew($routes);
+    /**
+     * Assign routes
+     *
+     * @return array
+     */
+    public function actionAssign(): array
+    {
+        $routes = Yii::$app->getRequest()->post('routes', []);
+        $model = Yii::createObject($this->modelClass);
+        $model->addNew($routes);
 
-		return $model->getAvailableAndAssignedRoutes();
-	}
+        return $model->getAvailableAndAssignedRoutes();
+    }
 
-	/**
-	 * Remove routes
-	 *
-	 * @return array
-	 */
-	public function actionRemove(): array
-	{
-		$routes = Yii::$app->getRequest()->post('routes', []);
-		$model = Yii::createObject($this->modelClass);
-		$model->remove($routes);
+    /**
+     * Remove routes
+     *
+     * @return array
+     */
+    public function actionRemove(): array
+    {
+        $routes = Yii::$app->getRequest()->post('routes', []);
+        $model = Yii::createObject($this->modelClass);
+        $model->remove($routes);
 
-		return $model->getAvailableAndAssignedRoutes();
-	}
+        return $model->getAvailableAndAssignedRoutes();
+    }
 
-	/**
-	 * Refresh cache of routes
-	 *
-	 * @return array
-	 */
-	public function actionRefresh(): array
-	{
-		$model = Yii::createObject($this->modelClass);
-		$model->invalidate();
+    /**
+     * Refresh cache of routes
+     *
+     * @return array
+     */
+    public function actionRefresh(): array
+    {
+        $model = Yii::createObject($this->modelClass);
+        $model->invalidate();
 
-		return $model->getAvailableAndAssignedRoutes();
-	}
+        return $model->getAvailableAndAssignedRoutes();
+    }
 
-	public function beforeAction($action)
-	{
-		if (!parent::beforeAction($action)) {
-			return false;
-		}
+    public function beforeAction($action)
+    {
+        if (!parent::beforeAction($action)) {
+            return false;
+        }
 
-		if (!\app\controllers\UsersController::test('admin')) {
-			throw new \yii\web\ForbiddenHttpException('You are not allowed to access this page.');
-		}
+        if (!\app\controllers\UsersController::test('admin')) {
+            throw new \yii\web\ForbiddenHttpException('You are not allowed to access this page.');
+        }
 
-		return true;
-	}
+        return true;
+    }
 }