mdmsoft / yii2-admin

models/Route.php

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;
                 }
             }

views/default/index.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
     $baseDir = '';
     $this->title = substr($page, 0, strrpos($page, '.'));
 } else {
-    $baseDir = substr($page, 0, $pos) . '/';
+    $baseDir = substr($page, 0, $pos).'/';
     $this->title = substr($page, $pos + 1, strrpos($page, '.') - $pos - 1);
 }
 
@@ -22,7 +22,7 @@ 
         $url = Url::to($menu['url'], true);
         $links[] = "[**{$menu['label']}**]({$url})";
     }
-    $body = str_replace(':smile:.', ".\n\n" . implode('  ', $links) . "\n", file_get_contents(Url::to('@mdm/admin/README.md')));
+    $body = str_replace(':smile:.', ".\n\n".implode('  ', $links)."\n", file_get_contents(Url::to('@mdm/admin/README.md')));
 } else {
     $body = file_get_contents(Url::to("@mdm/admin/{$page}"));
 }
@@ -33,7 +33,7 @@ 
         if ($link[0] == '/') {
             $link = Url::current(['page' => ltrim($link, '/')], true);
         } else {
-            $link = Url::current(['page' => $baseDir . $link], true);
+            $link = Url::current(['page' => $baseDir.$link], true);
         }
     }
     return "]($link)";

models/AuthItem.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
         return [
             [['ruleName'], 'checkRule'],
             [['name', 'type'], 'required'],
-            [['name'], 'checkUnique', 'when' => function () {
+            [['name'], 'checkUnique', 'when' => function() {
                 return $this->isNewRecord || ($this->_item->name != $this->name);
             }],
             [['type'], 'integer'],

BaseObject.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace mdm\admin;
 
-if(!class_exists('yii\base\BaseObject')){
+if (!class_exists('yii\base\BaseObject')) {
     class_alias('yii\base\Object', 'yii\base\BaseObject');
 }
 

components/AccessControl.php

Spacing +8 added lines, -8 removed lines

@@ -69,13 +69,13 @@ 
         $user = $this->getUser();
 
         $request = Yii::$app->getRequest();
-        if($request->getIsPost()){
+        if ($request->getIsPost()) {
             $params = $request->post();
-        }else{
+        } else {
             $params = $request->get();
         }
 
-        if (Helper::checkRoute('/' . $actionId, $params, $user)) {
+        if (Helper::checkRoute('/'.$actionId, $params, $user)) {
             return true;
         }
         $this->denyAccess($user);
@@ -108,15 +108,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;
                 }
@@ -126,7 +126,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 {

models/form/Login.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
     public function getUser()
     {
         if ($this->_user === false) {
-            $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+            $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
             $this->_user = $class::findByUsername($this->username);
         }
 

models/form/ResetPassword.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
         }
         $expire = ArrayHelper::getValue(Yii::$app->params, 'user.passwordResetTokenExpire', 24 * 3600);
         $parts = explode('_', $token);
-        $timestamp = (int) end($parts);
+        $timestamp = (int)end($parts);
         return $timestamp + $expire >= time();
     }
 }

models/form/Signup.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function rules()
     {
-        $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+        $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
         return [
             ['username', 'filter', 'filter' => 'trim'],
             ['username', 'required'],
@@ -50,7 +50,7 @@ 
     public function signup()
     {
         if ($this->validate()) {
-            $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+            $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
             $user = new $class();
             $user->username = $this->username;
             $user->email = $this->email;

models/form/PasswordResetRequest.php

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
      */
     public function rules()
     {
-        $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+        $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
         return [
             ['email', 'filter', 'filter' => 'trim'],
             ['email', 'required'],
@@ -39,7 +39,7 @@ 
     public function sendEmail()
     {
         /* @var $user User */
-        $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+        $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
         $user = $class::findOne([
             'status' => UserStatus::ACTIVE,
             'email' => $this->email,
@@ -47,14 +47,14 @@ 
 
         if ($user) {
             if (!ResetPassword::isPasswordResetTokenValid($user->password_reset_token)) {
-                $user->password_reset_token = Yii::$app->security->generateRandomString() . '_' . time();
+                $user->password_reset_token = Yii::$app->security->generateRandomString().'_'.time();
             }
 
             if ($user->save()) {
                 return Yii::$app->mailer->compose(['html' => 'passwordResetToken-html', 'text' => 'passwordResetToken-text'], ['user' => $user])
-                    ->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name . ' robot'])
+                    ->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name.' robot'])
                     ->setTo($this->email)
-                    ->setSubject('Password reset for ' . Yii::$app->name)
+                    ->setSubject('Password reset for '.Yii::$app->name)
                     ->send();
             }
         }