injitools / cms-Inji

system/modules/Dashboard/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

system/modules/Ecommerce/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

system/modules/Exchange1c/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

system/modules/Materials/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

system/modules/Sliders/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

system/modules/TextBlocks/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

system/modules/UserForms/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

system/Inji/Module.php

Doc Comments +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
      * Get all posible directorys for module files
      * 
      * @param string $moduleName
-     * @return array
+     * @return string
      */
     public static function getModulePaths($moduleName)
     {
@@ -131,7 +131,7 @@ 
      * Get installed modules for app
      * 
      * @param \App $app
-     * @param boolean|\App $primary
+     * @param App $primary
      * @return array
      */
     public static function getInstalled($app, $primary = false)

Spacing +33 added lines, -33 removed lines

@@ -72,7 +72,7 @@ 
         $this->info = $this->getInfo();
         $this->config = Config::module($this->moduleName, !empty($this->info['systemConfig']));
         $that = $this;
-        Inji::$inst->listen('Config-change-module-' . $this->app->name . '-' . $this->moduleName, $this->app->name . '-' . $this->moduleName . 'config', function($event) use ($that) {
+        Inji::$inst->listen('Config-change-module-'.$this->app->name.'-'.$this->moduleName, $this->app->name.'-'.$this->moduleName.'config', function($event) use ($that) {
             $that->config = $event['eventObject'];
         });
     }
@@ -88,10 +88,10 @@ 
         $moduleName = ucfirst($moduleName);
         $paths = [];
         if (App::$cur !== App::$primary) {
-            $paths['primaryAppPath'] = App::$primary->path . '/modules/' . $moduleName;
+            $paths['primaryAppPath'] = App::$primary->path.'/modules/'.$moduleName;
         }
-        $paths['curAppPath'] = App::$cur->path . '/modules/' . $moduleName;
-        $paths['systemPath'] = INJI_SYSTEM_DIR . '/modules/' . $moduleName;
+        $paths['curAppPath'] = App::$cur->path.'/modules/'.$moduleName;
+        $paths['systemPath'] = INJI_SYSTEM_DIR.'/modules/'.$moduleName;
         return $paths;
     }
 
@@ -106,7 +106,7 @@ 
         $moduleName = ucfirst($moduleName);
         $paths = Module::getModulePaths($moduleName);
         foreach ($paths as $path) {
-            if (file_exists($path . '/' . $moduleName . '.php')) {
+            if (file_exists($path.'/'.$moduleName.'.php')) {
                 return $path;
             }
         }
@@ -159,12 +159,12 @@ 
         foreach ($moduleDirs as $moduleDir) {
             if (is_dir($moduleDir)) {
                 foreach (scandir($moduleDir) as $dir) {
-                    if (preg_match('!Controllers$!', $dir) && is_dir($moduleDir . '/' . $dir)) {
-                        $path = $moduleDir . '/' . $dir;
+                    if (preg_match('!Controllers$!', $dir) && is_dir($moduleDir.'/'.$dir)) {
+                        $path = $moduleDir.'/'.$dir;
                         foreach (scandir($path) as $file) {
-                            if (preg_match('!Controller\.php$!', $file) && is_file($path . '/' . $file)) {
+                            if (preg_match('!Controller\.php$!', $file) && is_file($path.'/'.$file)) {
                                 $controllerName = preg_replace('!Controller\.php$!', '', $file);
-                                $controllers[preg_replace('!Controllers$!', '', $dir)][$controllerName] = $path . '/' . $file;
+                                $controllers[preg_replace('!Controllers$!', '', $dir)][$controllerName] = $path.'/'.$file;
                             }
                         }
                     }
@@ -211,31 +211,31 @@ 
         $paths = [];
         if (App::$cur != App::$primary) {
             if (!empty($this->params[0]) && strtolower($this->params[0]) != strtolower($this->moduleName)) {
-                $paths['primaryAppAppTypePath_slice'] = App::$primary->path . '/modules/' . $this->moduleName . '/' . $this->app->type . 'Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
+                $paths['primaryAppAppTypePath_slice'] = App::$primary->path.'/modules/'.$this->moduleName.'/'.$this->app->type.'Controllers/'.ucfirst($this->params[0]).'Controller.php';
                 if (App::$primary->{$this->moduleName}) {
-                    $paths['primaryAppAppTypePath_slice'] = App::$primary->{$this->moduleName}->path . '/' . $this->app->type . 'Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
+                    $paths['primaryAppAppTypePath_slice'] = App::$primary->{$this->moduleName}->path.'/'.$this->app->type.'Controllers/'.ucfirst($this->params[0]).'Controller.php';
                 }
             }
-            $paths['primaryAppAppAppTypePath'] = App::$primary->path . '/modules/' . $this->moduleName . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
+            $paths['primaryAppAppAppTypePath'] = App::$primary->path.'/modules/'.$this->moduleName.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
             if (App::$primary->{$this->moduleName}) {
-                $paths['primaryAppAppTypePath'] = App::$primary->{$this->moduleName}->path . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
+                $paths['primaryAppAppTypePath'] = App::$primary->{$this->moduleName}->path.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
             }
-            $paths['curAppAppTypePath'] = $this->app->{$this->moduleName}->path . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
+            $paths['curAppAppTypePath'] = $this->app->{$this->moduleName}->path.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
         }
 
         if (!empty($this->params[0]) && strtolower($this->params[0]) != strtolower($this->moduleName)) {
-            $paths['appAppTypePath_slice'] = $this->app->path . '/modules/' . $this->moduleName . '/' . $this->app->type . 'Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
-            $paths['appTypePath_slice'] = $this->path . '/' . $this->app->type . 'Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
+            $paths['appAppTypePath_slice'] = $this->app->path.'/modules/'.$this->moduleName.'/'.$this->app->type.'Controllers/'.ucfirst($this->params[0]).'Controller.php';
+            $paths['appTypePath_slice'] = $this->path.'/'.$this->app->type.'Controllers/'.ucfirst($this->params[0]).'Controller.php';
         }
-        $paths['appAppTypePath'] = $this->app->path . '/modules/' . $this->moduleName . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
-        $paths['appTypePath'] = $this->path . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
+        $paths['appAppTypePath'] = $this->app->path.'/modules/'.$this->moduleName.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
+        $paths['appTypePath'] = $this->path.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
 
         if (!empty($this->params[0]) && strtolower($this->params[0]) != strtolower($this->moduleName)) {
-            $paths['appUniversalPath_slice'] = $this->app->path . '/modules/' . $this->moduleName . '/Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
-            $paths['universalPath_slice'] = $this->path . '/Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
+            $paths['appUniversalPath_slice'] = $this->app->path.'/modules/'.$this->moduleName.'/Controllers/'.ucfirst($this->params[0]).'Controller.php';
+            $paths['universalPath_slice'] = $this->path.'/Controllers/'.ucfirst($this->params[0]).'Controller.php';
         }
-        $paths['appUniversalPath'] = $this->app->path . '/modules/' . $this->moduleName . '/Controllers/' . $this->moduleName . 'Controller.php';
-        $paths['universalPath'] = $this->path . '/Controllers/' . $this->moduleName . 'Controller.php';
+        $paths['appUniversalPath'] = $this->app->path.'/modules/'.$this->moduleName.'/Controllers/'.$this->moduleName.'Controller.php';
+        $paths['universalPath'] = $this->path.'/Controllers/'.$this->moduleName.'Controller.php';
 
         return $paths;
     }
@@ -258,7 +258,7 @@ 
                     $controllerName = $this->moduleName;
                     $params = $this->params;
                 }
-                $fullControllerName = $controllerName . 'Controller';
+                $fullControllerName = $controllerName.'Controller';
                 $controller = new $fullControllerName();
                 $controller->params = $params;
                 $controller->module = $this;
@@ -284,8 +284,8 @@ 
         }
         $paths = Module::getModulePaths($moduleName);
         foreach ($paths as $path) {
-            if (file_exists($path . '/info.php')) {
-                return include $path . '/info.php';
+            if (file_exists($path.'/info.php')) {
+                return include $path.'/info.php';
             }
         }
         return [];
@@ -304,16 +304,16 @@ 
     {
         $moduleName = $moduleName ? $moduleName : $this->moduleName;
         $modulePaths = Module::getModulePaths($moduleName);
-        $modulePaths['templatePath'] = App::$cur->view->template->path . '/modules/' . ucfirst($moduleName);
+        $modulePaths['templatePath'] = App::$cur->view->template->path.'/modules/'.ucfirst($moduleName);
         $snippets = [];
         foreach ($modulePaths as $path) {
-            if (file_exists($path . $dir . '/' . $snippetsPath)) {
-                $snippetsPaths = array_slice(scandir($path . $dir . '/' . $snippetsPath), 2);
+            if (file_exists($path.$dir.'/'.$snippetsPath)) {
+                $snippetsPaths = array_slice(scandir($path.$dir.'/'.$snippetsPath), 2);
                 foreach ($snippetsPaths as $snippetPath) {
-                    if (is_dir($path . $dir . '/' . $snippetsPath . '/' . $snippetPath)) {
-                        $snippets[$snippetPath] = include $path . $dir . '/' . $snippetsPath . '/' . $snippetPath . '/info.php';
+                    if (is_dir($path.$dir.'/'.$snippetsPath.'/'.$snippetPath)) {
+                        $snippets[$snippetPath] = include $path.$dir.'/'.$snippetsPath.'/'.$snippetPath.'/info.php';
                     } else {
-                        $snippets[pathinfo($snippetPath, PATHINFO_FILENAME)] = include $path . $dir . '/' . $snippetsPath . '/' . $snippetPath;
+                        $snippets[pathinfo($snippetPath, PATHINFO_FILENAME)] = include $path.$dir.'/'.$snippetsPath.'/'.$snippetPath;
                     }
                 }
             }
@@ -335,9 +335,9 @@ 
     {
         $extensions = [];
         $modules = Module::getInstalled(App::$cur);
-        $method = 'get' . ucfirst($extensionType);
+        $method = 'get'.ucfirst($extensionType);
         foreach ($modules as $module) {
-            $extensions = array_merge($extensions, $this->{$method}($request, false, "/extensions/{$this->moduleName}/" . $extensionType, $module));
+            $extensions = array_merge($extensions, $this->{$method}($request, false, "/extensions/{$this->moduleName}/".$extensionType, $module));
         }
         return $extensions;
     }

system/Inji/Model.php

Doc Comments +4 added lines, -4 removed lines

@@ -357,7 +357,7 @@ 
     /**
      * Information extractor for col relations path
      * 
-     * @param string|array $info
+     * @param string $info
      * @return array
      */
     public static function parseColRecursion($info)
@@ -433,7 +433,7 @@ 
      * Generate params string for col by name
      * 
      * @param string $colName
-     * @return boolean|string
+     * @return false|string
      */
     public static function genColParams($colName)
     {
@@ -573,7 +573,7 @@ 
     /**
      * return relations list
      * 
-     * @return array
+     * @return string
      */
     public static function relations()
     {
@@ -1065,7 +1065,7 @@ 
      * 
      * @param array $params
      * @param array $where
-     * @return boolean
+     * @return false|null
      */
     public static function update($params, $where = [])
     {

Spacing +54 added lines, -54 removed lines

@@ -211,7 +211,7 @@ 
                         $relModel = $relations[$colInfo['colParams']['relation']]['model'];
                         $relModel = strpos($relModel, '\\') === 0 ? substr($relModel, 1) : $relModel;
                         if ($manageHref) {
-                            $value = $relValue ? "<a href='/admin/" . str_replace('\\', '/view/', $relModel) . "/" . $relValue->pk() . "'>" . $relValue->name() . "</a>" : 'Не задано';
+                            $value = $relValue ? "<a href='/admin/".str_replace('\\', '/view/', $relModel)."/".$relValue->pk()."'>".$relValue->name()."</a>" : 'Не задано';
                         } else {
                             $value = $relValue ? $relValue->name() : 'Не задано';
                         }
@@ -221,7 +221,7 @@ 
             case 'image':
                 $file = Files\File::get($item->$colName);
                 if ($file) {
-                    $value = '<img src="' . $file->path . '?resize=60x120" />';
+                    $value = '<img src="'.$file->path.'?resize=60x120" />';
                 } else {
                     $value = '<img src="/static/system/images/no-image.png?resize=60x120" />';
                 }
@@ -259,12 +259,12 @@ 
             return;
         }
         if (!is_array($array)) {
-            if (!isset($cols[static::colPrefix() . $array]) && isset(static::$cols[$array])) {
+            if (!isset($cols[static::colPrefix().$array]) && isset(static::$cols[$array])) {
                 static::createCol($array);
                 $cols = static::cols(true);
             }
-            if (!isset($cols[$array]) && isset($cols[static::colPrefix() . $array])) {
-                $array = static::colPrefix() . $array;
+            if (!isset($cols[$array]) && isset($cols[static::colPrefix().$array])) {
+                $array = static::colPrefix().$array;
             } else {
                 static::checkForJoin($array, $rootModel);
             }
@@ -273,14 +273,14 @@ 
         switch ($searchtype) {
             case 'key':
                 foreach ($array as $key => $item) {
-                    if (!isset($cols[static::colPrefix() . $key]) && isset(static::$cols[$key])) {
+                    if (!isset($cols[static::colPrefix().$key]) && isset(static::$cols[$key])) {
                         static::createCol($key);
                         $cols = static::cols(true);
                     }
-                    if (!isset($cols[$key]) && isset($cols[static::colPrefix() . $key])) {
-                        $array[static::colPrefix() . $key] = $item;
+                    if (!isset($cols[$key]) && isset($cols[static::colPrefix().$key])) {
+                        $array[static::colPrefix().$key] = $item;
                         unset($array[$key]);
-                        $key = static::colPrefix() . $key;
+                        $key = static::colPrefix().$key;
                     }
                     if (is_array($array[$key])) {
                         static::fixPrefix($array[$key], 'key', $rootModel);
@@ -291,12 +291,12 @@ 
                 break;
             case 'first':
                 if (isset($array[0]) && is_string($array[0])) {
-                    if (!isset($cols[static::colPrefix() . $array[0]]) && isset(static::$cols[$array[0]])) {
+                    if (!isset($cols[static::colPrefix().$array[0]]) && isset(static::$cols[$array[0]])) {
                         static::createCol($array[0]);
                         $cols = static::cols(true);
                     }
-                    if (!isset($cols[$array[0]]) && isset($cols[static::colPrefix() . $array[0]])) {
-                        $array[0] = static::colPrefix() . $array[0];
+                    if (!isset($cols[$array[0]]) && isset($cols[static::colPrefix().$array[0]])) {
+                        $array[0] = static::colPrefix().$array[0];
                     } else {
                         static::checkForJoin($array[0], $rootModel);
                     }
@@ -329,13 +329,13 @@ 
                     case 'to':
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
-                        $rootModel::$relJoins[$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol];
+                        $rootModel::$relJoins[$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol];
                         break;
                     case 'one':
                     case 'many':
                         $relCol = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($relCol);
-                        $rootModel::$relJoins[$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), static::index() . ' = ' . $relCol];
+                        $rootModel::$relJoins[$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), static::index().' = '.$relCol];
                         break;
                 }
                 $relations[$rel]['model']::fixPrefix($col, 'key', $rootModel);
@@ -376,13 +376,13 @@ 
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
                         //$info['modelName'] = $relations[$rel]['model'];
-                        $info['joins'][$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol];
+                        $info['joins'][$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol];
                         break;
                     case 'one':
                         $relCol = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($relCol);
                         //$info['modelName'] = $relations[$rel]['model'];
-                        $info['joins'][$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), static::index() . ' = ' . $relCol];
+                        $info['joins'][$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), static::index().' = '.$relCol];
                         break;
                 }
                 $info = $relations[$rel]['model']::parseColRecursion($info);
@@ -400,8 +400,8 @@ 
             } else {
                 $info['colParams'] = [];
             }
-            if (!isset($cols[$info['col']]) && isset($cols[static::colPrefix() . $info['col']])) {
-                $info['col'] = static::colPrefix() . $info['col'];
+            if (!isset($cols[$info['col']]) && isset($cols[static::colPrefix().$info['col']])) {
+                $info['col'] = static::colPrefix().$info['col'];
             }
             $info['modelName'] = get_called_class();
         }
@@ -507,7 +507,7 @@ 
         if ($params === false) {
             return false;
         }
-        return App::$cur->db->addCol(static::table(), static::colPrefix() . $colName, $params);
+        return App::$cur->db->addCol(static::table(), static::colPrefix().$colName, $params);
     }
 
     public static function createTable()
@@ -537,28 +537,28 @@ 
             return true;
         }
         $cols = [
-            $colPrefix . 'id' => 'pk'
+            $colPrefix.'id' => 'pk'
         ];
         $className = get_called_class();
         if (!empty($className::$cols)) {
             foreach ($className::$cols as $colName => $colParams) {
                 if ($colName == 'date_create') {
-                    $cols[$colPrefix . 'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+                    $cols[$colPrefix.'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
                     continue;
                 }
                 $params = $className::genColParams($colName);
                 if ($params) {
-                    $cols[$colPrefix . $colName] = $params;
+                    $cols[$colPrefix.$colName] = $params;
                 }
             }
         }
-        if (empty($cols[$colPrefix . 'date_create'])) {
-            $cols[$colPrefix . 'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+        if (empty($cols[$colPrefix.'date_create'])) {
+            $cols[$colPrefix.'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
         }
         $tableIndexes = [];
         if ($indexes) {
             foreach ($indexes as $indexName => $index) {
-                $tableIndexes[] = $index['type'] . ' ' . App::$cur->db->table_prefix . $indexName . ' (' . implode(',', $index['cols']) . ')';
+                $tableIndexes[] = $index['type'].' '.App::$cur->db->table_prefix.$indexName.' ('.implode(',', $index['cols']).')';
             }
         }
 
@@ -584,7 +584,7 @@ 
     public static function index()
     {
 
-        return static::colPrefix() . 'id';
+        return static::colPrefix().'id';
     }
 
     /**
@@ -596,7 +596,7 @@ 
     {
         $classPath = explode('\\', get_called_class());
         $classPath = array_slice($classPath, 1);
-        return strtolower(implode('_', $classPath)) . '_';
+        return strtolower(implode('_', $classPath)).'_';
     }
 
     /**
@@ -661,12 +661,12 @@ 
                     case 'to':
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
-                        App::$cur->db->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+                        App::$cur->db->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
                         break;
                     case 'one':
                         $col = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($col);
-                        App::$cur->db->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+                        App::$cur->db->join($relations[$rel]['model']::table(), static::index().' = '.$col);
                         break;
                 }
             }
@@ -681,8 +681,8 @@ 
             }
             if ($param !== null) {
                 $cols = static::cols();
-                if (!isset($cols[$col]) && isset($cols[static::colPrefix() . $col])) {
-                    $col = static::colPrefix() . $col;
+                if (!isset($cols[$col]) && isset($cols[static::colPrefix().$col])) {
+                    $col = static::colPrefix().$col;
                 }
                 App::$cur->db->where($col, $param);
             } else {
@@ -742,12 +742,12 @@ 
                     case 'to':
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
-                        $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+                        $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
                         break;
                     case 'one':
                         $col = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($col);
-                        $query->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+                        $query->join($relations[$rel]['model']::table(), static::index().' = '.$col);
                         break;
                 }
             }
@@ -1063,12 +1063,12 @@ 
                     case 'to':
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
-                        $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+                        $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
                         break;
                     case 'one':
                         $col = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($col);
-                        $query->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+                        $query->join($relations[$rel]['model']::table(), static::index().' = '.$col);
                         break;
                 }
             }
@@ -1085,7 +1085,7 @@ 
         } else {
             $cols .= '*';
         }
-        $cols .=') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : '');
+        $cols .= ') as `count`'.(!empty($options['cols']) ? ','.$options['cols'] : '');
         $query->cols = $cols;
         if (!empty($options['group'])) {
             $query->group($options['group']);
@@ -1223,25 +1223,25 @@ 
         $itemModel = $class::$treeCategory;
         $oldPath = $this->tree_path;
         $this->tree_path = $this->getCatalogTree($this);
-        $itemsTable = \App::$cur->db->table_prefix . $itemModel::table();
-        $itemTreeCol = $itemModel::colPrefix() . 'tree_path';
+        $itemsTable = \App::$cur->db->table_prefix.$itemModel::table();
+        $itemTreeCol = $itemModel::colPrefix().'tree_path';
 
-        $categoryTreeCol = $this->colPrefix() . 'tree_path';
-        $categoryTable = \App::$cur->db->table_prefix . $this->table();
+        $categoryTreeCol = $this->colPrefix().'tree_path';
+        $categoryTable = \App::$cur->db->table_prefix.$this->table();
         if ($oldPath) {
             \App::$cur->db->query('UPDATE
-                ' . $categoryTable . ' 
+                ' . $categoryTable.' 
                     SET 
-                        ' . $categoryTreeCol . ' = REPLACE(' . $categoryTreeCol . ', "' . $oldPath . $this->id . '/' . '", "' . $this->tree_path . $this->id . '/' . '") 
-                    WHERE ' . $categoryTreeCol . ' LIKE "' . $oldPath . $this->id . '/' . '%"');
+                        ' . $categoryTreeCol.' = REPLACE('.$categoryTreeCol.', "'.$oldPath.$this->id.'/'.'", "'.$this->tree_path.$this->id.'/'.'") 
+                    WHERE ' . $categoryTreeCol.' LIKE "'.$oldPath.$this->id.'/'.'%"');
 
             \App::$cur->db->query('UPDATE
-                ' . $itemsTable . '
+                ' . $itemsTable.'
                     SET 
-                        ' . $itemTreeCol . ' = REPLACE(' . $itemTreeCol . ', "' . $oldPath . $this->id . '/' . '", "' . $this->tree_path . $this->id . '/' . '") 
-                    WHERE ' . $itemTreeCol . ' LIKE "' . $oldPath . $this->id . '/' . '%"');
+                        ' . $itemTreeCol.' = REPLACE('.$itemTreeCol.', "'.$oldPath.$this->id.'/'.'", "'.$this->tree_path.$this->id.'/'.'") 
+                    WHERE ' . $itemTreeCol.' LIKE "'.$oldPath.$this->id.'/'.'%"');
         }
-        $itemModel::update([$itemTreeCol => $this->tree_path . $this->id . '/'], [$itemModel::colPrefix() . $this->index(), $this->id]);
+        $itemModel::update([$itemTreeCol => $this->tree_path.$this->id.'/'], [$itemModel::colPrefix().$this->index(), $this->id]);
     }
 
     /**
@@ -1256,9 +1256,9 @@ 
         $catalogParent = $catalogClass::get($catalog->parent_id);
         if ($catalog && $catalogParent) {
             if ($catalogParent->tree_path) {
-                return $catalogParent->tree_path . $catalogParent->id . '/';
+                return $catalogParent->tree_path.$catalogParent->id.'/';
             } else {
-                return $this->getCatalogTree($catalogParent) . $catalogParent->id . '/';
+                return $this->getCatalogTree($catalogParent).$catalogParent->id.'/';
             }
         }
         return '/';
@@ -1273,7 +1273,7 @@ 
         $categoryModel = $class::$categoryModel;
         $category = $categoryModel::get($this->{$categoryModel::index()});
         if ($category) {
-            $this->tree_path = $category->tree_path . $category->pk() . '/';
+            $this->tree_path = $category->tree_path.$category->pk().'/';
         } else {
             $this->tree_path = '/';
         }
@@ -1299,7 +1299,7 @@ 
             $this->changeCategoryTree();
         }
         if (!empty($this->_changedParams) && $this->pk()) {
-            Inji::$inst->event('modelItemParamsChanged-' . get_called_class(), $this);
+            Inji::$inst->event('modelItemParamsChanged-'.get_called_class(), $this);
         }
         $this->beforeSave();
 
@@ -1337,7 +1337,7 @@ 
         }
         $this->_params = $result->fetch();
         if ($new) {
-            Inji::$inst->event('modelCreatedItem-' . get_called_class(), $this);
+            Inji::$inst->event('modelCreatedItem-'.get_called_class(), $this);
         }
         $this->afterSave();
         return $this->{$this->index()};
@@ -1483,7 +1483,7 @@ 
         static::fixPrefix($params);
         $className = get_called_class();
         foreach ($params as $paramName => $value) {
-            $shortName = preg_replace('!' . $this->colPrefix() . '!', '', $paramName);
+            $shortName = preg_replace('!'.$this->colPrefix().'!', '', $paramName);
             if (!empty($className::$cols[$shortName])) {
                 switch ($className::$cols[$shortName]['type']) {
                     case 'decimal':
@@ -1763,7 +1763,7 @@ 
     {
         static::fixPrefix($name);
         $className = get_called_class();
-        $shortName = preg_replace('!' . $this->colPrefix() . '!', '', $name);
+        $shortName = preg_replace('!'.$this->colPrefix().'!', '', $name);
         if (!empty($className::$cols[$shortName])) {
             switch ($className::$cols[$shortName]['type']) {
                 case 'decimal':

Braces +40 added lines, -32 removed lines

@@ -260,8 +260,7 @@ 
                             } else {
                                 $value = $item->$colName;
                             }
-                        }
-                        else {
+                        } else {
                             $value = $item->$colName;
                         }
                         break;
@@ -751,17 +750,21 @@ 
         if (!$query) {
             return [];
         }
-        if (!empty($options['where']))
-            $query->where($options['where']);
+        if (!empty($options['where'])) {
+                    $query->where($options['where']);
+        }
         if (!empty($options['group'])) {
             $query->group($options['group']);
         }
-        if (!empty($options['order']))
-            $query->order($options['order']);
-        if (!empty($options['join']))
-            $query->join($options['join']);
-        if (!empty($options['distinct']))
-            $query->distinct = $options['distinct'];
+        if (!empty($options['order'])) {
+                    $query->order($options['order']);
+        }
+        if (!empty($options['join'])) {
+                    $query->join($options['join']);
+        }
+        if (!empty($options['distinct'])) {
+                    $query->distinct = $options['distinct'];
+        }
 
         foreach (static::$relJoins as $join) {
             $query->join($join[0], $join[1]);
@@ -787,14 +790,14 @@ 
         }
         static::$needJoin = [];
 
-        if (!empty($options['limit']))
-            $limit = (int) $options['limit'];
-        else {
+        if (!empty($options['limit'])) {
+                    $limit = (int) $options['limit'];
+        } else {
             $limit = 0;
         }
-        if (!empty($options['start']))
-            $start = (int) $options['start'];
-        else {
+        if (!empty($options['start'])) {
+                    $start = (int) $options['start'];
+        } else {
             $start = 0;
         }
         if ($limit || $start) {
@@ -1061,21 +1064,23 @@ 
         if (!empty($options['where'])) {
             static::fixPrefix($options['where'], 'first');
         }
-        if (!empty($options['where']))
-            $query->where($options['where']);
-        if (!empty($options['join']))
-            $query->join($options['join']);
+        if (!empty($options['where'])) {
+                    $query->where($options['where']);
+        }
+        if (!empty($options['join'])) {
+                    $query->join($options['join']);
+        }
         if (!empty($options['order'])) {
             $query->order($options['order']);
         }
-        if (!empty($options['limit']))
-            $limit = (int) $options['limit'];
-        else {
+        if (!empty($options['limit'])) {
+                    $limit = (int) $options['limit'];
+        } else {
             $limit = 0;
         }
-        if (!empty($options['start']))
-            $start = (int) $options['start'];
-        else {
+        if (!empty($options['start'])) {
+                    $start = (int) $options['start'];
+        } else {
             $start = 0;
         }
         if ($limit || $start) {
@@ -1153,8 +1158,9 @@ 
 
         $values = [];
         foreach ($cols as $col => $param) {
-            if (isset($params[$col]))
-                $values[$col] = $params[$col];
+            if (isset($params[$col])) {
+                            $values[$col] = $params[$col];
+            }
         }
         if (empty($values)) {
             return false;
@@ -1337,8 +1343,9 @@ 
         $values = [];
 
         foreach ($this->cols() as $col => $param) {
-            if (isset($this->_params[$col]))
-                $values[$col] = $this->_params[$col];
+            if (isset($this->_params[$col])) {
+                            $values[$col] = $this->_params[$col];
+            }
         }
         if (empty($values) && empty($options['empty'])) {
             return false;
@@ -1498,8 +1505,9 @@ 
     {
 
         foreach (static::relations() as $relName => $rel) {
-            if ($rel['col'] == $col)
-                return $relName;
+            if ($rel['col'] == $col) {
+                            return $relName;
+            }
         }
         return NULL;
     }