injitools / cms-Inji

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 = [])
     {

system/modules/View/View.php

Spacing +4 added lines, -4 removed lines

@@ -178,15 +178,15 @@ 
     public function cutTag($source, $rawTag) {
         $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']}";
         }
@@ -340,7 +340,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;
                 }

Braces +13 added lines, -10 removed lines

@@ -133,8 +133,9 @@ 
     }
 
     private function parseRaw($source) {
-        if (!$source)
-            return [];
+        if (!$source) {
+                    return [];
+        }
 
         preg_match_all("|{([^}]+)}|", $source, $result);
         return $result[1];
@@ -311,10 +312,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;
@@ -324,10 +326,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;

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

Spacing +5 added lines, -5 removed lines

@@ -13,11 +13,11 @@
 
 class Mysql extends \Object {
 
-    public $config = [];       // настройки подключения выбраной базы
-    public $connect = false;        // ярлык соединения с MySQL
-    public $encoding = 'utf-8';        // установленная кодировка
-    public $db_name = 'test';         // выбраная в данный момент база
-    public $table_prefix = 'inji_';   // префикс названий таблиц
+    public $config = []; // настройки подключения выбраной базы
+    public $connect = false; // ярлык соединения с MySQL
+    public $encoding = 'utf-8'; // установленная кодировка
+    public $db_name = 'test'; // выбраная в данный момент база
+    public $table_prefix = 'inji_'; // префикс названий таблиц
     public $pdo = null;
     public $lastQuery = '';
     public $last_error = '';

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

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -184,7 +184,7 @@ 
                             $concatenation = '';
             }
 
-            if ($this->whereString == NULL) {
+            if ($this->whereString == null) {
                             $this->whereString = ' WHERE ';
             }
 
@@ -232,7 +232,7 @@ 
                         $this->whereString .= "{$concatenation} ";
                     }
 
-                    if ($this->whereString != NULL) {
+                    if ($this->whereString != null) {
                                             $this->whereString .= '(';
                     } else {
                                             $this->whereString = 'WHERE (';
@@ -271,7 +271,7 @@ 
                             $concatenation = '';
             }
 
-            if ($this->havingString == NULL) {
+            if ($this->havingString == null) {
                             $this->havingString = ' HAVING ';
             }
 
@@ -319,7 +319,7 @@ 
                         $this->havingString .= "{$concatenation} ";
                     }
 
-                    if ($this->havingString != NULL) {
+                    if ($this->havingString != null) {
                                             $this->havingString .= '(';
                     } else {
                                             $this->havingString = 'HAVING (';

system/Inji/Tools.php

Braces +3 added lines, -2 removed lines

@@ -55,8 +55,9 @@
      * @return boolean
      */
     public static function createDir($path) {
-        if (file_exists($path))
-            return true;
+        if (file_exists($path)) {
+                    return true;
+        }
 
         $path = explode('/', $path);
         $cur = '';