yii2mod / yii2-rbac

models/AuthItemModel.php

Doc Comments +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
      *
      * @param string $id
      *
-     * @return null|\self
+     * @return AuthItemModel|null
      */
     public static function find(string $id)
     {

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
             [['name', 'description', 'data', 'ruleName'], 'trim'],
             [['name', 'type'], 'required'],
             ['ruleName', 'checkRule'],
-            ['name', 'unique', 'when' => function () {
+            ['name', 'unique', 'when' => function() {
                 return $this->getIsNewRecord() || ($this->_item->name != $this->name);
             }],
             ['type', 'integer'],

base/ItemController.php

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';
     }
 
     /**

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)
     {

messages/config.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 return [
     // string, required, root directory of all source files
-    'sourcePath' => __DIR__ . DIRECTORY_SEPARATOR . '..',
+    'sourcePath' => __DIR__.DIRECTORY_SEPARATOR.'..',
     // array, required, list of language codes that the extracted messages
     // should be translated to. For example, ['zh-CN', 'de'].
     'languages' => ['en'],

migrations/Migration.php

Spacing +16 added lines, -16 removed lines

@@ -53,8 +53,8 @@ 
             return true;
         } catch (\Exception $e) {
             echo "Rolling transaction back\n";
-            echo 'Exception: ' . $e->getMessage() . ' (' . $e->getFile() . ':' . $e->getLine() . ")\n";
-            echo $e->getTraceAsString() . "\n";
+            echo 'Exception: '.$e->getMessage().' ('.$e->getFile().':'.$e->getLine().")\n";
+            echo $e->getTraceAsString()."\n";
             $transaction->rollBack();
 
             return false;
@@ -79,8 +79,8 @@ 
             return true;
         } catch (\Exception $e) {
             echo "Rolling transaction back\n";
-            echo 'Exception: ' . $e->getMessage() . ' (' . $e->getFile() . ':' . $e->getLine() . ")\n";
-            echo $e->getTraceAsString() . "\n";
+            echo 'Exception: '.$e->getMessage().' ('.$e->getFile().':'.$e->getLine().")\n";
+            echo $e->getTraceAsString()."\n";
             $transaction->rollBack();
 
             return false;
@@ -126,7 +126,7 @@ 
         $permission->ruleName = $ruleName;
         $permission->data = $data;
         $this->authManager->add($permission);
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        echo ' done (time: '.sprintf('%.3f', microtime(true) - $time)."s)\n";
 
         return $permission;
     }
@@ -150,7 +150,7 @@ 
         $role->ruleName = $ruleName;
         $role->data = $data;
         $this->authManager->add($role);
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        echo ' done (time: '.sprintf('%.3f', microtime(true) - $time)."s)\n";
 
         return $role;
     }
@@ -178,7 +178,7 @@ 
         /** @var Rule $rule */
         $rule = \Yii::createObject($definition);
         $this->authManager->add($rule);
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        echo ' done (time: '.sprintf('%.3f', microtime(true) - $time)."s)\n";
 
         return $rule;
     }
@@ -255,7 +255,7 @@ 
         echo "    > adding $child->name as child to $parent->name ...";
         $time = microtime(true);
         $this->authManager->addChild($parent, $child);
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        echo ' done (time: '.sprintf('%.3f', microtime(true) - $time)."s)\n";
     }
 
     /**
@@ -275,7 +275,7 @@ 
         echo "    > removing $child->name from $parent->name ...";
         $time = microtime(true);
         $this->authManager->removeChild($parent, $child);
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        echo ' done (time: '.sprintf('%.3f', microtime(true) - $time)."s)\n";
     }
 
     /**
@@ -292,7 +292,7 @@ 
         echo "    > assigning $role->name to user $userId ...";
         $time = microtime(true);
         $this->authManager->assign($role, $userId);
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        echo ' done (time: '.sprintf('%.3f', microtime(true) - $time)."s)\n";
     }
 
     /**
@@ -316,7 +316,7 @@ 
         $role->ruleName = $ruleName;
         $role->data = $data;
         $this->authManager->update($role->name, $role);
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        echo ' done (time: '.sprintf('%.3f', microtime(true) - $time)."s)\n";
 
         return $role;
     }
@@ -335,7 +335,7 @@ 
         echo "    > removing role $role->name ...";
         $time = microtime(true);
         $this->authManager->remove($role);
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        echo ' done (time: '.sprintf('%.3f', microtime(true) - $time)."s)\n";
     }
 
     /**
@@ -359,7 +359,7 @@ 
         $permission->ruleName = $ruleName;
         $permission->data = $data;
         $this->authManager->update($permission->name, $permission);
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        echo ' done (time: '.sprintf('%.3f', microtime(true) - $time)."s)\n";
 
         return $permission;
     }
@@ -378,7 +378,7 @@ 
         echo "    > removing permission $permission->name ...";
         $time = microtime(true);
         $this->authManager->remove($permission);
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        echo ' done (time: '.sprintf('%.3f', microtime(true) - $time)."s)\n";
     }
 
     /**
@@ -399,7 +399,7 @@ 
             'name' => $ruleName,
         ]);
         $this->authManager->update($ruleName, $rule);
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        echo ' done (time: '.sprintf('%.3f', microtime(true) - $time)."s)\n";
 
         return $rule;
     }
@@ -418,6 +418,6 @@ 
         echo "    > removing rule $rule->name ...";
         $time = microtime(true);
         $this->authManager->remove($rule);
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        echo ' done (time: '.sprintf('%.3f', microtime(true) - $time)."s)\n";
     }
 }

tests/bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -6,8 +6,8 @@
 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');

tests/TestCase.php

Spacing +5 added lines, -5 removed lines

@@ -70,7 +70,7 @@ 
      */
     protected function getVendorPath()
     {
-        return dirname(__DIR__) . '/vendor';
+        return dirname(__DIR__).'/vendor';
     }
 
     /**
@@ -106,15 +106,15 @@ 
             'data' => 'string',
             'created_at' => 'integer',
             'updated_at' => 'integer',
-            'FOREIGN KEY (rule_name) REFERENCES ' . '{{%auth_rule}}' . ' (name) ON DELETE SET NULL ON UPDATE CASCADE',
+            'FOREIGN KEY (rule_name) REFERENCES '.'{{%auth_rule}}'.' (name) ON DELETE SET NULL ON UPDATE CASCADE',
         ])->execute();
 
         $db->createCommand()->createTable('{{%auth_item_child}}', [
             'parent' => 'string',
             'child' => 'string',
             'PRIMARY KEY (parent, child)',
-            'FOREIGN KEY (parent) REFERENCES ' . '{{%auth_item}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
-            'FOREIGN KEY (child) REFERENCES ' . '{{%auth_item}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+            'FOREIGN KEY (parent) REFERENCES '.'{{%auth_item}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+            'FOREIGN KEY (child) REFERENCES '.'{{%auth_item}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE',
         ])->execute();
 
         $db->createCommand()->createTable('{{%auth_assignment}}', [
@@ -122,7 +122,7 @@ 
             'user_id' => 'integer',
             'created_at' => 'integer',
             'PRIMARY KEY (item_name, user_id)',
-            'FOREIGN KEY (item_name) REFERENCES ' . '{{%auth_item}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+            'FOREIGN KEY (item_name) REFERENCES '.'{{%auth_item}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE',
         ])->execute();
 
         $db->createCommand()->createTable('{{%user}}', [

filters/AccessControl.php

Spacing +3 added lines, -3 removed lines

@@ -33,12 +33,12 @@ 
         $controller = $action->controller;
         $params = ArrayHelper::getValue($this->params, $action->id, []);
 
-        if (Yii::$app->user->can('/' . $action->getUniqueId(), $params)) {
+        if (Yii::$app->user->can('/'.$action->getUniqueId(), $params)) {
             return true;
         }
 
         do {
-            if (Yii::$app->user->can('/' . ltrim($controller->getUniqueId() . '/*', '/'))) {
+            if (Yii::$app->user->can('/'.ltrim($controller->getUniqueId().'/*', '/'))) {
                 return true;
             }
             $controller = $controller->module;
@@ -105,7 +105,7 @@ 
         if ($this->owner instanceof Module) {
             $ownerId = $this->owner->getUniqueId();
             $id = $action->getUniqueId();
-            if (!empty($ownerId) && strpos($id, $ownerId . '/') === 0) {
+            if (!empty($ownerId) && strpos($id, $ownerId.'/') === 0) {
                 $id = substr($id, strlen($ownerId) + 1);
             }
         } else {

views/item/update.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 $context = $this->context;
 $labels = $this->context->getLabels();
-$this->title = Yii::t('yii2mod.rbac', 'Update ' . $labels['Item'] . ' : {0}', $model->name);
+$this->title = Yii::t('yii2mod.rbac', 'Update '.$labels['Item'].' : {0}', $model->name);
 $this->params['breadcrumbs'][] = ['label' => Yii::t('yii2mod.rbac', $labels['Items']), 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->name]];
 $this->params['breadcrumbs'][] = Yii::t('yii2mod.rbac', 'Update');

views/item/create.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 /* @var $model \yii2mod\rbac\models\AuthItemModel */
 
 $labels = $this->context->getLabels();
-$this->title = Yii::t('yii2mod.rbac', 'Create ' . $labels['Item']);
+$this->title = Yii::t('yii2mod.rbac', 'Create '.$labels['Item']);
 $this->params['breadcrumbs'][] = ['label' => Yii::t('yii2mod.rbac', $labels['Items']), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 $this->render('/layouts/_sidebar');