yii2mod / yii2-rbac

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 int $id
      *
-     * @return mixed
+     * @return string
      */
     public function actionView(int $id)
     {
@@ -144,7 +144,7 @@ 
      *
      * @param int $id
      *
-     * @return mixed
+     * @return Response
      */
     public function actionDelete(int $id)
     {

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 int $id
      *
-     * @return mixed
+     * @return string
      */
     public function actionView($id)
     {

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($id)
     {
@@ -123,7 +123,7 @@ 
      *
      * @param string $id
      *
-     * @return mixed
+     * @return \yii\web\Response
      */
     public function actionDelete($id)
     {

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 +2 added lines, -2 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'],
@@ -292,7 +292,7 @@ 
     /**
      * @return null|Item
      */
-    public function getItem(): ?Item
+    public function getItem(): ? Item
     {
         return $this->_item;
     }

models/RouteModel.php

Doc Comments +1 added lines, -1 removed lines

@@ -262,7 +262,7 @@
      * Get route of action
      *
      * @param \yii\base\Controller $controller
-     * @param array $result all controller action
+     * @param string $result all controller action
      */
     protected function getActionRoutes($controller, &$result)
     {

Spacing +15 added lines, -15 removed lines

@@ -62,7 +62,7 @@ 
     public function addNew($routes): bool
     {
         foreach ($routes as $route) {
-            $this->manager->add($this->manager->createPermission('/' . trim($route, ' /')));
+            $this->manager->add($this->manager->createPermission('/'.trim($route, ' /')));
         }
 
         $this->invalidate();
@@ -80,7 +80,7 @@ 
     public function remove($routes): bool
     {
         foreach ($routes as $route) {
-            $item = $this->manager->createPermission('/' . trim($route, '/'));
+            $item = $this->manager->createPermission('/'.trim($route, '/'));
             $this->manager->remove($item);
         }
         $this->invalidate();
@@ -162,7 +162,7 @@ 
     protected function getRouteRecursive($module, &$result): void
     {
         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 {
@@ -176,9 +176,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, $namespace, $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, &$result)
     {
-        $token = 'Create controller with cofig=' . VarDumper::dumpAsString($type) . " and id='$id'";
+        $token = 'Create controller with cofig='.VarDumper::dumpAsString($type)." and id='$id'";
         Yii::beginProfile($token, __METHOD__);
 
         try {
@@ -266,12 +266,12 @@ 
      */
     protected function getActionRoutes($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);
 
@@ -279,7 +279,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;
                 }
             }

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}}', [