injitools / cms-Inji

system/Inji/ComposerCmd.php

Doc Comments +4 added lines

@@ -58,6 +58,10 @@
         self::command('install', false, $path);
     }
 
+    /**
+     * @param string $command
+     * @param string $path
+     */
     static function command($command, $needOutput = true, $path = null)
     {
         include_once 'composer/vendor/autoload.php';

Spacing +13 added lines, -13 removed lines

@@ -19,7 +19,7 @@ 
             ;
             self::initComposer('./');
         }
-        if (!file_exists(App::$primary->path . '/vendor/autoload.php')) {
+        if (!file_exists(App::$primary->path.'/vendor/autoload.php')) {
             self::initComposer();
         }
     }
@@ -31,7 +31,7 @@ 
             if (!file_exists('composer/composer.phar')) {
                 file_put_contents('composer/composerInstall.php', file_get_contents('https://getcomposer.org/installer'));
                 $argv = ['install', '--install-dir', 'composer/'];
-                header("Location: " . filter_input(INPUT_SERVER, 'REQUEST_URI'));
+                header("Location: ".filter_input(INPUT_SERVER, 'REQUEST_URI'));
                 include_once 'composer/composerInstall.php';
             }
             $composer = new Phar('composer/composer.phar');
@@ -42,18 +42,18 @@ 
     public static function initComposer($path = '')
     {
         if (!$path) {
-            $path = App::$primary->path . '/';
+            $path = App::$primary->path.'/';
         }
-        if (!file_exists($path . 'composer.json')) {
+        if (!file_exists($path.'composer.json')) {
             $json = [
-                "name" => get_current_user() . "/" . App::$primary->name,
+                "name" => get_current_user()."/".App::$primary->name,
                 "config" => [
                     "cache-dir" => "./composerCache/"
                 ],
                 "authors" => [
                     [
                         "name" => get_current_user(),
-                        "email" => get_current_user() . "@" . INJI_DOMAIN_NAME
+                        "email" => get_current_user()."@".INJI_DOMAIN_NAME
                     ]
                 ],
                 "require" => [
@@ -61,7 +61,7 @@ 
                 ]
             ];
             Tools::createDir($path);
-            file_put_contents($path . 'composer.json', json_encode($json, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+            file_put_contents($path.'composer.json', json_encode($json, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
         }
         self::command('install', false, $path);
     }
@@ -74,8 +74,8 @@ 
         } else {
             $output = null;
         }
-        $path = str_replace('\\', '/', $path === null ? App::$primary->path . '/' : $path);
-        $input = new Symfony\Component\Console\Input\StringInput($command . ' -d ' . $path);
+        $path = str_replace('\\', '/', $path === null ? App::$primary->path.'/' : $path);
+        $input = new Symfony\Component\Console\Input\StringInput($command.' -d '.$path);
         $app = new Composer\Console\Application();
         $app->setAutoExit(false);
         $dir = getcwd();
@@ -86,10 +86,10 @@ 
     public static function requirePackage($packageName, $version = '', $path = '')
     {
         if (!$path) {
-            $path = App::$primary->path . '/';
+            $path = App::$primary->path.'/';
         }
-        if (file_exists($path . 'composer.lock')) {
-            $lockFile = json_decode(file_get_contents($path . 'composer.lock'), true);
+        if (file_exists($path.'composer.lock')) {
+            $lockFile = json_decode(file_get_contents($path.'composer.lock'), true);
         }
         if (!empty($lockFile['packages'])) {
             foreach ($lockFile['packages'] as $package) {
@@ -99,7 +99,7 @@ 
             }
         }
 
-        ComposerCmd::command('require ' . $packageName . ($version ? ':' . $version : ''), false, $path);
+        ComposerCmd::command('require '.$packageName.($version ? ':'.$version : ''), false, $path);
         return true;
     }
 

system/Inji/Tools.php

Doc Comments +1 added lines

@@ -216,6 +216,7 @@
      * @param  $number Integer Число на основе которого нужно сформировать окончание
      * @param  $endingsArray  Array Массив слов или окончаний для чисел (1, 4, 5),
      *         например array('яблоко', 'яблока', 'яблок')
+     * @param string[] $endingArray
      * @return String
      */
     static function getNumEnding($number, $endingArray)

Braces +8 added lines, -6 removed lines

@@ -58,8 +58,9 @@ 
      */
     static function createDir($path)
     {
-        if (file_exists($path))
-            return true;
+        if (file_exists($path)) {
+                    return true;
+        }
 
         $path = explode('/', $path);
         $cur = '';
@@ -101,10 +102,11 @@ 
         $imagecreatefromX = "imagecreatefrom{$img_type}";
         $src_res = $imagecreatefromX($img_path);
 
-        if ($img_width / $max_width > $img_height / $max_height)
-            $separator = $img_width / $max_width;
-        else
-            $separator = $img_height / $max_height;
+        if ($img_width / $max_width > $img_height / $max_height) {
+                    $separator = $img_width / $max_width;
+        } else {
+                    $separator = $img_height / $max_height;
+        }
 
         if ($crop === true || $crop == 'q') {
             if ($img_width > $img_height) {

Spacing +12 added lines, -12 removed lines

@@ -38,7 +38,7 @@ 
     public static function uriParse($uri)
     {
         $answerPos = strpos($uri, '?');
-        $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri) )), 1);
+        $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri))), 1);
 
         foreach ($params as $key => $param) {
             if ($param != '') {
@@ -64,7 +64,7 @@ 
         $path = explode('/', $path);
         $cur = '';
         foreach ($path as $item) {
-            $cur .= $item . '/';
+            $cur .= $item.'/';
             if (!file_exists($cur)) {
                 mkdir($cur);
             }
@@ -85,7 +85,7 @@ 
     public static function resizeImage($img_path, $max_width = 1000, $max_height = 1000, $crop = false, $pos = 'center')
     {
         ini_set("gd.jpeg_ignore_warning", 1);
-        list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($img_path);
+        list($img_width, $img_height, $img_type, $img_tag) = getimagesize($img_path);
         switch ($img_type) {
             case 1:
                 $img_type = 'gif';
@@ -108,14 +108,14 @@ 
 
         if ($crop === true || $crop == 'q') {
             if ($img_width > $img_height) {
-                $imgX = floor(( $img_width - $img_height ) / 2);
+                $imgX = floor(($img_width - $img_height) / 2);
                 $imgY = 0;
                 $img_width = $img_height;
                 $new_width = $max_width;
                 $new_height = $max_height;
             } else {
                 $imgX = 0;
-                $imgY = floor(( $img_height - $img_width ) / 2);
+                $imgY = floor(($img_height - $img_width) / 2);
                 $img_height = $img_width;
                 $new_width = $max_width;
                 $new_height = $max_height;
@@ -136,7 +136,7 @@ 
             $new_width = $max_width;
             $new_height = $max_height;
 //Находим начальные координаты (центрируем новое изображение)
-            $imgX = (int) (($ow / 2) - ($img_width / 2) );
+            $imgX = (int) (($ow / 2) - ($img_width / 2));
             if ($pos == 'center') {
                 $imgY = (int) (($oh / 2) - ($img_height / 2));
             } else {
@@ -206,7 +206,7 @@ 
         if (!headers_sent()) {
             header("Location: {$href}");
         } else {
-            echo '\'"><script>window.location="' . $href . '";</script>';
+            echo '\'"><script>window.location="'.$href.'";</script>';
         }
         exit("Перенаправление на: <a href = '{$href}'>{$href}</a>");
     }
@@ -266,7 +266,7 @@ 
             $pathArray = $cleanPathArray;
             $cleanPathArray = [];
         } while ($changes);
-        return (strpos($path, '/') === 0 ? '/' : '') . implode('/', $pathArray);
+        return (strpos($path, '/') === 0 ? '/' : '').implode('/', $pathArray);
     }
 
     /**
@@ -287,7 +287,7 @@ 
         if (empty($month[$mm - 1])) {
             return 'Не указано';
         }
-        return ($dd > 0 ? $dd . " " : '') . $month[$mm - 1] . " " . $yy . " " . $hours;
+        return ($dd > 0 ? $dd." " : '').$month[$mm - 1]." ".$yy." ".$hours;
     }
 
     /**
@@ -369,10 +369,10 @@ 
             if (in_array($file, ['.', '..'])) {
                 continue;
             }
-            if (is_dir($from . '/' . $file)) {
-                self::copyFiles($from . '/' . $file, $to . '/' . $file);
+            if (is_dir($from.'/'.$file)) {
+                self::copyFiles($from.'/'.$file, $to.'/'.$file);
             } else {
-                copy($from . '/' . $file, $to . '/' . $file);
+                copy($from.'/'.$file, $to.'/'.$file);
             }
         }
     }

system/modules/Db/objects/Mysql/Query.php

Doc Comments +6 added lines

@@ -29,6 +29,9 @@ 
     public $params = [];
     public $distinct = false;
 
+    /**
+     * @param  $instance
+     */
     function __construct($instance = null)
     {
         if (!$instance) {
@@ -47,6 +50,9 @@ 
         return $this->curInstance->pdo->lastInsertId();
     }
 
+    /**
+     * @param string $table
+     */
     public function select($table)
     {
         $this->operation = 'SELECT';

Spacing +14 added lines, -14 removed lines

@@ -190,15 +190,15 @@ 
                     $newValue = '';
                     foreach ($value as $item) {
                         if ($newValue) {
-                            $newValue.=',';
+                            $newValue .= ',';
                         }
                         if (is_string($item)) {
-                            $newValue .='"' . $item . '"';
+                            $newValue .= '"'.$item.'"';
                         } else {
-                            $newValue .=$item;
+                            $newValue .= $item;
                         }
                     }
-                    $value = '(' . $newValue . ')';
+                    $value = '('.$newValue.')';
                 } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value))
                     $value = "({$value})";
                 elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value))
@@ -262,8 +262,8 @@ 
 
         switch ($this->operation) {
             case 'SELECT':
-                $query .= ' ' . ($this->distinct ? 'DISTINCT' : '');
-                $query .= ' ' . (!$this->cols ? '*' : ((is_array($this->cols) ? implode(',', $this->cols) : $this->cols)));
+                $query .= ' '.($this->distinct ? 'DISTINCT' : '');
+                $query .= ' '.(!$this->cols ? '*' : ((is_array($this->cols) ? implode(',', $this->cols) : $this->cols)));
             case 'DELETE':
                 $query .= ' FROM';
                 break;
@@ -280,9 +280,9 @@ 
                 $this->params = array_merge($this->params, array_values($this->cols));
                 $colsStr = '';
                 if ($this->cols) {
-                    $colsStr = '`' . implode('`,`', array_keys($this->cols)) . '`';
+                    $colsStr = '`'.implode('`,`', array_keys($this->cols)).'`';
                 }
-                $query .= ' (' . $colsStr . ') VALUES (' . rtrim(str_repeat('?,', count($this->cols)), ',') . ')';
+                $query .= ' ('.$colsStr.') VALUES ('.rtrim(str_repeat('?,', count($this->cols)), ',').')';
                 break;
             case 'CREATE TABLE':
                 $query .= " (";
@@ -294,7 +294,7 @@ 
                 }
                 $query = rtrim($query, ',');
                 if ($this->indexes) {
-                    $query .= ', ' . implode(',', $this->indexes);
+                    $query .= ', '.implode(',', $this->indexes);
                 }
                 $query .= ") ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci";
                 break;
@@ -309,23 +309,23 @@ 
                     }
                 }
                 $update = implode(',', $updates);
-                $query .=" SET {$update}";
+                $query .= " SET {$update}";
             case 'SELECT':
             case 'DELETE':
                 $this->buildWhere($this->where);
                 if ($this->whereString) {
-                    $query .= ' ' . $this->whereString;
+                    $query .= ' '.$this->whereString;
                 }
                 break;
         }
         if ($this->group) {
-            $query .= ' GROUP BY ' . implode(',', $this->group);
+            $query .= ' GROUP BY '.implode(',', $this->group);
         }
         if ($this->order) {
-            $query .= ' ORDER BY ' . implode(',', $this->order);
+            $query .= ' ORDER BY '.implode(',', $this->order);
         }
         if ($this->limit) {
-            $query .= ' ' . $this->limit;
+            $query .= ' '.$this->limit;
         }
         return ['query' => $query, 'params' => $this->params];
     }

Braces +34 added lines, -26 removed lines

@@ -126,12 +126,14 @@ 
         if (!is_array($order)) {
             $this->order[] = "{$order} {$type}";
         } else {
-            foreach ($order as $item)
-                if (!is_array($item)) {
+            foreach ($order as $item) {
+                            if (!is_array($item)) {
                     call_user_func_array(array($this, 'order'), $order);
+            }
                     break;
-                } else
-                    $this->order($item);
+                } else {
+                                    $this->order($item);
+                }
         }
     }
 
@@ -140,8 +142,9 @@ 
         $start = intval($start);
         $len = intval($len);
         $this->limit = "LIMIT {$start}";
-        if ($len !== 0)
-            $this->limit .= ",{$len}";
+        if ($len !== 0) {
+                    $this->limit .= ",{$len}";
+        }
     }
 
     public function buildJoin($table, $where = false, $type = 'LEFT', $alias = '')
@@ -154,10 +157,12 @@ 
             }
         } else {
             $join .= " {$type} JOIN {$this->curInstance->table_prefix}{$table}";
-            if ($alias)
-                $join .= " AS `{$alias}`";
-            if ($where)
-                $join .= " ON {$where}";
+            if ($alias) {
+                            $join .= " AS `{$alias}`";
+            }
+            if ($where) {
+                            $join .= " ON {$where}";
+            }
         }
         return $join;
     }
@@ -177,13 +182,15 @@ 
                 $operation = '=';
             }
 
-            if ($concatenation === false)
-                $concatenation = 'AND';
-            elseif ($concatenation === true)
-                $concatenation = '';
+            if ($concatenation === false) {
+                            $concatenation = 'AND';
+            } elseif ($concatenation === true) {
+                            $concatenation = '';
+            }
 
-            if ($this->whereString == NULL)
-                $this->whereString = ' WHERE ';
+            if ($this->whereString == NULL) {
+                            $this->whereString = ' WHERE ';
+            }
 
             if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
                 if (is_array($value)) {
@@ -209,12 +216,12 @@ 
                 $value = "?";
             }
 
-            if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ')
-                $this->whereString .= " {$where} {$operation} {$value} ";
-            else
-                $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
-        }
-        else {
+            if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ') {
+                            $this->whereString .= " {$where} {$operation} {$value} ";
+            } else {
+                            $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
+            }
+        } else {
             $i = -1;
             while (isset($where[++$i])) {
                 $item = $where[$i];
@@ -229,10 +236,11 @@ 
                         $this->whereString .= "{$concatenation} ";
                     }
 
-                    if ($this->whereString != NULL)
-                        $this->whereString .= '(';
-                    else
-                        $this->whereString = 'WHERE (';
+                    if ($this->whereString != NULL) {
+                                            $this->whereString .= '(';
+                    } else {
+                                            $this->whereString = 'WHERE (';
+                    }
                 }
 
                 if (!is_array($item)) {

system/modules/Modules/Modules.php

Doc Comments +4 added lines

@@ -45,6 +45,10 @@
         return $modelCols;
     }
 
+    /**
+     * @param string $colPrefix
+     * @param string $tableName
+     */
     function parseColsForTable($cols, $colPrefix, $tableName)
     {
 

Spacing +48 added lines, -48 removed lines

@@ -13,19 +13,19 @@ 
     public function createBlankModule($name, $codeName)
     {
         $codeName = ucfirst($codeName);
-        Tools::createDir(App::$primary->path . '/modules/' . $codeName);
+        Tools::createDir(App::$primary->path.'/modules/'.$codeName);
         ob_start();
-        include $this->path . '/tpls/BlankModule.php';
+        include $this->path.'/tpls/BlankModule.php';
         $moduleCode = ob_get_contents();
         ob_end_clean();
-        file_put_contents(App::$primary->path . '/modules/' . $codeName . '/' . $codeName . '.php', $moduleCode);
-        file_put_contents(App::$primary->path . '/modules/' . $codeName . '/info.php', "<?php\nreturn " . CodeGenerator::genArray(['name' => $name]));
-        file_put_contents(App::$primary->path . '/modules/' . $codeName . '/generatorHash.php', "<?php\nreturn " . CodeGenerator::genArray([$codeName . '.php' => md5($moduleCode)]));
+        file_put_contents(App::$primary->path.'/modules/'.$codeName.'/'.$codeName.'.php', $moduleCode);
+        file_put_contents(App::$primary->path.'/modules/'.$codeName.'/info.php', "<?php\nreturn ".CodeGenerator::genArray(['name' => $name]));
+        file_put_contents(App::$primary->path.'/modules/'.$codeName.'/generatorHash.php', "<?php\nreturn ".CodeGenerator::genArray([$codeName.'.php' => md5($moduleCode)]));
     }
 
     public function parseColsForModel($cols = [])
     {
-        $modelCols = [ 'labels' => [], 'cols' => [], 'relations' => []];
+        $modelCols = ['labels' => [], 'cols' => [], 'relations' => []];
         foreach ($cols as $col) {
             $modelCols['labels'][$col['code']] = $col['label'];
             $colType = !empty($col['type']['primary']) ? $col['type']['primary'] : $col['type'];
@@ -50,11 +50,11 @@ 
 
         $colsExist = App::$cur->db->getTableCols($tableName);
         $tableCols = [];
-        if (empty($colsExist[$colPrefix . 'id'])) {
-            $tableCols[$colPrefix . 'id'] = 'pk';
+        if (empty($colsExist[$colPrefix.'id'])) {
+            $tableCols[$colPrefix.'id'] = 'pk';
         }
         foreach ($cols as $col) {
-            if (!empty($colsExist[$colPrefix . $col['code']])) {
+            if (!empty($colsExist[$colPrefix.$col['code']])) {
                 continue;
             }
             $colType = !empty($col['type']['primary']) ? $col['type']['primary'] : $col['type'];
@@ -62,23 +62,23 @@ 
                 case 'image':
                 case 'number':
                 case 'relation':
-                    $tableCols[$colPrefix . $col['code']] = 'int(11) NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'int(11) NOT NULL';
                     break;
                 case 'decimal':
-                    $tableCols[$colPrefix . $col['code']] = 'decimal(11,2) NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'decimal(11,2) NOT NULL';
                     break;
                 case 'dateTime':
-                    $tableCols[$colPrefix . $col['code']] = 'timestamp NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'timestamp NOT NULL';
                     break;
                 case 'currentDateTime':
-                    $tableCols[$colPrefix . $col['code']] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+                    $tableCols[$colPrefix.$col['code']] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
                     break;
                 case 'text':
-                    $tableCols[$colPrefix . $col['code']] = 'varchar(255) NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'varchar(255) NOT NULL';
                     break;
                 case 'textarea':
                 default:
-                    $tableCols[$colPrefix . $col['code']] = 'text NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'text NOT NULL';
                     break;
             }
         }
@@ -94,8 +94,8 @@ 
         $modelCols = $this->parseColsForModel();
         if (!empty($options['cols'])) {
             $modelCols = $this->parseColsForModel($options['cols']);
-            $tableName = strtolower($module) . '_' . strtolower($codeName);
-            $tableCols = $this->parseColsForTable($options['cols'], strtolower($codeName) . '_', $tableName);
+            $tableName = strtolower($module).'_'.strtolower($codeName);
+            $tableCols = $this->parseColsForTable($options['cols'], strtolower($codeName).'_', $tableName);
             if (App::$cur->db->tableExist($tableName)) {
                 foreach ($tableCols as $colKey => $params) {
                     App::$cur->db->add_col($tableName, $colKey, $params);
@@ -107,15 +107,15 @@ 
         $class->addProperty('objectName', $name, true);
         $class->addProperty('cols', $modelCols['cols'], true);
         $class->addProperty('labels', $modelCols['labels'], true);
-        $class->addMethod('relations', 'return ' . CodeGenerator::genArray($modelCols['relations']), [], true);
-        $modelCode = "<?php \n\nnamespace {$module};\n\n" . $class->generate();
+        $class->addMethod('relations', 'return '.CodeGenerator::genArray($modelCols['relations']), [], true);
+        $modelCode = "<?php \n\nnamespace {$module};\n\n".$class->generate();
 
         $modulePath = Module::getModulePath($module);
-        Tools::createDir($modulePath . '/models');
-        file_put_contents($modulePath . '/models/' . $codeName . '.php', $modelCode);
-        $config = Config::custom($modulePath . '/generatorHash.php');
-        $config['models/' . $codeName . '.php'] = md5($modelCode);
-        Config::save($modulePath . '/generatorHash.php', $config);
+        Tools::createDir($modulePath.'/models');
+        file_put_contents($modulePath.'/models/'.$codeName.'.php', $modelCode);
+        $config = Config::custom($modulePath.'/generatorHash.php');
+        $config['models/'.$codeName.'.php'] = md5($modelCode);
+        Config::save($modulePath.'/generatorHash.php', $config);
     }
 
     public function install($module, $params = [])
@@ -135,7 +135,7 @@ 
 
         $type = 'modules';
 
-        $path = INJI_SYSTEM_DIR . '/modules/';
+        $path = INJI_SYSTEM_DIR.'/modules/';
         $location = 'modules';
 
         $config[$location][] = $module;
@@ -148,8 +148,8 @@ 
             }
         }
         Config::save('app', $config, null, App::$primary);
-        if (file_exists($path . $module . '/install_script.php')) {
-            $installFunction = include $path . $module . '/install_script.php';
+        if (file_exists($path.$module.'/install_script.php')) {
+            $installFunction = include $path.$module.'/install_script.php';
             $installFunction(1, $params);
         }
     }
@@ -178,8 +178,8 @@ 
             $info = Modules::getInfo($module);
             $moduleName = !empty($info['name']) ? $info['name'] : $module;
             foreach ($modelsNames as $modelName) {
-                $fullModelName = $module . '\\' . $modelName;
-                $models[$fullModelName] = $moduleName . ' - ' . ($fullModelName::$objectName ? $fullModelName::$objectName : $modelName);
+                $fullModelName = $module.'\\'.$modelName;
+                $models[$fullModelName] = $moduleName.' - '.($fullModelName::$objectName ? $fullModelName::$objectName : $modelName);
             }
         }
         foreach (App::$primary->config['modules'] as $configModule) {
@@ -190,9 +190,9 @@ 
             $info = Modules::getInfo($configModule);
             $moduleName = !empty($info['name']) ? $info['name'] : $configModule;
             foreach ($modelsNames as $modelName) {
-                $fullModelName = $configModule . '\\' . $modelName;
+                $fullModelName = $configModule.'\\'.$modelName;
                 Router::loadClass($fullModelName);
-                $models[$fullModelName] = $moduleName . ' - ' . ($fullModelName::$objectName ? $fullModelName::$objectName : $modelName);
+                $models[$fullModelName] = $moduleName.' - '.($fullModelName::$objectName ? $fullModelName::$objectName : $modelName);
             }
         }
         return $models;
@@ -201,16 +201,16 @@ 
     public function getModelsList($module, $dir = '')
     {
         $modulePath = Module::getModulePath($module);
-        $path = rtrim($modulePath . '/models/' . $dir, '/');
+        $path = rtrim($modulePath.'/models/'.$dir, '/');
         $models = [];
         if (file_exists($path)) {
             foreach (array_slice(scandir($path), 2) as $file) {
                 $modelLastName = pathinfo($file, PATHINFO_FILENAME);
-                if (is_dir($path . '/' . $file)) {
-                    $models = array_merge($models, $this->getModelsList($module, $dir . '/' . $modelLastName));
+                if (is_dir($path.'/'.$file)) {
+                    $models = array_merge($models, $this->getModelsList($module, $dir.'/'.$modelLastName));
                 }
-                $nameSpace = trim(preg_replace('!/' . $modelLastName . '$!', '', $dir), '/');
-                $models[] = trim(str_replace('/', '\\', $nameSpace) . '\\' . $modelLastName, '\\');
+                $nameSpace = trim(preg_replace('!/'.$modelLastName.'$!', '', $dir), '/');
+                $models[] = trim(str_replace('/', '\\', $nameSpace).'\\'.$modelLastName, '\\');
             }
         }
         return $models;
@@ -219,30 +219,30 @@ 
     public function createController($module, $controllerType)
     {
         $modulePath = Module::getModulePath($module);
-        $path = $modulePath . '/' . $controllerType . '/' . $module . 'Controller.php';
+        $path = $modulePath.'/'.$controllerType.'/'.$module.'Controller.php';
         $class = new CodeGenerator\ClassGenerator();
-        $class->name = $module . 'Controller';
+        $class->name = $module.'Controller';
         $class->extends = 'Controller';
-        $controllerCode = "<?php\n\n" . $class->generate();
+        $controllerCode = "<?php\n\n".$class->generate();
         Tools::createDir(pathinfo($path, PATHINFO_DIRNAME));
         file_put_contents($path, $controllerCode);
-        $config = Config::custom($modulePath . '/generatorHash.php');
-        $config[$controllerType . '/' . $module . 'Controller.php'] = md5($controllerCode);
-        Config::save($modulePath . '/generatorHash.php', $config);
+        $config = Config::custom($modulePath.'/generatorHash.php');
+        $config[$controllerType.'/'.$module.'Controller.php'] = md5($controllerCode);
+        Config::save($modulePath.'/generatorHash.php', $config);
     }
 
     public function addActionToController($module, $type, $controller, $url)
     {
         $modulePath = Module::getModulePath($module);
-        $path = Modules::getModulePath($module) . '/' . $type . '/' . $controller . '.php';
+        $path = Modules::getModulePath($module).'/'.$type.'/'.$controller.'.php';
         $class = CodeGenerator::parseClass($path);
-        $class->addMethod($url . 'Action');
-        $controllerCode = "<?php\n\n" . $class->generate();
+        $class->addMethod($url.'Action');
+        $controllerCode = "<?php\n\n".$class->generate();
         Tools::createDir(pathinfo($path, PATHINFO_DIRNAME));
         file_put_contents($path, $controllerCode);
-        $config = Config::custom($modulePath . '/generatorHash.php');
-        $config[$type . '/' . $module . 'Controller.php'] = md5($controllerCode);
-        Config::save($modulePath . '/generatorHash.php', $config);
+        $config = Config::custom($modulePath.'/generatorHash.php');
+        $config[$type.'/'.$module.'Controller.php'] = md5($controllerCode);
+        Config::save($modulePath.'/generatorHash.php', $config);
     }
 
 }

system/modules/Ui/objects/Table.php

Doc Comments +3 added lines

@@ -23,6 +23,9 @@
     public $attributes = [];
     public $indexCol = null;
 
+    /**
+     * @param string[] $cols
+     */
     function setCols($cols)
     {
         $this->cols = $cols;

system/modules/View/View.php

Doc Comments +12 added lines

@@ -147,6 +147,9 @@ 
         return $result[1];
     }
 
+    /**
+     * @param string $source
+     */
     function parseSource($source)
     {
         $tags = $this->parseRaw($source);
@@ -190,6 +193,9 @@ 
         return substr($source, ( $pos + strlen($rawTag) + 2));
     }
 
+    /**
+     * @param string $type
+     */
     function getHref($type, $params)
     {
         $href = '';
@@ -531,6 +537,9 @@ 
         echo round(( microtime(true) - INJI_TIME_START), 4);
     }
 
+    /**
+     * @param string $type
+     */
     function customAsset($type, $asset, $lib = false)
     {
         if (!$lib) {
@@ -549,6 +558,9 @@ 
         }
     }
 
+    /**
+     * @param string $lineParams
+     */
     function widget($_widgetName, $_params = [], $lineParams = null)
     {
         $_paths = $this->getWidgetPaths($_widgetName);

Braces +43 added lines, -32 removed lines

@@ -140,8 +140,9 @@ 
 
     private function parseRaw($source)
     {
-        if (!$source)
-            return [];
+        if (!$source) {
+                    return [];
+        }
 
         preg_match_all("|{([^}]+)}|", $source, $result);
         return $result[1];
@@ -327,10 +328,11 @@ 
                         $this->ResolveCssHref($css, $type, $hrefs);
                         continue;
                     }
-                    if (strpos($css, '//') !== false)
-                        $href = $css;
-                    else
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                    if (strpos($css, '//') !== false) {
+                                            $href = $css;
+                    } else {
+                                            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                    }
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -340,10 +342,11 @@ 
                         $this->ResolveCssHref($css, $type, $hrefs);
                         continue;
                     }
-                    if (strpos($css, '://') !== false)
-                        $href = $css;
-                    else
-                        $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}";
+                    if (strpos($css, '://') !== false) {
+                                            $href = $css;
+                    } else {
+                                            $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}";
+                    }
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -353,10 +356,11 @@ 
                         $this->ResolveCssHref($css, $type, $hrefs);
                         continue;
                     }
-                    if (strpos($css, '//') !== false)
-                        $href = $css;
-                    else
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                    if (strpos($css, '//') !== false) {
+                                            $href = $css;
+                    } else {
+                                            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                    }
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -410,8 +414,9 @@ 
         $noParsedScripts = [];
         foreach ($scripts as $script) {
             if (is_string($script)) {
-                if (!empty($urls[$script]))
-                    continue;
+                if (!empty($urls[$script])) {
+                                    continue;
+                }
 
                 $path = $this->app->staticLoader->parsePath($script);
                 if (file_exists($path)) {
@@ -422,8 +427,9 @@ 
                     $noParsedScripts[$script] = $script;
                 }
             } elseif (!empty($script['file'])) {
-                if (!empty($urls[$script['file']]))
-                    continue;
+                if (!empty($urls[$script['file']])) {
+                                    continue;
+                }
 
                 $path = $this->app->staticLoader->parsePath($script['file']);
                 if (file_exists($path)) {
@@ -482,12 +488,14 @@ 
                         $this->genScriptArray($js, $type, $resultArray);
                         continue;
                     }
-                    if (strpos($js, '//') !== false)
-                        $href = $js;
-                    else
-                        $href = $this->getHref('js', $js);
-                    if (!$href)
-                        continue;
+                    if (strpos($js, '//') !== false) {
+                                            $href = $js;
+                    } else {
+                                            $href = $this->getHref('js', $js);
+                    }
+                    if (!$href) {
+                                            continue;
+                    }
 
                     $resultArray[] = $href;
                 }
@@ -498,10 +506,11 @@ 
                         $this->genScriptArray($js, $type, $resultArray);
                         continue;
                     }
-                    if (strpos($js, '//') !== false)
-                        $href = $js;
-                    else
-                        $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}";
+                    if (strpos($js, '//') !== false) {
+                                            $href = $js;
+                    } else {
+                                            $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}";
+                    }
                     $resultArray[] = $href;
                 }
                 break;
@@ -517,8 +526,9 @@ 
                         $asset = [];
                     }
                     $asset['file'] = $this->getHref('js', $js);
-                    if (!$asset['file'])
-                        continue;
+                    if (!$asset['file']) {
+                                            continue;
+                    }
                     $resultArray[] = $asset;
                 }
                 break;
@@ -568,8 +578,9 @@ 
                         $paramArray = true;
                     }
                 }
-                if (!$paramArray)
-                    $lineParams = ':' . implode(':', $_params);
+                if (!$paramArray) {
+                                    $lineParams = ':' . implode(':', $_params);
+                }
             }
         }
         echo "<!--start:{WIDGET:{$_widgetName}{$lineParams}}-->\n";

Spacing +47 added lines, -47 removed lines

@@ -37,17 +37,17 @@ 
         if (!empty($this->config[$this->app->type]['current'])) {
             $templateName = $this->config[$this->app->type]['current'];
             if (!empty($this->config[$this->app->type]['installed'][$templateName]['location'])) {
-                $this->templatesPath = App::$primary->path . "/templates";
+                $this->templatesPath = App::$primary->path."/templates";
             }
         }
         if (!$this->templatesPath) {
-            $this->templatesPath = $this->app->path . "/templates";
+            $this->templatesPath = $this->app->path."/templates";
         }
         $this->template = \View\Template::get($templateName, $this->app, $this->templatesPath);
         if (!$this->template) {
             $this->template = new \View\Template([
                 'name' => 'default',
-                'path' => $this->templatesPath . '/default',
+                'path' => $this->templatesPath.'/default',
                 'app' => $this->app
             ]);
         }
@@ -164,7 +164,7 @@ 
                 case 'WIDGET':
                     $source = $this->cutTag($source, $rawTag);
                     $params = array_slice($tag, 2);
-                    $this->widget($tag[1], ['params' => $params], ':' . implode(':', $params));
+                    $this->widget($tag[1], ['params' => $params], ':'.implode(':', $params));
                     break;
                 case 'HEAD':
                     $source = $this->cutTag($source, $rawTag);
@@ -187,18 +187,18 @@ 
     {
         $pos = strpos($source, $rawTag) - 1;
         echo substr($source, 0, $pos);
-        return substr($source, ( $pos + strlen($rawTag) + 2));
+        return substr($source, ($pos + strlen($rawTag) + 2));
     }
 
     public function getHref($type, $params)
     {
         $href = '';
         if (is_string($params)) {
-            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $params;
+            $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$params;
         } elseif (empty($params['template']) && !empty($params['file'])) {
-            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $params['file'];
+            $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$params['file'];
         } elseif (!empty($params['template']) && !empty($params['file'])) {
-            $href = $this->app->templatesPath . "/{$this->template->name}/{$type}/{$params['file']}";
+            $href = $this->app->templatesPath."/{$this->template->name}/{$type}/{$params['file']}";
         }
         return $href;
     }
@@ -235,16 +235,16 @@ 
 
         echo "<title>{$this->title}</title>\n";
 
-        if (!empty($this->template->config['favicon']) && file_exists($this->template->path . "/{$this->template->config['favicon']}")) {
+        if (!empty($this->template->config['favicon']) && file_exists($this->template->path."/{$this->template->config['favicon']}")) {
             echo "        <link rel='shortcut icon' href='/templates/{$this->template->name}/{$this->template->config['favicon']}' />";
-        } elseif (!empty($this->template->config['favicon']) && file_exists($this->app->path . "/static/images/{$this->template->config['favicon']}")) {
+        } elseif (!empty($this->template->config['favicon']) && file_exists($this->app->path."/static/images/{$this->template->config['favicon']}")) {
             echo "        <link rel='shortcut icon' href='/static/images/{$this->template->config['favicon']}' />";
-        } elseif (file_exists($this->app->path . '/static/images/favicon.ico')) {
+        } elseif (file_exists($this->app->path.'/static/images/favicon.ico')) {
             echo "        <link rel='shortcut icon' href='/static/images/favicon.ico' />";
         }
 
         foreach ($this->getMetaTags() as $meta) {
-            echo "\n        " . Html::el('meta', $meta, '', null);
+            echo "\n        ".Html::el('meta', $meta, '', null);
         }
 
         if (!empty(Inji::$config['assets']['js'])) {
@@ -255,7 +255,7 @@ 
 
         $this->checkNeedLibs();
         $this->parseCss();
-        echo "\n        <script src='" . Statics::file(($this->app->type != 'app' ? '/' . $this->app->name : '' ) . "/static/system/js/Inji.js") . "'></script>";
+        echo "\n        <script src='".Statics::file(($this->app->type != 'app' ? '/'.$this->app->name : '')."/static/system/js/Inji.js")."'></script>";
     }
 
     public function parseCss()
@@ -279,25 +279,25 @@ 
             if (file_exists($path)) {
                 $this->loadedCss[$href] = $href;
                 $urls[$href] = $path;
-                $timeStr.=filemtime($path);
+                $timeStr .= filemtime($path);
             } else {
                 echo "\n        <link href='{$href}' rel='stylesheet' type='text/css' />";
             }
         }
         $timeMd5 = md5($timeStr);
         $cacheDir = Cache::getDir('static');
-        if (!file_exists($cacheDir . '/all' . $timeMd5 . '.css')) {
+        if (!file_exists($cacheDir.'/all'.$timeMd5.'.css')) {
             foreach ($urls as $primaryUrl => $url) {
                 $source = file_get_contents($url);
                 $rootPath = substr($primaryUrl, 0, strrpos($primaryUrl, '/'));
                 $levelUpPath = substr($rootPath, 0, strrpos($rootPath, '/'));
-                $source = preg_replace('!url\((\'?"?)[\.]{2}!isU', 'url($1' . $levelUpPath, $source);
-                $source = preg_replace('!url\((\'?"?)[\.]{1}!isU', 'url($1' . $rootPath, $source);
-                $source = preg_replace('#url\(([\'"]){1}(?!http|https|/|data\:)([^/])#isU', 'url($1' . $rootPath . '/$2', $source);
-                $source = preg_replace('#url\((?!http|https|/|data\:|\'|")([^/])#isU', 'url(' . $rootPath . '/$1$2', $source);
+                $source = preg_replace('!url\((\'?"?)[\.]{2}!isU', 'url($1'.$levelUpPath, $source);
+                $source = preg_replace('!url\((\'?"?)[\.]{1}!isU', 'url($1'.$rootPath, $source);
+                $source = preg_replace('#url\(([\'"]){1}(?!http|https|/|data\:)([^/])#isU', 'url($1'.$rootPath.'/$2', $source);
+                $source = preg_replace('#url\((?!http|https|/|data\:|\'|")([^/])#isU', 'url('.$rootPath.'/$1$2', $source);
                 $cssAll .= $source;
             }
-            file_put_contents($cacheDir . '/all' . $timeMd5 . '.css', $cssAll);
+            file_put_contents($cacheDir.'/all'.$timeMd5.'.css', $cssAll);
         }
         echo "\n        <link href='/{$cacheDir}/all{$timeMd5}.css' rel='stylesheet' type='text/css' />";
     }
@@ -329,7 +329,7 @@ 
                     if (strpos($css, '//') !== false)
                         $href = $css;
                     else
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                        $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$css;
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -342,7 +342,7 @@ 
                     if (strpos($css, '://') !== false)
                         $href = $css;
                     else
-                        $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}";
+                        $href = $this->app->templatesPath."/{$this->template->name}/css/{$css}";
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -355,7 +355,7 @@ 
                     if (strpos($css, '//') !== false)
                         $href = $css;
                     else
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
+                        $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$css;
                     $hrefs[$href] = $href;
                 }
                 break;
@@ -375,9 +375,9 @@ 
         if (!empty($this->app->config['site']['metatags'])) {
             foreach ($this->app->config['site']['metatags'] as $meta) {
                 if (!empty($meta['name'])) {
-                    $metas['metaName:' . $meta['name']] = $meta;
+                    $metas['metaName:'.$meta['name']] = $meta;
                 } elseif (!empty($meta['property'])) {
-                    $metas['metaProperty:' . $meta['property']] = $meta;
+                    $metas['metaProperty:'.$meta['property']] = $meta;
                 }
             }
         }
@@ -390,9 +390,9 @@ 
     public function addMetaTag($meta)
     {
         if (!empty($meta['name'])) {
-            $this->dynMetas['metaName:' . $meta['name']] = $meta;
+            $this->dynMetas['metaName:'.$meta['name']] = $meta;
         } elseif (!empty($meta['property'])) {
-            $this->dynMetas['metaProperty:' . $meta['property']] = $meta;
+            $this->dynMetas['metaProperty:'.$meta['property']] = $meta;
         }
     }
 
@@ -416,7 +416,7 @@ 
                 if (file_exists($path)) {
                     $nativeUrl[$script] = $script;
                     $urls[$script] = $path;
-                    $timeStr.=filemtime($path);
+                    $timeStr .= filemtime($path);
                 } else {
                     $noParsedScripts[$script] = $script;
                 }
@@ -431,7 +431,7 @@ 
                     if (!empty($script['name'])) {
                         $onLoadModules[$script['name']] = $script['name'];
                     }
-                    $timeStr.=filemtime($path);
+                    $timeStr .= filemtime($path);
                 } else {
                     $noParsedScripts[$script] = $script;
                 }
@@ -440,20 +440,20 @@ 
 
         $timeMd5 = md5($timeStr);
         $cacheDir = Cache::getDir('static');
-        if (!file_exists($cacheDir . '/all' . $timeMd5 . '.js')) {
+        if (!file_exists($cacheDir.'/all'.$timeMd5.'.js')) {
             foreach ($urls as $url) {
-                $scriptAll .= ';' . file_get_contents($url);
+                $scriptAll .= ';'.file_get_contents($url);
             }
-            file_put_contents($cacheDir . '/all' . $timeMd5 . '.js', $scriptAll);
+            file_put_contents($cacheDir.'/all'.$timeMd5.'.js', $scriptAll);
         }
         $options = [
             'scripts' => array_values($noParsedScripts),
             'compresedScripts' => $nativeUrl,
             'styles' => [],
-            'appRoot' => $this->app->type == 'app' ? '/' : '/' . $this->app->name . '/',
+            'appRoot' => $this->app->type == 'app' ? '/' : '/'.$this->app->name.'/',
             'onLoadModules' => $onLoadModules
         ];
-        $options['scripts'][] = '/' . $cacheDir . '/all' . $timeMd5 . '.js';
+        $options['scripts'][] = '/'.$cacheDir.'/all'.$timeMd5.'.js';
         $this->widget('View\bodyEnd', compact('options'));
     }
 
@@ -500,7 +500,7 @@ 
                     if (strpos($js, '//') !== false)
                         $href = $js;
                     else
-                        $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}";
+                        $href = $this->app->templatesPath."/{$this->template->name}/js/{$js}";
                     $resultArray[] = $href;
                 }
                 break;
@@ -537,7 +537,7 @@ 
     {
         if ($add && !empty($this->app->config['site']['name'])) {
             if ($title) {
-                $this->title = $title . ' - ' . $this->app->config['site']['name'];
+                $this->title = $title.' - '.$this->app->config['site']['name'];
             } else {
                 $this->title = $this->app->config['site']['name'];
             }
@@ -566,7 +566,7 @@ 
                     }
                 }
                 if (!$paramArray)
-                    $lineParams = ':' . implode(':', $_params);
+                    $lineParams = ':'.implode(':', $_params);
             }
         }
         echo "<!--start:{WIDGET:{$_widgetName}{$lineParams}}-->\n";
@@ -585,24 +585,24 @@ 
         if (strpos($widgetName, '\\')) {
             $widgetName = explode('\\', $widgetName);
 
-            $paths['templatePath_widgetDir'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName[0] . '/' . $widgetName[1] . '/' . $widgetName[1] . '.php';
-            $paths['templatePath'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName[0] . '/' . $widgetName[1] . '.php';
+            $paths['templatePath_widgetDir'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName[0].'/'.$widgetName[1].'/'.$widgetName[1].'.php';
+            $paths['templatePath'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName[0].'/'.$widgetName[1].'.php';
             App::$cur->$widgetName[0];
             $modulePaths = Module::getModulePaths(ucfirst($widgetName[0]));
             foreach ($modulePaths as $pathName => $path) {
-                $paths[$pathName . '_widgetDir'] = $path . '/widgets/' . $widgetName[1] . '/' . $widgetName[1] . '.php';
-                $paths[$pathName] = $path . '/widgets/' . $widgetName[1] . '.php';
+                $paths[$pathName.'_widgetDir'] = $path.'/widgets/'.$widgetName[1].'/'.$widgetName[1].'.php';
+                $paths[$pathName] = $path.'/widgets/'.$widgetName[1].'.php';
             }
             return $paths;
         } else {
-            $paths['templatePath_widgetDir'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName . '/' . $widgetName . '.php';
-            $paths['templatePath'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName . '.php';
+            $paths['templatePath_widgetDir'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName.'/'.$widgetName.'.php';
+            $paths['templatePath'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName.'.php';
 
-            $paths['curAppPath_widgetDir'] = $this->app->path . '/widgets/' . $widgetName . '/' . $widgetName . '.php';
-            $paths['curAppPath'] = $this->app->path . '/widgets/' . $widgetName . '.php';
+            $paths['curAppPath_widgetDir'] = $this->app->path.'/widgets/'.$widgetName.'/'.$widgetName.'.php';
+            $paths['curAppPath'] = $this->app->path.'/widgets/'.$widgetName.'.php';
 
-            $paths['systemPath_widgetDir'] = INJI_SYSTEM_DIR . '/widgets/' . $widgetName . '/' . $widgetName . '.php';
-            $paths['systemPath'] = INJI_SYSTEM_DIR . '/widgets/' . $widgetName . '.php';
+            $paths['systemPath_widgetDir'] = INJI_SYSTEM_DIR.'/widgets/'.$widgetName.'/'.$widgetName.'.php';
+            $paths['systemPath'] = INJI_SYSTEM_DIR.'/widgets/'.$widgetName.'.php';
         }
         return $paths;
     }

system/objects/CodeGenerator.php

Doc Comments +3 added lines

@@ -31,6 +31,9 @@
         return $return;
     }
 
+    /**
+     * @param string $path
+     */
     static function parseClass($path)
     {
         $code = file_get_contents($path);

Braces +9 added lines, -7 removed lines

@@ -13,20 +13,22 @@
     static function genArray($data, $level = 0)
     {
         $return = '';
-        if ($level == 0)
-            $return = "[";
+        if ($level == 0) {
+                    $return = "[";
+        }
         foreach ($data as $key => $item) {
             $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "'{$key}' => ";
-            if (!is_array($item))
-                $return .= "'{$item}',";
-            else {
+            if (!is_array($item)) {
+                            $return .= "'{$item}',";
+            } else {
                 $return .= "[";
                 $return .= rtrim(self::genArray($item, $level + 1), ',');
                 $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "],";
             }
         }
-        if ($level == 0)
-            $return = rtrim($return, ',') . "\n];";
+        if ($level == 0) {
+                    $return = rtrim($return, ',') . "\n];";
+        }
 
         return $return;
     }

Spacing +3 added lines, -3 removed lines

@@ -16,17 +16,17 @@
         if ($level == 0)
             $return = "[";
         foreach ($data as $key => $item) {
-            $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "'{$key}' => ";
+            $return .= "\n".str_repeat(' ', ($level * 4 + 4))."'{$key}' => ";
             if (!is_array($item))
                 $return .= "'{$item}',";
             else {
                 $return .= "[";
                 $return .= rtrim(self::genArray($item, $level + 1), ',');
-                $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "],";
+                $return .= "\n".str_repeat(' ', ($level * 4 + 4))."],";
             }
         }
         if ($level == 0)
-            $return = rtrim($return, ',') . "\n];";
+            $return = rtrim($return, ',')."\n];";
 
         return $return;
     }

system/Inji/Html.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         $html = "<{$tag}";
         if ($attributes && is_array($attributes)) {
             foreach ($attributes as $key => $value) {
-                $html .=" {$key} = '";
+                $html .= " {$key} = '";
                 if (!is_array($value)) {
                     $html .= addcslashes($value, "'");
                 } else {

system/Inji/Log.php

Braces +13 added lines, -10 removed lines

@@ -79,10 +79,12 @@ 
             if (!empty($log['status'])) {
                 echo "<tr class = '{$log['status']}'><td>{$log['name']}</td><td>{$log['status']}</td></tr>";
             } else {
-                if (empty($log['end']))
-                    $log['end'] = microtime(true);
-                if (empty($log['start']))
-                    $log['start'] = microtime(true);
+                if (empty($log['end'])) {
+                                    $log['end'] = microtime(true);
+                }
+                if (empty($log['start'])) {
+                                    $log['start'] = microtime(true);
+                }
                 echo "<tr><td>{$log['name']}</td><td" . (round(($log['end'] - $log['start']), 5) > 0.1 ? ' class ="danger"' : '') . ">" . round(($log['end'] - $log['start']), 5) . "</td></tr>";
             }
         }
@@ -93,12 +95,13 @@ 
     function convertSize($size)
     {
 
-        if ($size < 1024)
-            return $size . "B";
-        elseif ($size < 1048576)
-            return round($size / 1024, 2) . "KB";
-        else
-            return round($size / 1048576, 2) . "MB";
+        if ($size < 1024) {
+                    return $size . "B";
+        } elseif ($size < 1048576) {
+                    return round($size / 1024, 2) . "KB";
+        } else {
+                    return round($size / 1048576, 2) . "MB";
+        }
     }
 
     function __destruct()

Spacing +6 added lines, -6 removed lines

@@ -83,22 +83,22 @@
                     $log['end'] = microtime(true);
                 if (empty($log['start']))
                     $log['start'] = microtime(true);
-                echo "<tr><td>{$log['name']}</td><td" . (round(($log['end'] - $log['start']), 5) > 0.1 ? ' class ="danger"' : '') . ">" . round(($log['end'] - $log['start']), 5) . "</td></tr>";
+                echo "<tr><td>{$log['name']}</td><td".(round(($log['end'] - $log['start']), 5) > 0.1 ? ' class ="danger"' : '').">".round(($log['end'] - $log['start']), 5)."</td></tr>";
             }
         }
-        echo '<tr><th>Summary</th><th>' . round(( microtime(true) - $this->startTime), 5) . '</th></tr>';
-        echo '<tr><th>Memory</th><th>' . $this->convertSize(memory_get_peak_usage()) . ' of ' . ini_get('memory_limit') . '</th></tr></table></div>';
+        echo '<tr><th>Summary</th><th>'.round((microtime(true) - $this->startTime), 5).'</th></tr>';
+        echo '<tr><th>Memory</th><th>'.$this->convertSize(memory_get_peak_usage()).' of '.ini_get('memory_limit').'</th></tr></table></div>';
     }
 
     public function convertSize($size)
     {
 
         if ($size < 1024)
-            return $size . "B";
+            return $size."B";
         elseif ($size < 1048576)
-            return round($size / 1024, 2) . "KB";
+            return round($size / 1024, 2)."KB";
         else
-            return round($size / 1048576, 2) . "MB";
+            return round($size / 1048576, 2)."MB";
     }
 
     public function __destruct()