mdmsoft / yii2-admin

views/layouts/right-menu.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
                 $label = Html::tag('span', Html::encode($menu['label']), []);
                 $active = $menu['active'] ? ' active' : '';
                 echo Html::a($label, $menu['url'], [
-                    'class' => 'list-group-item' . $active,
+                    'class' => 'list-group-item'.$active,
                 ]);
             }
             ?>

views/layouts/left-menu.php

Spacing +3 added lines, -3 removed lines

@@ -19,11 +19,11 @@ 
         <div id="manager-menu" class="list-group">
             <?php
             foreach ($menus as $menu) {
-                $label = Html::tag('i', '', ['class' => 'glyphicon glyphicon-chevron-right pull-right']) .
+                $label = Html::tag('i', '', ['class' => 'glyphicon glyphicon-chevron-right pull-right']).
                     Html::tag('span', Html::encode($menu['label']), []);
                 $active = $menu['active'] ? ' active' : '';
                 echo Html::a($label, $menu['url'], [
-                    'class' => 'list-group-item' . $active,
+                    'class' => 'list-group-item'.$active,
                 ]);
             }
             ?>
@@ -35,7 +35,7 @@ 
 </div>
 <?php
 list(, $url) = Yii::$app->assetManager->publish('@mdm/admin/assets');
-$this->registerCssFile($url . '/list-item.css');
+$this->registerCssFile($url.'/list-item.css');
 ?>
 
 <?php $this->endContent(); ?>

components/AccessControl.php

Spacing +6 added lines, -6 removed lines

@@ -67,7 +67,7 @@ 
     {
         $actionId = $action->getUniqueId();
         $user = $this->getUser();
-        if (Helper::checkRoute('/' . $actionId, Yii::$app->getRequest()->get(), $user)) {
+        if (Helper::checkRoute('/'.$actionId, Yii::$app->getRequest()->get(), $user)) {
             return true;
         }
         $this->denyAccess($user);
@@ -100,15 +100,15 @@ 
         }
 
         $user = $this->getUser();
-        if($user->getIsGuest())
+        if ($user->getIsGuest())
         {
             $loginUrl = null;
-            if(is_array($user->loginUrl) && isset($user->loginUrl[0])){
+            if (is_array($user->loginUrl) && isset($user->loginUrl[0])) {
                 $loginUrl = $user->loginUrl[0];
-                }else if(is_string($user->loginUrl)){
+                } else if (is_string($user->loginUrl)) {
                     $loginUrl = $user->loginUrl;
                 }
-                if(!is_null($loginUrl) && trim($loginUrl,'/') === $uniqueId)
+                if (!is_null($loginUrl) && trim($loginUrl, '/') === $uniqueId)
                 {
                     return false;
                 }
@@ -118,7 +118,7 @@ 
             // convert action uniqueId into an ID relative to the module
             $mid = $this->owner->getUniqueId();
             $id = $uniqueId;
-            if ($mid !== '' && strpos($id, $mid . '/') === 0) {
+            if ($mid !== '' && strpos($id, $mid.'/') === 0) {
                 $id = substr($id, strlen($mid) + 1);
             }
         } else {

Braces +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
             $loginUrl = null;
             if(is_array($user->loginUrl) && isset($user->loginUrl[0])){
                 $loginUrl = $user->loginUrl[0];
-                }else if(is_string($user->loginUrl)){
+                } else if(is_string($user->loginUrl)){
                     $loginUrl = $user->loginUrl;
                 }
                 if(!is_null($loginUrl) && trim($loginUrl,'/') === $uniqueId)

Module.php

Spacing +5 added lines, -5 removed lines

@@ -118,7 +118,7 @@ 
     public function getMenus()
     {
         if ($this->_normalizeMenus === null) {
-            $mid = '/' . $this->getUniqueId() . '/';
+            $mid = '/'.$this->getUniqueId().'/';
             // resolve core menus
             $this->_normalizeMenus = [];
 
@@ -130,11 +130,11 @@ 
             ];
             foreach ($this->_coreItems as $id => $lable) {
                 if (!isset($conditions[$id]) || $conditions[$id]) {
-                    $this->_normalizeMenus[$id] = ['label' => Yii::t('rbac-admin', $lable), 'url' => [$mid . $id]];
+                    $this->_normalizeMenus[$id] = ['label' => Yii::t('rbac-admin', $lable), 'url' => [$mid.$id]];
                 }
             }
             foreach (array_keys($this->controllerMap) as $id) {
-                $this->_normalizeMenus[$id] = ['label' => Yii::t('rbac-admin', Inflector::humanize($id)), 'url' => [$mid . $id]];
+                $this->_normalizeMenus[$id] = ['label' => Yii::t('rbac-admin', Inflector::humanize($id)), 'url' => [$mid.$id]];
             }
 
             // user configure menus
@@ -149,7 +149,7 @@ 
                 $this->_normalizeMenus[$id] = isset($this->_normalizeMenus[$id]) ? array_merge($this->_normalizeMenus[$id], $value)
                 : $value;
                 if (!isset($this->_normalizeMenus[$id]['url'])) {
-                    $this->_normalizeMenus[$id]['url'] = [$mid . $id];
+                    $this->_normalizeMenus[$id]['url'] = [$mid.$id];
                 }
             }
         }
@@ -177,7 +177,7 @@ 
 
             $view->params['breadcrumbs'][] = [
                 'label' => ($this->defaultUrlLabel ?: Yii::t('rbac-admin', 'Admin')),
-                'url' => ['/' . ($this->defaultUrl ?: $this->uniqueId)],
+                'url' => ['/'.($this->defaultUrl ?: $this->uniqueId)],
             ];
             return true;
         }

views/item/view.php

Spacing +10 added lines, -10 removed lines

@@ -26,15 +26,15 @@ 
 $animateIcon = ' <i class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></i>';
 ?>
 <div class="auth-item-view">
-    <h1><?=Html::encode($this->title);?></h1>
+    <h1><?=Html::encode($this->title); ?></h1>
     <p>
-        <?=Html::a(Yii::t('rbac-admin', 'Update'), ['update', 'id' => $model->name], ['class' => 'btn btn-primary']);?>
+        <?=Html::a(Yii::t('rbac-admin', 'Update'), ['update', 'id' => $model->name], ['class' => 'btn btn-primary']); ?>
         <?=Html::a(Yii::t('rbac-admin', 'Delete'), ['delete', 'id' => $model->name], [
     'class' => 'btn btn-danger',
     'data-confirm' => Yii::t('rbac-admin', 'Are you sure to delete this item?'),
     'data-method' => 'post',
-]);?>
-        <?=Html::a(Yii::t('rbac-admin', 'Create'), ['create'], ['class' => 'btn btn-success']);?>
+]); ?>
+        <?=Html::a(Yii::t('rbac-admin', 'Create'), ['create'], ['class' => 'btn btn-success']); ?>
     </p>
     <div class="row">
         <div class="col-sm-11">
@@ -55,25 +55,25 @@ 
     <div class="row">
         <div class="col-sm-5">
             <input class="form-control search" data-target="available"
-                   placeholder="<?=Yii::t('rbac-admin', 'Search for available');?>">
+                   placeholder="<?=Yii::t('rbac-admin', 'Search for available'); ?>">
             <select multiple size="20" class="form-control list" data-target="available"></select>
         </div>
         <div class="col-sm-1">
             <br><br>
-            <?=Html::a('&gt;&gt;' . $animateIcon, ['assign', 'id' => $model->name], [
+            <?=Html::a('&gt;&gt;'.$animateIcon, ['assign', 'id' => $model->name], [
     'class' => 'btn btn-success btn-assign',
     'data-target' => 'available',
     'title' => Yii::t('rbac-admin', 'Assign'),
-]);?><br><br>
-            <?=Html::a('&lt;&lt;' . $animateIcon, ['remove', 'id' => $model->name], [
+]); ?><br><br>
+            <?=Html::a('&lt;&lt;'.$animateIcon, ['remove', 'id' => $model->name], [
     'class' => 'btn btn-danger btn-assign',
     'data-target' => 'assigned',
     'title' => Yii::t('rbac-admin', 'Remove'),
-]);?>
+]); ?>
         </div>
         <div class="col-sm-5">
             <input class="form-control search" data-target="assigned"
-                   placeholder="<?=Yii::t('rbac-admin', 'Search for assigned');?>">
+                   placeholder="<?=Yii::t('rbac-admin', 'Search for assigned'); ?>">
             <select multiple size="20" class="form-control list" data-target="assigned"></select>
         </div>
     </div>

views/assignment/view.php

Spacing +9 added lines, -9 removed lines

@@ -12,11 +12,11 @@ 
 
 $userName = $model->{$usernameField};
 if (!empty($fullnameField)) {
-    $userName .= ' (' . ArrayHelper::getValue($model, $fullnameField) . ')';
+    $userName .= ' ('.ArrayHelper::getValue($model, $fullnameField).')';
 }
 $userName = Html::encode($userName);
 
-$this->title = Yii::t('rbac-admin', 'Assignment') . ' : ' . $userName;
+$this->title = Yii::t('rbac-admin', 'Assignment').' : '.$userName;
 
 $this->params['breadcrumbs'][] = ['label' => Yii::t('rbac-admin', 'Assignments'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $userName;
@@ -31,31 +31,31 @@ 
 $animateIcon = ' <i class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></i>';
 ?>
 <div class="assignment-index">
-    <h1><?=$this->title;?></h1>
+    <h1><?=$this->title; ?></h1>
 
     <div class="row">
         <div class="col-sm-5">
             <input class="form-control search" data-target="available"
-                   placeholder="<?=Yii::t('rbac-admin', 'Search for available');?>">
+                   placeholder="<?=Yii::t('rbac-admin', 'Search for available'); ?>">
             <select multiple size="20" class="form-control list" data-target="available">
             </select>
         </div>
         <div class="col-sm-1">
             <br><br>
-            <?=Html::a('&gt;&gt;' . $animateIcon, ['assign', 'id' => (string) $model->id], [
+            <?=Html::a('&gt;&gt;'.$animateIcon, ['assign', 'id' => (string)$model->id], [
     'class' => 'btn btn-success btn-assign',
     'data-target' => 'available',
     'title' => Yii::t('rbac-admin', 'Assign'),
-]);?><br><br>
-            <?=Html::a('&lt;&lt;' . $animateIcon, ['revoke', 'id' => (string) $model->id], [
+]); ?><br><br>
+            <?=Html::a('&lt;&lt;'.$animateIcon, ['revoke', 'id' => (string)$model->id], [
     'class' => 'btn btn-danger btn-assign',
     'data-target' => 'assigned',
     'title' => Yii::t('rbac-admin', 'Remove'),
-]);?>
+]); ?>
         </div>
         <div class="col-sm-5">
             <input class="form-control search" data-target="assigned"
-                   placeholder="<?=Yii::t('rbac-admin', 'Search for assigned');?>">
+                   placeholder="<?=Yii::t('rbac-admin', 'Search for assigned'); ?>">
             <select multiple size="20" class="form-control list" data-target="assigned">
             </select>
         </div>

views/route/index.php

Spacing +11 added lines, -11 removed lines

@@ -20,17 +20,17 @@ 
 $this->registerJs($this->render('_script.js'));
 $animateIcon = ' <i class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></i>';
 ?>
-<h1><?=Html::encode($this->title);?></h1>
+<h1><?=Html::encode($this->title); ?></h1>
 <div class="row">
     <div class="col-sm-11">
         <div class="input-group">
             <input id="inp-route" type="text" class="form-control"
-                   placeholder="<?=Yii::t('rbac-admin', 'New route(s)');?>">
+                   placeholder="<?=Yii::t('rbac-admin', 'New route(s)'); ?>">
             <span class="input-group-btn">
-                <?=Html::a(Yii::t('rbac-admin', 'Add') . $animateIcon, ['create'], [
+                <?=Html::a(Yii::t('rbac-admin', 'Add').$animateIcon, ['create'], [
     'class' => 'btn btn-success',
     'id' => 'btn-new',
-]);?>
+]); ?>
             </span>
         </div>
     </div>
@@ -40,32 +40,32 @@ 
     <div class="col-sm-5">
         <div class="input-group">
             <input class="form-control search" data-target="available"
-                   placeholder="<?=Yii::t('rbac-admin', 'Search for available');?>">
+                   placeholder="<?=Yii::t('rbac-admin', 'Search for available'); ?>">
             <span class="input-group-btn">
                 <?=Html::a('<span class="glyphicon glyphicon-refresh"></span>', ['refresh'], [
     'class' => 'btn btn-default',
     'id' => 'btn-refresh',
-]);?>
+]); ?>
             </span>
         </div>
         <select multiple size="20" class="form-control list" data-target="available"></select>
     </div>
     <div class="col-sm-1">
         <br><br>
-        <?=Html::a('&gt;&gt;' . $animateIcon, ['assign'], [
+        <?=Html::a('&gt;&gt;'.$animateIcon, ['assign'], [
     'class' => 'btn btn-success btn-assign',
     'data-target' => 'available',
     'title' => Yii::t('rbac-admin', 'Assign'),
-]);?><br><br>
-        <?=Html::a('&lt;&lt;' . $animateIcon, ['remove'], [
+]); ?><br><br>
+        <?=Html::a('&lt;&lt;'.$animateIcon, ['remove'], [
     'class' => 'btn btn-danger btn-assign',
     'data-target' => 'assigned',
     'title' => Yii::t('rbac-admin', 'Remove'),
-]);?>
+]); ?>
     </div>
     <div class="col-sm-5">
         <input class="form-control search" data-target="assigned"
-               placeholder="<?=Yii::t('rbac-admin', 'Search for assigned');?>">
+               placeholder="<?=Yii::t('rbac-admin', 'Search for assigned'); ?>">
         <select multiple size="20" class="form-control list" data-target="assigned"></select>
     </div>
 </div>

models/Route.php

Doc Comments +2 added lines, -1 removed lines

@@ -171,6 +171,7 @@ 
 
     /**
      * Get list of application routes
+     * @param \yii\web\Application $module
      * @return array
      */
     public function getAppRoutes($module = null)
@@ -290,7 +291,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 +18 added lines, -18 removed lines

@@ -38,7 +38,7 @@ 
                 $r = explode('&', $route);
                 $item = $manager->createPermission($this->getPermissionName($route));
                 if (count($r) > 1) {
-                    $action = '/' . trim($r[0], '/');
+                    $action = '/'.trim($r[0], '/');
                     if (($itemAction = $manager->getPermission($action)) === null) {
                         $itemAction = $manager->createPermission($action);
                         $manager->add($itemAction);
@@ -101,9 +101,9 @@ 
     public function getPermissionName($route)
     {
         if (self::PREFIX_BASIC == $this->routePrefix) {
-            return self::PREFIX_BASIC . trim($route, self::PREFIX_BASIC);
+            return self::PREFIX_BASIC.trim($route, self::PREFIX_BASIC);
         } else {
-            return self::PREFIX_ADVANCED . ltrim(trim($route, self::PREFIX_BASIC), self::PREFIX_ADVANCED);
+            return self::PREFIX_ADVANCED.ltrim(trim($route, self::PREFIX_BASIC), self::PREFIX_ADVANCED);
         }
     }
 
@@ -127,7 +127,7 @@ 
             // Step through each configured application
             foreach ($advanced as $id => $configPaths) {
                 // Force correct id string.
-                $id = $this->routePrefix . ltrim(trim($id), $this->routePrefix);
+                $id = $this->routePrefix.ltrim(trim($id), $this->routePrefix);
                 // Create empty config array.
                 $config = [];
                 // Assemble configuration for current app.
@@ -144,7 +144,7 @@ 
                 unset($app);
                 // Prepend the app id to all routes.
                 foreach ($r as $route) {
-                    $routes[$id . $route] = $id . $route;
+                    $routes[$id.$route] = $id.$route;
                 }
             }
             // Switch back to original app.
@@ -204,7 +204,7 @@ 
      */
     protected function getRouteRecursive($module, &$result)
     {
-        $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 {
             foreach ($module->getModules() as $id => $child) {
@@ -217,9 +217,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__);
@@ -237,7 +237,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__);
         try {
@@ -248,15 +248,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);
                     }
                 }
             }
@@ -275,7 +275,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 {
             /* @var $controller \yii\base\Controller */
@@ -296,19 +296,19 @@ 
      */
     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);
             foreach ($class->getMethods() as $method) {
                 $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;
                 }
             }

components/Helper.php

Spacing +8 added lines, -8 removed lines

@@ -121,7 +121,7 @@ 
             }
             while (($pos = strrpos($r, '/')) > 0) {
                 $r = substr($r, 0, $pos);
-                if ($user->can($r . '/*', $params)) {
+                if ($user->can($r.'/*', $params)) {
                     return true;
                 }
             }
@@ -133,7 +133,7 @@ 
             }
             while (($pos = strrpos($r, '/')) > 0) {
                 $r = substr($r, 0, $pos);
-                if (isset($routes[$r . '/*'])) {
+                if (isset($routes[$r.'/*'])) {
                     return true;
                 }
             }
@@ -150,19 +150,19 @@ 
     protected static function normalizeRoute($route, $advanced = false)
     {
         if ($route === '') {
-            $normalized = '/' . Yii::$app->controller->getRoute();
+            $normalized = '/'.Yii::$app->controller->getRoute();
         } elseif (strncmp($route, '/', 1) === 0) {
             $normalized = $route;
         } elseif (strpos($route, '/') === false) {
-            $normalized = '/' . Yii::$app->controller->getUniqueId() . '/' . $route;
+            $normalized = '/'.Yii::$app->controller->getUniqueId().'/'.$route;
         } elseif (($mid = Yii::$app->controller->module->getUniqueId()) !== '') {
-            $normalized = '/' . $mid . '/' . $route;
+            $normalized = '/'.$mid.'/'.$route;
         } else {
-            $normalized = '/' . $route;
+            $normalized = '/'.$route;
         }
         // Prefix @app-id to route.
         if ($advanced) {
-            $normalized = Route::PREFIX_ADVANCED . Yii::$app->id . $normalized;
+            $normalized = Route::PREFIX_ADVANCED.Yii::$app->id.$normalized;
         }
         return $normalized;
     }
@@ -233,7 +233,7 @@ 
             }
             return implode(' ', $result);
         }
-        return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function ($matches) use ($user) {
+        return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function($matches) use ($user) {
             return static::checkRoute($matches[1], [], $user) ? "{{$matches[1]}}" : '';
         }, $buttons);
     }