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__));