yii2mod / yii2-rbac

components/AccessHelper.php

Doc Comments +4 added lines, -4 removed lines

@@ -71,8 +71,8 @@ 
     /**
      * Get controller routes
      * @param $module
-     * @param $namespace
-     * @param $prefix
+     * @param string $namespace
+     * @param string $prefix
      * @param $result
      * @throws \yii\base\InvalidConfigException
      */
@@ -129,7 +129,7 @@ 
     /**
      * Get group
      *
-     * @param $group
+     * @param string $group
      * @return string
      */
     private static function getGroup($group)
@@ -140,7 +140,7 @@ 
     /**
      * Build key
      *
-     * @param $key
+     * @param string $key
      * @return array
      */
     private static function buildKey($key)

Spacing +12 added lines, -12 removed lines

@@ -60,12 +60,12 @@ 
                 $module
             ]);
             self::getActionRoutes($controller, $result);
-            $result[] = '/' . $controller->uniqueId . '/*';
+            $result[] = '/'.$controller->uniqueId.'/*';
         }
 
-        $namespace = trim($module->controllerNamespace, '\\') . '\\';
+        $namespace = trim($module->controllerNamespace, '\\').'\\';
         self::getControllerRoutes($module, $namespace, '', $result);
-        $result[] = ($module->uniqueId === '' ? '' : '/' . $module->uniqueId) . '/*';
+        $result[] = ($module->uniqueId === '' ? '' : '/'.$module->uniqueId).'/*';
     }
 
     /**
@@ -78,7 +78,7 @@ 
      */
     private static function getControllerRoutes($module, $namespace, $prefix, &$result)
     {
-        $path = Yii::getAlias('@' . str_replace('\\', '/', $namespace));
+        $path = Yii::getAlias('@'.str_replace('\\', '/', $namespace));
         if (!is_dir($path)) {
             return;
         }
@@ -86,18 +86,18 @@ 
             if ($file == '.' || $file == '..') {
                 continue;
             }
-            if (is_dir($path . '/' . $file)) {
-                self::getControllerRoutes($module, $namespace . $file . '\\', $prefix . $file . '/', $result);
+            if (is_dir($path.'/'.$file)) {
+                self::getControllerRoutes($module, $namespace.$file.'\\', $prefix.$file.'/', $result);
             } elseif (strcmp(substr($file, -14), 'Controller.php') === 0) {
                 $id = Inflector::camel2id(substr(basename($file), 0, -14));
-                $className = $namespace . Inflector::id2camel($id) . 'Controller';
+                $className = $namespace.Inflector::id2camel($id).'Controller';
                 if (strpos($className, '-') === false && class_exists($className) && is_subclass_of($className, 'yii\base\Controller')) {
                     $controller = Yii::createObject($className, [
-                        $prefix . $id,
+                        $prefix.$id,
                         $module
                     ]);
                     self::getActionRoutes($controller, $result);
-                    $result[] = '/' . $controller->uniqueId . '/*';
+                    $result[] = '/'.$controller->uniqueId.'/*';
                 }
             }
         }
@@ -111,16 +111,16 @@ 
      */
     private static function getActionRoutes($controller, &$result)
     {
-        $prefix = '/' . $controller->uniqueId . '/';
+        $prefix = '/'.$controller->uniqueId.'/';
         if ($controller->actions() !== null) {
             foreach ($controller->actions() as $id => $value) {
-                $result[] = $prefix . $id;
+                $result[] = $prefix.$id;
             }
             $class = new ReflectionClass($controller);
             foreach ($class->getMethods() as $method) {
                 $name = $method->getName();
                 if ($method->isPublic() && !$method->isStatic() && strpos($name, 'action') === 0 && $name !== 'actions') {
-                    $result[] = $prefix . Inflector::camel2id(substr($name, 6));
+                    $result[] = $prefix.Inflector::camel2id(substr($name, 6));
                 }
             }
         }

components/AccessControl.php

Spacing +2 added lines, -2 removed lines

@@ -28,12 +28,12 @@
         $actionId = $action->getUniqueId();
         $user = Yii::$app->getUser();
         $params = isset($this->params[$action->id]) ? $this->params[$action->id] : [];
-        if ($user->can('/' . $actionId, $params)) {
+        if ($user->can('/'.$actionId, $params)) {
             return true;
         }
         $controller = $action->controller;
         do {
-            if ($user->can('/' . ltrim($controller->getUniqueId() . '/*', '/'))) {
+            if ($user->can('/'.ltrim($controller->getUniqueId().'/*', '/'))) {
                 return true;
             }
             $controller = $controller->module;

migrations/m141223_164316_init_rbac.php

Spacing +12 added lines, -12 removed lines

@@ -14,7 +14,7 @@ 
         }
 
         $this->createTable('{{%AuthRule}}', [
-            'name' => Schema::TYPE_STRING . '(64) NOT NULL',
+            'name' => Schema::TYPE_STRING.'(64) NOT NULL',
             'data' => Schema::TYPE_TEXT,
             'created_at' => Schema::TYPE_INTEGER,
             'updated_at' => Schema::TYPE_INTEGER,
@@ -22,32 +22,32 @@ 
         ], $tableOptions);
 
         $this->createTable('{{%AuthItem}}', [
-            'name' => Schema::TYPE_STRING . '(64) NOT NULL',
-            'type' => Schema::TYPE_INTEGER . ' NOT NULL',
+            'name' => Schema::TYPE_STRING.'(64) NOT NULL',
+            'type' => Schema::TYPE_INTEGER.' NOT NULL',
             'description' => Schema::TYPE_TEXT,
-            'rule_name' => Schema::TYPE_STRING . '(64)',
+            'rule_name' => Schema::TYPE_STRING.'(64)',
             'data' => Schema::TYPE_TEXT,
             'created_at' => Schema::TYPE_INTEGER,
             'updated_at' => Schema::TYPE_INTEGER,
             'PRIMARY KEY (name)',
-            'FOREIGN KEY (rule_name) REFERENCES ' . '{{%AuthRule}}' . ' (name) ON DELETE SET NULL ON UPDATE CASCADE',
+            'FOREIGN KEY (rule_name) REFERENCES '.'{{%AuthRule}}'.' (name) ON DELETE SET NULL ON UPDATE CASCADE',
         ], $tableOptions);
         $this->createIndex('idx-auth_item-type', '{{%AuthItem}}', 'type');
 
         $this->createTable('{{%AuthItemChild}}', [
-            'parent' => Schema::TYPE_STRING . '(64) NOT NULL',
-            'child' => Schema::TYPE_STRING . '(64) NOT NULL',
+            'parent' => Schema::TYPE_STRING.'(64) NOT NULL',
+            'child' => Schema::TYPE_STRING.'(64) NOT NULL',
             'PRIMARY KEY (parent, child)',
-            'FOREIGN KEY (parent) REFERENCES ' . '{{%AuthItem}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
-            'FOREIGN KEY (child) REFERENCES ' . '{{%AuthItem}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+            'FOREIGN KEY (parent) REFERENCES '.'{{%AuthItem}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+            'FOREIGN KEY (child) REFERENCES '.'{{%AuthItem}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE',
         ], $tableOptions);
 
         $this->createTable('{{%AuthAssignment}}', [
-            'item_name' => Schema::TYPE_STRING . '(64) NOT NULL',
-            'user_id' => Schema::TYPE_INTEGER . ' NOT NULL',
+            'item_name' => Schema::TYPE_STRING.'(64) NOT NULL',
+            'user_id' => Schema::TYPE_INTEGER.' NOT NULL',
             'created_at' => Schema::TYPE_INTEGER,
             'PRIMARY KEY (item_name, user_id)',
-            'FOREIGN KEY (item_name) REFERENCES ' . '{{%AuthItem}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+            'FOREIGN KEY (item_name) REFERENCES '.'{{%AuthItem}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE',
         ], $tableOptions);
 
     }

views/route/index.php

Spacing +7 added lines, -7 removed lines

@@ -22,7 +22,7 @@ 
                     'class' => 'role-search form-control',
                     'data-target' => 'available',
                     'placeholder' => 'New:'
-                ]) . ' ';
+                ]).' ';
             echo '<br>';
             echo Html::listBox('routes', '', $new, [
                 'id' => 'available',
@@ -53,7 +53,7 @@ 
                     'class' => 'role-search form-control',
                     'data-target' => 'assigned',
                     'placeholder' => 'Exists:'
-                ]) . '<br>'; ?>
+                ]).'<br>'; ?>
             <?php echo Html::listBox('routes', '', $exists, [
                 'id' => 'assigned',
                 'multiple' => true,
@@ -69,9 +69,9 @@ 
 <?php
 
 $this->registerJs("rbac.init({
-        name: " . json_encode(isset($name) ? $name : []) . ",
-        route: '" . Url::toRoute(['route-search']) . "',
-        routeAssign: '" . Url::toRoute(['assign', 'action' => 'assign']) . "',
-        routeDelete: '" . Url::toRoute(['assign', 'action' => 'delete']) . "',
-        routeSearch: '" . Url::toRoute(['route-search']) . "',
+        name: " . json_encode(isset($name) ? $name : []).",
+        route: '" . Url::toRoute(['route-search'])."',
+        routeAssign: '" . Url::toRoute(['assign', 'action' => 'assign'])."',
+        routeDelete: '" . Url::toRoute(['assign', 'action' => 'delete'])."',
+        routeSearch: '" . Url::toRoute(['route-search'])."',
     });", yii\web\View::POS_READY);
\ No newline at end of file

views/route/generate.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     'columns' => [
         [
             'class' => 'yii\\grid\\CheckboxColumn',
-            'checkboxOptions' => function ($model) {
+            'checkboxOptions' => function($model) {
                     return [
                         'value' => ArrayHelper::getValue($model, 'name'),
                         'checked' => true,

views/route/_routes.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
     'columns' => [
         [
             'class' => 'yii\\grid\\CheckboxColumn',
-            'checkboxOptions' => function ($model) use ($type) {
+            'checkboxOptions' => function($model) use ($type) {
                     return [
                         'value' => ArrayHelper::getValue($model, 'name'),
                         'checked' => $type == 1 ? true : !ArrayHelper::getValue($model, 'exists', false)
@@ -27,7 +27,7 @@ 
         [
             'class' => 'yii\\grid\\DataColumn',
             'attribute' => 'name',
-            'contentOptions' => function ($model) {
+            'contentOptions' => function($model) {
                     return ArrayHelper::getValue($model, 'exists', true) ? [] : ['style' => 'text-decoration: line-through;'];
                 }
         ]

views/role/update.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @var yii\web\View                 $this
  * @var yii2mod\rbac\models\AuthItem $model
  */
-$this->title = 'Update Role: ' . $model->name;
+$this->title = 'Update Role: '.$model->name;
 $this->params['breadcrumbs'][] = [
     'label' => 'Roles',
     'url' => ['index']

views/assignment/view.php

Spacing +7 added lines, -7 removed lines

@@ -23,7 +23,7 @@ 
                         'class' => 'role-search form-control',
                         'data-target' => 'available',
                         'placeholder' => 'Search:'
-                    ]) . '<br>';
+                    ]).'<br>';
                 echo Html::listBox('roles', '', $available, [
                     'id' => 'available',
                     'multiple' => true,
@@ -55,7 +55,7 @@ 
                         'class' => 'role-search form-control',
                         'data-target' => 'assigned',
                         'placeholder' => 'Search:'
-                    ]) . '<br>';
+                    ]).'<br>';
                 echo Html::listBox('roles', '', $assigned, [
                     'id' => 'assigned',
                     'multiple' => true,
@@ -69,9 +69,9 @@ 
     </div>
 <?php
 $this->registerJs("rbac.init({
-        name: " . json_encode($id) . ",
-        route: '" . Url::toRoute(['role-search']) . "',
-        routeAssign: '" . Url::toRoute(['assign', 'id' => $id, 'action' => 'assign']) . "',
-        routeDelete: '" . Url::toRoute(['assign', 'id' => $id, 'action' => 'delete']) . "',
-        routeSearch: '" . Url::toRoute(['route-search']) . "'
+        name: " . json_encode($id).",
+        route: '" . Url::toRoute(['role-search'])."',
+        routeAssign: '" . Url::toRoute(['assign', 'id' => $id, 'action' => 'assign'])."',
+        routeDelete: '" . Url::toRoute(['assign', 'id' => $id, 'action' => 'delete'])."',
+        routeSearch: '" . Url::toRoute(['route-search'])."'
     });", yii\web\View::POS_READY);

views/permission/view.php

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
                         'class' => 'role-search form-control',
                         'data-target' => 'available',
                         'placeholder' => 'Search:'
-                    ]) . '<br>';
+                    ]).'<br>';
                 echo Html::listBox('roles', '', $available, [
                     'id' => 'available',
                     'multiple' => true,
@@ -79,7 +79,7 @@ 
                         'class' => 'role-search form-control',
                         'data-target' => 'assigned',
                         'placeholder' => 'Search:'
-                    ]) . '<br>';
+                    ]).'<br>';
                 echo Html::listBox('roles', '', $assigned, [
                     'id' => 'assigned',
                     'multiple' => true,
@@ -93,10 +93,10 @@ 
     </div>
 <?php
 $this->registerJs("rbac.init({
-        name: " . json_encode($model->name) . ",
-        route: '" . Url::toRoute(['role-search']) . "',
-        routeAssign: '" . Url::toRoute(['assign', 'id' => $model->name, 'action' => 'assign']) . "',
-        routeDelete: '" . Url::toRoute(['assign', 'id' => $model->name, 'action' => 'delete']) . "',
-        routeSearch: '" . Url::toRoute(['route-search']) . "',
+        name: " . json_encode($model->name).",
+        route: '" . Url::toRoute(['role-search'])."',
+        routeAssign: '" . Url::toRoute(['assign', 'id' => $model->name, 'action' => 'assign'])."',
+        routeDelete: '" . Url::toRoute(['assign', 'id' => $model->name, 'action' => 'delete'])."',
+        routeSearch: '" . Url::toRoute(['route-search'])."',
     });", yii\web\View::POS_READY);