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)

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

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

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/Users/Users.php

Doc Comments +6 added lines

@@ -92,6 +92,9 @@ 
         }
     }
 
+    /**
+     * @param string $user_mail
+     */
     function passre($user_mail)
     {
         $user = $this->get($user_mail, 'mail');
@@ -312,6 +315,9 @@ 
         return $user->id;
     }
 
+    /**
+     * @param string $pass
+     */
     function hashpass($pass)
     {
         return password_hash($pass, PASSWORD_DEFAULT);

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

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

system/objects/IdnaConvert.php

Doc Comments +5 added lines, -5 removed lines

@@ -89,7 +89,7 @@ 
      * the constructor
      *
      * @param array $options
-     * @return boolean
+     * @return boolean|null
      * @since 0.5.2
      */
     public function __construct($options = false)
@@ -388,7 +388,7 @@ 
     /**
      * Use this method to get the last error ocurred
      * @param    void
-     * @return   string   The last error, that occured
+     * @return   boolean   The last error, that occured
      */
     public function get_last_error()
     {
@@ -398,7 +398,7 @@ 
     /**
      * The actual decoding algorithm
      * @param string
-     * @return mixed
+     * @return false|string
      */
     protected function _decode($encoded)
     {
@@ -455,7 +455,7 @@ 
     /**
      * The actual encoding algorithm
      * @param  string
-     * @return mixed
+     * @return false|string
      */
     protected function _encode($decoded)
     {
@@ -675,7 +675,7 @@ 
      * Decomposes a Hangul syllable
      * (see http://www.unicode.org/unicode/reports/tr15/#Hangul
      * @param    integer  32bit UCS4 code point
-     * @return   array    Either Hangul Syllable decomposed or original 32bit value as one value array
+     * @return   integer[]    Either Hangul Syllable decomposed or original 32bit value as one value array
      */
     protected function _hangul_decompose($char)
     {

Switch Indentation +88 added lines, -88 removed lines

@@ -129,41 +129,41 @@ 
         }
         foreach ($option as $k => $v) {
             switch ($k) {
-            case 'encoding':
-                switch ($v) {
-                case 'utf8':
-                case 'ucs4_string':
-                case 'ucs4_array':
-                    $this->_api_encoding = $v;
+                case 'encoding':
+                    switch ($v) {
+                        case 'utf8':
+                        case 'ucs4_string':
+                        case 'ucs4_array':
+                            $this->_api_encoding = $v;
+                            break;
+                        default:
+                            $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                            return false;
+                    }
+                break;
+                case 'overlong':
+                    $this->_allow_overlong = ($v) ? true : false;
+                    break;
+                case 'strict':
+                    $this->_strict_mode = ($v) ? true : false;
+                    break;
+                case 'idn_version':
+                    if (in_array($v, array('2003', '2008'))) {
+                        $this->_idn_version = $v;
+                    } else {
+                        $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                    }
+                    break;
+                case 'encode_german_sz': // Deprecated
+                    if (!$v) {
+                        self::$NP['replacemaps'][0xDF] = array(0x73, 0x73);
+                    } else {
+                        unset(self::$NP['replacemaps'][0xDF]);
+                    }
                     break;
                 default:
-                    $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                    $this->_error('Set Parameter: Unknown option '.$k);
                     return false;
-                }
-                break;
-            case 'overlong':
-                $this->_allow_overlong = ($v) ? true : false;
-                break;
-            case 'strict':
-                $this->_strict_mode = ($v) ? true : false;
-                break;
-            case 'idn_version':
-                if (in_array($v, array('2003', '2008'))) {
-                    $this->_idn_version = $v;
-                } else {
-                    $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
-                }
-                break;
-            case 'encode_german_sz': // Deprecated
-                if (!$v) {
-                    self::$NP['replacemaps'][0xDF] = array(0x73, 0x73);
-                } else {
-                    unset(self::$NP['replacemaps'][0xDF]);
-                }
-                break;
-            default:
-                $this->_error('Set Parameter: Unknown option '.$k);
-                return false;
             }
         }
         return true;
@@ -180,13 +180,13 @@ 
         // Optionally set
         if ($one_time_encoding) {
             switch ($one_time_encoding) {
-            case 'utf8':
-            case 'ucs4_string':
-            case 'ucs4_array':
-                break;
-            default:
-                $this->_error('Unknown encoding '.$one_time_encoding);
-                return false;
+                case 'utf8':
+                case 'ucs4_string':
+                case 'ucs4_array':
+                    break;
+                default:
+                    $this->_error('Unknown encoding '.$one_time_encoding);
+                    return false;
             }
         }
         // Make sure to drop any newline characters around
@@ -255,18 +255,18 @@ 
         // The output is UTF-8 by default, other output formats need conversion here
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            return $return;
-            break;
-        case 'ucs4_string':
-           return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
-           break;
-        case 'ucs4_array':
-            return $this->_utf8_to_ucs4($return);
-            break;
-        default:
-            $this->_error('Unsupported output format');
-            return false;
+            case 'utf8':
+                return $return;
+                break;
+            case 'ucs4_string':
+               return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
+               break;
+            case 'ucs4_array':
+                return $this->_utf8_to_ucs4($return);
+                break;
+            default:
+                $this->_error('Unsupported output format');
+                return false;
         }
     }
 
@@ -281,16 +281,16 @@ 
         // Forcing conversion of input to UCS4 array
         // If one time encoding is given, use this, else the objects property
         switch ($one_time_encoding ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            $decoded = $this->_utf8_to_ucs4($decoded);
-            break;
-        case 'ucs4_string':
-           $decoded = $this->_ucs4_string_to_ucs4($decoded);
-        case 'ucs4_array':
-           break;
-        default:
-            $this->_error('Unsupported input format: '.($one_time_encoding ? $one_time_encoding : $this->_api_encoding));
-            return false;
+            case 'utf8':
+                $decoded = $this->_utf8_to_ucs4($decoded);
+                break;
+            case 'ucs4_string':
+               $decoded = $this->_ucs4_string_to_ucs4($decoded);
+            case 'ucs4_array':
+               break;
+            default:
+                $this->_error('Unsupported input format: '.($one_time_encoding ? $one_time_encoding : $this->_api_encoding));
+                return false;
         }
 
         // No input, no output, what else did you expect?
@@ -303,35 +303,35 @@ 
         foreach ($decoded as $k => $v) {
             // Make sure to use just the plain dot
             switch($v) {
-            case 0x3002:
-            case 0xFF0E:
-            case 0xFF61:
-                $decoded[$k] = 0x2E;
-                // Right, no break here, the above are converted to dots anyway
-            // Stumbling across an anchoring character
-            case 0x2E:
-            case 0x2F:
-            case 0x3A:
-            case 0x3F:
-            case 0x40:
-                // Neither email addresses nor URLs allowed in strict mode
-                if ($this->_strict_mode) {
-                   $this->_error('Neither email addresses nor URLs are allowed in strict mode.');
-                   return false;
-                } else {
-                    // Skip first char
-                    if ($k) {
-                        $encoded = '';
-                        $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
-                        if ($encoded) {
-                            $output .= $encoded;
-                        } else {
-                            $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                case 0x3002:
+                case 0xFF0E:
+                case 0xFF61:
+                    $decoded[$k] = 0x2E;
+                    // Right, no break here, the above are converted to dots anyway
+                // Stumbling across an anchoring character
+                case 0x2E:
+                case 0x2F:
+                case 0x3A:
+                case 0x3F:
+                case 0x40:
+                    // Neither email addresses nor URLs allowed in strict mode
+                    if ($this->_strict_mode) {
+                       $this->_error('Neither email addresses nor URLs are allowed in strict mode.');
+                       return false;
+                    } else {
+                        // Skip first char
+                        if ($k) {
+                            $encoded = '';
+                            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                            if ($encoded) {
+                                $output .= $encoded;
+                            } else {
+                                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                            }
+                            $output .= chr($decoded[$k]);
                         }
-                        $output .= chr($decoded[$k]);
+                        $last_begin = $k + 1;
                     }
-                    $last_begin = $k + 1;
-                }
             }
         }
         // Catch the rest of the string