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

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)

Spacing +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
     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 != '') {
@@ -85,7 +85,7 @@ 
     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 {

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) {

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 +4 added lines, -4 removed lines

@@ -190,12 +190,12 @@ 
                     $newValue = '';
                     foreach ($value as $item) {
                         if ($newValue) {
-                            $newValue.=',';
+                            $newValue .= ',';
                         }
                         if (is_string($item)) {
-                            $newValue .='"' . $item . '"';
+                            $newValue .= '"' . $item . '"';
                         } else {
-                            $newValue .=$item;
+                            $newValue .= $item;
                         }
                     }
                     $value = '(' . $newValue . ')';
@@ -309,7 +309,7 @@ 
                     }
                 }
                 $update = implode(',', $updates);
-                $query .=" SET {$update}";
+                $query .= " SET {$update}";
             case 'SELECT':
             case 'DELETE':
                 $this->buildWhere($this->where);

Braces +51 added lines, -40 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)) {
@@ -199,22 +206,22 @@ 
                         }
                     }
                     $value = '(' . $newValue . ')';
-                } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value))
-                    $value = "({$value})";
-                elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value))
-                    $value = "\"{$value}\"";
-            }
-            elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
+                } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
+                                    $value = "({$value})";
+                } elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
+                                    $value = "\"{$value}\"";
+                }
+            } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
                 $this->params[] = $value;
                 $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,28 +236,32 @@ 
                         $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)) {
                     call_user_func_array(array($this, 'buildWhere'), $where);
                     break;
                 } else {
-                    if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(')
-                        if (!isset($item[3]))
+                    if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(') {
+                                            if (!isset($item[3]))
                             $concatenation = 'AND';
-                        else
-                            $concatenation = $item[3];
-                    elseif (substr($this->whereString, -1, 1) != '(')
-                        $this->whereString = 'WHERE ';
+                    } else {
+                                                    $concatenation = $item[3];
+                        }
+                    elseif (substr($this->whereString, -1, 1) != '(') {
+                                            $this->whereString = 'WHERE ';
+                    }
 
                     $this->buildWhere($item);
                 }
-                if (!isset($where[$i + 1]) && isset($where[$i - 1]))
-                    $this->whereString .= ') ';
+                if (!isset($where[$i + 1]) && isset($where[$i - 1])) {
+                                    $this->whereString .= ') ';
+                }
             }
         }
     }

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 +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
     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'];

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 +9 added lines, -9 removed lines

@@ -187,16 +187,16 @@ 
     {
         $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']}";
         }
@@ -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,7 +279,7 @@ 
             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' />";
             }
@@ -330,7 +330,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;
@@ -356,7 +356,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;
@@ -417,7 +417,7 @@ 
                 if (file_exists($path)) {
                     $nativeUrl[$script] = $script;
                     $urls[$script] = $path;
-                    $timeStr.=filemtime($path);
+                    $timeStr .= filemtime($path);
                 } else {
                     $noParsedScripts[$script] = $script;
                 }
@@ -432,7 +432,7 @@ 
                     if (!empty($script['name'])) {
                         $onLoadModules[$script['name']] = $script['name'];
                     }
-                    $timeStr.=filemtime($path);
+                    $timeStr .= filemtime($path);
                 } else {
                     $noParsedScripts[$script] = $script;
                 }

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

Spacing +2 added lines, -2 removed lines

@@ -16,13 +16,13 @@
         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)

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

index.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     }
 }
 
-require_once( INJI_SYSTEM_DIR . '/init.php' );
+require_once(INJI_SYSTEM_DIR . '/init.php');
 /**
  * System error messages
  */

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 {