diff --git a/src/Collection.php b/src/Collection.php
index 04e02ee..027eb30 100644
--- a/src/Collection.php
+++ b/src/Collection.php
@@ -41,7 +41,7 @@ class Collection implements \ArrayAccess
      *
      * @return void
      */
-    public function set($key, $value)
+    public function set(string $key, mixed $value)
     {
         $this->data[$key] = $value;
     }
diff --git a/src/Functions.php b/src/Functions.php
index 3fed5a4..887d741 100644
--- a/src/Functions.php
+++ b/src/Functions.php
@@ -181,15 +181,6 @@ class Functions {
         return ($a[$key] < $b[$key]) ? -1 : 1;
     }
 
-    // Сравнение по ключу массиве
-    static function __index($n, $key, $row) {
-        return ($row[$key] == $n);
-    }
-
-    static function __div($x, $y) {
-        return $x / $y;
-    }
-
     static function __self($name, $o) {
         return call_user_func([$o, $name]);
     }
@@ -203,21 +194,6 @@ class Functions {
         return empty($x);
     }
 
-    // Отрицание
-    static function __not($x) {
-        return !$x;
-    }
-
-    // Не равно
-    static function __neq($x, $y) {
-        return $x != $y;
-    }
-
-    // Равно
-    static function __eq($x, $y) {
-        return $x == $y;
-    }
-
     /**
      * Извлекает из многомерого массива значения с определенным ключом
      * @example key_values('a', array(1 => array('a' => 1, 'b' => 2))) => array(1)
@@ -300,13 +276,9 @@ class Functions {
 
     /**
      * Логическа операция || ко всем элементам массива
-     * @param array $array
-     * @param mixed $callback
-     *
      * @return mixed
      */
-    static function some(array $array, $callback) {
-        assert(is_callable($callback));
+    static function some(array $array, callable $callback) {
 
         foreach ($array as $key => $value) {
             if (call_user_func($callback, $value) === true) {
@@ -316,8 +288,7 @@ class Functions {
         return false;
     }
 
-    static function span($length, array $array) {
-        assert(is_int($length));
+    static function span(int $length, array $array) {
 
         $result = [];
         $count = count($array);
@@ -327,7 +298,7 @@ class Functions {
         return $result;
     }
 
-    static function array_ref($data, $n) {
+    static function array_ref(array $data, string|int $n) {
         return $data[$n];
     }
 
diff --git a/src/HttpRequest.php b/src/HttpRequest.php
index 9a782b7..459bb82 100644
--- a/src/HttpRequest.php
+++ b/src/HttpRequest.php
@@ -63,12 +63,12 @@ class HttpRequest extends Collection
         return $this->_session;
     }
 
-    function set($key, mixed $value)
+    function set(string $key, mixed $value)
     {
         parent::get('data')->set($key, $value);
     }
 
-    function export($key = 'data')
+    function export(string $key = 'data')
     {
         return parent::get($key)->export();
     }
@@ -85,7 +85,7 @@ class HttpRequest extends Collection
      * @param string $key
      * @return mixed
      */
-    public function getRawData($var, $key)
+    public function getRawData(string $var, $key)
     {
         $data = parent::get(strtolower($var));
         if ($data) {
diff --git a/src/MailAlt.php b/src/MailAlt.php
index f5812f6..2775553 100644
--- a/src/MailAlt.php
+++ b/src/MailAlt.php
@@ -17,7 +17,7 @@ class MailAlt
     /**
      * Установка отправителя
      */
-    function from($name)
+    function from(string $name)
     {
         $this->mailer->setFrom($name);
     }
@@ -25,12 +25,12 @@ class MailAlt
     /**
      * Установка получателя
      */
-    function to($name) // recipient
+    function to(string $name) // recipient
     {
         $this->mailer->addAddress($name);
     }
 
-    function replyTo($name) // recipient
+    function replyTo(string $name) // recipient
     {
         $this->mailer->AddReplyTo($name);
     }
@@ -39,12 +39,12 @@ class MailAlt
      * Установка получателей копии
      * @param string $name
      */
-    function copy($name) // recipient cc
+    function copy(string $name) // recipient cc
     {
         $this->mailer->addCC($name);
     }
 
-    function notify($notify)
+    function notify(string $notify)
     {
         $this->_notify = $notify;
     }
@@ -53,7 +53,7 @@ class MailAlt
      * Тема письма
      * @param string $subject
      */
-    function subject($subject)
+    function subject(string $subject)
     {
         $this->mailer->Subject = $subject;
     }
@@ -83,7 +83,7 @@ class MailAlt
     /**
      * Добавление вложения из файла
      */
-    function addAttachment($filename, $name = null)
+    function addAttachment(string $filename, $name = null)
     {
         $this->mailer->addAttachment($filename, $name);
     }
@@ -91,12 +91,12 @@ class MailAlt
     /**
      * Отправка почты
      */
-    function send()
+    function send(): bool
     {
         return $this->mailer->send();
     }
 
-    function eml() {
+    function eml(): string {
         return $this->mailer->getSentMIMEMessage();
     }
 }
diff --git a/src/Numbers.php b/src/Numbers.php
index 2494706..ed98b61 100644
--- a/src/Numbers.php
+++ b/src/Numbers.php
@@ -4,22 +4,22 @@ namespace ctiso;
 
 class Numbers
 {
-    static function roman($i)
+    static function roman(float $i): float
     {
         return 0;
     }
 
-    static function decimal($i) 
+    static function decimal(float $i): float
     {
         return $i;
     }
 
-    static function prefix($prefix, array $array, $key = false)
+    static function prefix(callable $prefix, array $array, $key = false)
     {
         $result = [];
         $count = count($array);
         for ($i = 0; $i < $count; $i++) {
-            $result [] = call_user_func($prefix, $i + 1) . '. ' . $array[$i]; 
+            $result [] = call_user_func($prefix, $i + 1) . '. ' . $array[$i];
         }
         return $result;
     }
diff --git a/src/Path.php b/src/Path.php
index 109da4a..aee6a87 100644
--- a/src/Path.php
+++ b/src/Path.php
@@ -368,12 +368,12 @@ class Path
     /**
      * Список файлов в директории
      *
-     * @param array $allow массив расширений для файлов
+     * @param ?array $allow массив расширений для файлов
      * @param array $ignore массив имен пааок которые не нужно обрабатывать
      *
      * @returnarray
      */
-    public function getContent($allow = null, $ignore = [])
+    public function getContent(?array $allow = null, array $ignore = [])
     {
         $ignore = array_merge([".", ".."], $ignore);
         return self::fileList($this->__toString(), $allow, $ignore);
@@ -382,12 +382,12 @@ class Path
     /**
      * Обьединяет строки в путь соединяя необходимым разделителем
      *
-     * @param array $allow массив расширений разрешеных для файлов
+     * @param ?array $allow массив расширений разрешеных для файлов
      * @param array $ignore массив имен пааок которые не нужно обрабатывать
      *
      * @return array
      */
-    function getContentRec($allow = null, $ignore = [])
+    function getContentRec(?array $allow = null, array $ignore = [])
     {
         $result = [];
         $ignore = array_merge([".", ".."], $ignore);
@@ -396,7 +396,7 @@ class Path
     }
 
     // Использовать SPL ???
-    protected static function fileList($base, &$allow, &$ignore)
+    protected static function fileList(string $base, ?array &$allow, array &$ignore): array
     {
         if ($base == '') $base = '.';
         $result = [];
@@ -441,7 +441,7 @@ class Path
      *
      * @return void
      */
-    static function prepare($dst, $filename = true)
+    static function prepare(string $dst, bool $filename = true)
     {
         if ($filename) {
             $path_dst = pathinfo($dst, PATHINFO_DIRNAME);
@@ -462,7 +462,7 @@ class Path
      *
      * @return string
      */
-    static function updateRelativePathOnFileMove($relativePath, $srcFile, $dstFile) {
+    static function updateRelativePathOnFileMove(string $relativePath, string  $srcFile, string $dstFile) {
         $srcToDst = self::relative($srcFile, $dstFile);
         return self::normalize(self::join($srcToDst, $relativePath));
     }
@@ -477,7 +477,7 @@ class Path
      *
      * @return string
      */
-    static function updateRelativePathOnDirectoryMove($relativePath, $fileDir, $srcDir, $dstDir) {
+    static function updateRelativePathOnDirectoryMove(string $relativePath, string $fileDir, string $srcDir, string $dstDir) {
         $relativePath = self::normalize($relativePath);
         $fileDir      = self::normalize($fileDir);
         $srcDir       = self::normalize($srcDir);
diff --git a/src/Primitive.php b/src/Primitive.php
index 283d7e1..4385c77 100644
--- a/src/Primitive.php
+++ b/src/Primitive.php
@@ -10,7 +10,7 @@ namespace ctiso;
 
 class Primitive {
     // varchar
-    public static function to_varchar($value)
+    public static function to_varchar($value): string
     {
         return ((string) $value);
     }
@@ -26,28 +26,28 @@ class Primitive {
         return filter_var($value, FILTER_VALIDATE_BOOLEAN);//(int)((bool) $value);
     }
 
-    public static function from_bool($value)
+    public static function from_bool($value): bool
     {
         return ((bool) $value);
     }
 
     // int
-    public static function to_int($value)
+    public static function to_int($value): int
     {
         return ((int) $value);
     }
 
-    public static function from_int($value)
+    public static function from_int($value): string
     {
         return ((string) $value);
     }
-   
+
     // date
     public static function to_date($value)
     {
         $result = 0;
         $tmp = explode("/", $value ?? '', 3);
-        
+
         if (count($tmp) != 3) {
             return $result;
         }
@@ -63,7 +63,7 @@ class Primitive {
                 return 0;
             }
         }
-        
+
         return $result;
     }
 
@@ -110,7 +110,7 @@ class Primitive {
     }
 
     // array
-    public static function to_array($value) 
+    public static function to_array($value)
     {
         return (is_array($value)) ? $value : [];
     }
diff --git a/src/Registry.php b/src/Registry.php
index 21e08eb..e2e1a5e 100644
--- a/src/Registry.php
+++ b/src/Registry.php
@@ -5,47 +5,47 @@ use ctiso\File,
     Exception;
 
 class Registry {
-    public $namespace = [];
+    public array $namespace = [];
     public $data;
 
-    function importFile($namespace, $filePath = null) {
+    function importFile(string $namespace, ?string $filePath = null) {
         $data = json_decode(File::getContents($filePath), true);
         $data['_file'] = $filePath;
         $this->namespace[$namespace] = [
             'path' => $filePath,
             'data' => $data
-        ];        
+        ];
     }
 
-    function importArray($namespace, $data = []) {
+    function importArray(string $namespace, array $data = []) {
         if (isset($this->namespace[$namespace])) {
             $data = array_merge($this->namespace[$namespace]['data'], $data);
-        } 
+        }
         $this->namespace[$namespace] = [
             'path' => null,
             'data' => $data
-        ];        
+        ];
     }
 
-    public function get($ns, $key) {
+    public function get(string $ns, string $key) {
         if (isset($this->namespace[$ns]['data'][$key])) {
             return $this->namespace[$ns]['data'][$key];
         }
         throw new Exception('Unknown key ' . $ns . '::' . $key);
     }
 
-    public function getOpt($ns, $key) {
+    public function getOpt(string $ns, string $key) {
         if (isset($this->namespace[$ns]['data'][$key])) {
             return $this->namespace[$ns]['data'][$key];
         }
         return null;
     }
 
-    public function has($ns, $key) {
+    public function has(string $ns, string $key): bool {
         return isset($this->namespace[$ns]['data'][$key]);
     }
 
-    function set($ns, $key, $value) {
+    function set(string $ns, string $key, mixed $value): void {
         $this->namespace[$ns]['data'][$key] = $value;
     }
 }
diff --git a/src/Role/User.php b/src/Role/User.php
index 3f5728e..44c5683 100644
--- a/src/Role/User.php
+++ b/src/Role/User.php
@@ -4,20 +4,20 @@ namespace ctiso\Role;
 use ctiso\Database,
     ctiso\Database\Statement;
 
-// Класс должен быть в библиотеке приложения 
+// Класс должен быть в библиотеке приложения
 class User implements UserInterface
 {
     const LIFE_TIME = 1800; // = 30min * 60sec;
 
-    public $fullname;
-    public $name;
+    public string $fullname;
+    public string $name;
     public $access;
-    public $password;
+    public string $password;
     public $id;
-    public $db;
-    public $groups;
+    public Database $db;
+    public array $groups;
 
-    function __construct($db, $groups) { 
+    function __construct(Database $db, array $groups) {
         $this->db = $db;
         $this->groups = $groups;
     }
@@ -26,7 +26,7 @@ class User implements UserInterface
         $this->db = $db;
     }
 
-    public function getName() {
+    public function getName(): string {
         return $this->name;
     }
 
@@ -35,7 +35,7 @@ class User implements UserInterface
     }
 
 
-    public function getUserByQuery(Statement $stmt) 
+    public function getUserByQuery(Statement $stmt)
     {
         $result = $stmt->executeQuery();
         if ($result->next()) {
@@ -44,8 +44,8 @@ class User implements UserInterface
             $this->id     = $result->getInt('id_user');
             $this->password   = $result->getString('password');
             $this->fullname = implode(' ', [
-                $result->getString('surname'), 
-                $result->getString('firstname'), 
+                $result->getString('surname'),
+                $result->getString('firstname'),
                 $result->getString('patronymic')]);
             return $result;
         }
@@ -56,12 +56,12 @@ class User implements UserInterface
         return $result->get('password');
     }
 
-    public function getUserByLogin($login) 
+    public function getUserByLogin(string $login)
     {
         $stmt = $this->db->prepareStatement("SELECT * FROM users WHERE login = ?");
         $stmt->setString(1, $login);
         $result = $this->getUserByQuery($stmt);
-        if ($result) { 
+        if ($result) {
             $time = time();
             $id = $this->id;
             $this->db->executeQuery("UPDATE users SET lasttime = $time WHERE id_user = $id"); // Время входа
@@ -69,7 +69,7 @@ class User implements UserInterface
         return $result;
     }
 
-    public function getUserById($id) 
+    public function getUserById(int $id)
     {
         $stmt = $this->db->prepareStatement("SELECT * FROM users WHERE id_user = ?");
         $stmt->setInt(1, $_SESSION ['access']);
@@ -77,24 +77,24 @@ class User implements UserInterface
         if ($result) {
             $lasttime = $result->getInt('lasttime');
             $time = time();
-            if ($time - $lasttime > self::LIFE_TIME) return null; // Вышло время сессии 
+            if ($time - $lasttime > self::LIFE_TIME) return null; // Вышло время сессии
             $id = $this->id;
         }
         return $result;
     }
 
-    function setSID($random, $result) {
+    function setSID(string $random, $result) {
         return $this->db->executeQuery("UPDATE users SET sid = '$random', trie_count = 0 WHERE id_user = " . $result->getInt('id_user'));
     }
 
-    function resetTries($login) {
+    function resetTries(string $login): void {
         $this->db->executeQuery(
             "UPDATE users SET trie_count = :count WHERE login = :login",
             ['count' => 0, 'login' => $login]
         );
     }
 
-    function updateTries($login) {
+    function updateTries(string $login): void {
         $user = $this->db->fetchOneArray("SELECT id_user, trie_count FROM users WHERE login = :login", ['login' => $login]);
         $this->db->executeQuery(
             "UPDATE users SET trie_time = :cur_time, trie_count = :count WHERE id_user = :id_user",
diff --git a/src/Role/UserInterface.php b/src/Role/UserInterface.php
index 295e4ca..53e7150 100644
--- a/src/Role/UserInterface.php
+++ b/src/Role/UserInterface.php
@@ -5,8 +5,8 @@ use ctiso\Database\Statement;
 
 interface UserInterface {
     function getUserByQuery(Statement $stmt);
-    function getUserByLogin($login);
-    function getUserById($id);
+    function getUserByLogin(string $login);
+    function getUserById(int $id);
     function getName();
-    function setSID($random, $result);
+    function setSID(string $random, $result);
 }
\ No newline at end of file
diff --git a/src/Security.php b/src/Security.php
index ea25461..fa9bea0 100644
--- a/src/Security.php
+++ b/src/Security.php
@@ -3,7 +3,7 @@
 namespace ctiso;
 
 class Security {
-    static function generatePassword($length = 9, $strength = 0) {
+    static function generatePassword(int $length = 9, int $strength = 0): string {
         $vowels = 'aeuy';
         $consonants = 'bdghjmnpqrstvz';
         if ($strength & 1) {
@@ -18,7 +18,7 @@ class Security {
         if ($strength & 8) {
             $consonants .= '@#$%';
         }
-    
+
         $password = '';
         $alt = time() % 2;
         for ($i = 0; $i < $length; $i++) {
diff --git a/src/Session.php b/src/Session.php
index 6eab118..028e190 100644
--- a/src/Session.php
+++ b/src/Session.php
@@ -2,9 +2,9 @@
 
 namespace ctiso;
 
-class Session 
+class Session
 {
-    function get($key)
+    function get(string $key): mixed
     {
         if (isset($_SESSION[$key])) {
             return $_SESSION[$key];
@@ -12,7 +12,7 @@ class Session
         return null;
     }
 
-    function set($key, $value)
+    function set(string|array $key, mixed $value): void
     {
         if (is_array($key)) {
             $_SESSION[strtolower(get_class($key[0]))][$key[1]] = $value;
@@ -21,17 +21,17 @@ class Session
         }
     }
 
-    function clean($key)
+    function clean(string $key): void
     {
         unset($_SESSION[$key]);
     }
 
-    function start()
+    function start(): void
     {
         @session_start();
     }
 
-    function stop()
+    function stop(): void
     {
         session_destroy();
     }
diff --git a/src/Setup.php b/src/Setup.php
index a491155..836579c 100644
--- a/src/Setup.php
+++ b/src/Setup.php
@@ -10,6 +10,7 @@
 namespace ctiso;
 use ctiso\Tools\SQLStatementExtractor;
 use ctiso\Path;
+use SimpleXMLElement;
 
 class FakeZipArchive {
     public $base;
@@ -58,7 +59,7 @@ class Setup
     /**
      * Регистрация новых действия для установки
      */
-    public function registerAction($name, $action)
+    public function registerAction(string $name, $action)
     {
         $this->actions[$name] = $action;
     }
@@ -66,12 +67,12 @@ class Setup
     /**
      * Установка переменных для шаблона
      */
-    public function set($name, $value)
+    public function set(string $name, $value)
     {
         $this->context[$name] = $value;
     }
 
-    function replaceFn($matches) {
+    function replaceFn(array $matches) {
         if (isset($this->context[$matches[2]])) {
             $v = $this->context[$matches[2]];
         } else {
@@ -84,14 +85,14 @@ class Setup
         return $v;
     }
 
-    public function fileContent($file, array $tpl)
+    public function fileContent(string $file, array $tpl): string
     {
         $result = $this->zip->getFromName($file);
         $result = preg_replace_callback('/\{\{\s*(\*?)(\w+)\s*\}\}/', [$this, 'replaceFn'], $result);
         return $result;
     }
 
-    function callAction($name, array $attributes)
+    function callAction(string $name, array $attributes): void
     {
         if(isset($this->actions[$name])) {
             call_user_func_array($this->actions[$name], $attributes);
@@ -112,7 +113,7 @@ class Setup
     /**
      * Для всех аттрибутов заменяет переменные на их значения
      */
-    function resolve($attributes)
+    function resolve(SimpleXMLElement $attributes): array
     {
         $result = [];
         foreach ($attributes as $key => $value) {
@@ -167,7 +168,7 @@ class Setup
      * Создает символическую ссылку на папку/файл
      * @param array{target: string, link: string} $attributes
      */
-    public function makeLink(array $attributes)
+    public function makeLink(array $attributes): void
     {
         if (function_exists('symlink')) {
             symlink($attributes['target'], $attributes['link']);
@@ -178,7 +179,7 @@ class Setup
      * Подключение файла установки
      * @param array{file: string} $attributes Имя подключаемого файла
      */
-    public function includeFile(array $attributes)
+    public function includeFile(array $attributes): void
     {
         $file = basename($this->file) . "/" . $attributes['file'];
 
diff --git a/src/SortRecord.php b/src/SortRecord.php
index 3c4fe48..f1ed4e6 100644
--- a/src/SortRecord.php
+++ b/src/SortRecord.php
@@ -2,20 +2,18 @@
 
 namespace ctiso;
 
-class SortRecord 
+class SortRecord
 {
-    public $key;
-    public $mode;
-    public $order;
+    public string $key;
+    public int $order;
 
-    function __construct($key, $mode, $order)
-    {        
+    function __construct(string $key, bool $order)
+    {
         $this->key = $key;
         $this->order = ((boolean)($order) === false) ? 1 : -1;
-        $this->mode = $mode;
     }
 
-    function compare($a, $b)
+    function compare(array $a, array $b): int
     {
         if($a[$this->key] == $b[$this->key]) {
             return 0;
@@ -23,7 +21,7 @@ class SortRecord
         return ($a[$this->key] > $b[$this->key]) ? $this->order : -$this->order;
     }
 
-    function compareKeys($a, $b)
+    function compareKeys(object $a, object $b): int
     {
         if($a->{$this->key} == $b->{$this->key}) {
             return 0;
@@ -31,17 +29,17 @@ class SortRecord
         return ($a->{$this->key} > $b->{$this->key}) ? $this->order : -$this->order;
     }
 
-    function sort(&$list)
+    function sort(array &$list)
     {
         return usort($list, [$this, 'compare']);
     }
 
-    function sortKeys(&$list)
+    function sortKeys(array &$list)
     {
         return usort($list, [$this, 'compareKeys']);
     }
 
-    function group(&$list, $key, $types)
+    function group(array &$list, string $key, array $types)
     {
         $groups = [];
         foreach ($types as $name) {
@@ -59,6 +57,6 @@ class SortRecord
         foreach ($groups as $value) {
             $result = array_merge($result, $value);
         }
-        $list = $result;            
+        $list = $result;
     }
 }
diff --git a/src/Tales.php b/src/Tales.php
index e8090b4..21b15cb 100644
--- a/src/Tales.php
+++ b/src/Tales.php
@@ -13,18 +13,20 @@ use PHPTAL_Php_TalesInternal,
 
 class Tales_DateTime implements PHPTAL_Tales
 {
-    static public function date($expression, $nothrow = false) {
+    static public function date($expression, $nothrow = false): string
+    {
         return "ctiso\\Tales::phptal_date(".PHPTAL_Php_TalesInternal::path($expression).")";
     }
 
-    static public function time($expression, $nothrow = false) {
+    static public function time($expression, $nothrow = false): string
+    {
         return "ctiso\\Tales::phptal_time(".PHPTAL_Php_TalesInternal::path($expression).")";
     }
 }
 
 class Tales_Component implements PHPTAL_Tales
 {
-    static public function component($expression, $nothrow = false)
+    static public function component($expression, $nothrow = false): string
     {
         $s = PHPTAL_Php_TalesInternal::string($expression);
         return "ctiso\\Tales::phptal_component(" . $s . ")";
@@ -33,7 +35,7 @@ class Tales_Component implements PHPTAL_Tales
 
 class Tales_Assets implements PHPTAL_Tales
 {
-    static public function assets($expression, $nothrow = false)
+    static public function assets($expression, $nothrow = false): string
     {
         $s = PHPTAL_Php_TalesInternal::string($expression);
         return "ctiso\\Tales::phptal_asset(" . $s . ")";
@@ -44,15 +46,15 @@ class Tales {
     /** @var SiteInterface */
     static $site;
 
-    static function phptal_date ($e) {
+    static function phptal_date ($e): string {
         return date("d.m.Y", $e);
     }
 
-    static function phptal_time ($e) {
+    static function phptal_time ($e): string {
         return date("H:i", $e);
     }
 
-    static function phptal_asset($s) {
+    static function phptal_asset($s): string {
         self::$site->addStyleSheet($s);
         return "";
     }
diff --git a/src/Tools/Drawing.php b/src/Tools/Drawing.php
index 306d914..56183b6 100644
--- a/src/Tools/Drawing.php
+++ b/src/Tools/Drawing.php
@@ -2,6 +2,8 @@
 
 namespace ctiso\Tools;
 
+use GdImage;
+
 class Drawing
 {
     const ALIGN_LEFT   = "left";
@@ -10,13 +12,13 @@ class Drawing
     const ALIGN_CENTER = "center";
     const ALIGN_RIGHT  = "right";
 
-    static function drawrectnagle(&$image, $left, $top, $width, $height, $rgb)
+    static function drawrectnagle(GdImage &$image, int $left, int $top, int $width, int $height, array $rgb): void
     {
         $color = imagecolorallocate($image, $rgb[0], $rgb[1], $rgb[2]);
         $right = $left + $width;
         $bottom = $top + $height;
         imageline($image, $left, $top,    $right, $top, $color);
-        imageline($image, $right,$top,    $right, $bottom, $color);
+        imageline($image, $right, $top,    $right, $bottom, $color);
         imageline($image, $left, $bottom, $right, $bottom, $color);
         imageline($image, $left, $top,    $left,  $bottom, $color);
     }
@@ -24,12 +26,23 @@ class Drawing
     /**
      * http://ru2.php.net/imagettftext
      */
-    static function imagettftextbox(&$image, $size, $angle, $left, $top, $color, $font, $text,
-            $max_width, $max_height, $align, $valign)
-    {
-//        echo $left,"\n",  $top, "\n";
-//        echo $max_width,"\n",  $max_height, "\n";
-//        self::drawrectnagle($image, $left, $top, $max_width, $max_height, array(0xFF,0,0));
+    static function imagettftextbox(
+        GdImage &$image,
+        int $size,
+        float $angle,
+        $left,
+        $top,
+        $color,
+        $font,
+        $text,
+        $max_width,
+        $max_height,
+        $align,
+        $valign
+    ) {
+        //        echo $left,"\n",  $top, "\n";
+        //        echo $max_width,"\n",  $max_height, "\n";
+        //        self::drawrectnagle($image, $left, $top, $max_width, $max_height, array(0xFF,0,0));
         $text_lines = explode("\n", $text); // Supports manual line breaks!
 
         $lines = [];
@@ -103,17 +116,13 @@ class Drawing
     }
 
 
-    function imagettftextSp($image, $size, $angle, $x, $y, $color, $font, $text, $spacing = 0)
+    function imagettftextSp(GdImage $image, float $size, float $angle, int $x, int $y, int $color, string $font, string $text, int $spacing = 0)
     {
-        if ($spacing == 0)
-        {
+        if ($spacing == 0) {
             imagettftext($image, $size, $angle, $x, $y, $color, $font, $text);
-        }
-        else
-        {
+        } else {
             $temp_x = $x;
-            for ($i = 0; $i < mb_strlen($text); $i++)
-            {
+            for ($i = 0; $i < mb_strlen($text); $i++) {
                 $bbox = imagettftext($image, $size, $angle, $temp_x, $y, $color, $font, $text[$i]);
                 $temp_x += $spacing + ($bbox[2] - $bbox[0]);
             }
diff --git a/src/Tools/Image.php b/src/Tools/Image.php
index a59642f..b1c2395 100644
--- a/src/Tools/Image.php
+++ b/src/Tools/Image.php
@@ -2,9 +2,11 @@
 
 namespace ctiso\Tools;
 
+use GdImage;
+
 class Image
-{    
-    static function load($uri)
+{
+    static function load($uri): GdImage|false
     {
         $e = strtolower(pathinfo($uri, PATHINFO_EXTENSION));
         switch ($e) {
@@ -12,9 +14,10 @@ class Image
             case 'jpeg': case 'jpg': return imagecreatefromjpeg($uri);
             case 'gif': return imagecreatefromgif($uri);
         }
+        return false;
     }
 
-    static function fit($image, $prewidth, $preheight, $force = true)
+    static function fit(GdImage $image, int $prewidth, int $preheight, bool $force = true): GdImage|false
     {
         $width = imagesx($image);
         $height = imagesy($image);
@@ -29,7 +32,7 @@ class Image
         return $image_p;
     }
 
-    static function save($image, $uri)
+    static function save($image, $uri): bool
     {
         $e = strtolower(pathinfo($uri, PATHINFO_EXTENSION));
         switch ($e) {
@@ -37,5 +40,6 @@ class Image
             case 'png': imagepng($image, $uri); break;
             case 'gif': imagegif($image, $uri); break;
         }
+        return false;
     }
 }
\ No newline at end of file
diff --git a/src/Tools/SQLStatementExtractor.php b/src/Tools/SQLStatementExtractor.php
index 5598335..3759953 100644
--- a/src/Tools/SQLStatementExtractor.php
+++ b/src/Tools/SQLStatementExtractor.php
@@ -124,7 +124,7 @@ class SQLStatementExtractor {
      * @param string $string The string to check in (haystack).
      * @return boolean True if $string ends with $check, or they are equal, or $check is empty.
      */
-    protected static function endsWith(string $check, $string) {
+    protected static function endsWith(string $check, string $string) {
         if ($check === "" || $check === $string) {
             return true;
         } else {
@@ -136,7 +136,7 @@ class SQLStatementExtractor {
      * a natural way of getting a subtring, php's circular string buffer and strange
      * return values suck if you want to program strict as of C or friends
      */
-    protected static function substring($string, $startpos, $endpos = -1) {
+    protected static function substring(string $string, int $startpos, int $endpos = -1) {
         $len    = strlen($string);
         $endpos = (int) (($endpos === -1) ? $len-1 : $endpos);
         if ($startpos > $len-1 || $startpos < 0) {
@@ -157,9 +157,9 @@ class SQLStatementExtractor {
      * Convert string buffer into array of lines.
      *
      * @param string $buffer
-     * @return array string[] lines of file.
+     * @return string[] lines of file.
      */
-    protected static function getLines($buffer) {
+    protected static function getLines(string $buffer): array {
        $lines = preg_split("/\r?\n|\r/", $buffer);
        return $lines;
     }
diff --git a/src/Tools/StringUtil.php b/src/Tools/StringUtil.php
index 35baa93..87e5db7 100644
--- a/src/Tools/StringUtil.php
+++ b/src/Tools/StringUtil.php
@@ -5,7 +5,7 @@ namespace ctiso\Tools;
 class StringUtil {
 
     // from creole
-    static function strToArray($str) {
+    static function strToArray(string $str): array {
         $str = substr($str, 1, -1); // remove { }
         $res = [];
 
@@ -40,7 +40,7 @@ class StringUtil {
     }
 
     //Нормализация строк на русском
-    static function normalizeRussian($str) {
+    static function normalizeRussian(string $str): string {
         $result = preg_replace('/\s+/',' ', $str);
         if (is_string($result)) {
             $result = trim($result); //Замена длинных пробелов на одинарные, пробелы по краям
@@ -62,8 +62,8 @@ class StringUtil {
      * output: true
      * input:  $str="foo" $variants="foo1|foo2|foo3"
      * output: false
-*/
-    static function compare_string_to_variants($str, $variants){
+    */
+    static function compare_string_to_variants($str, string $variants){
         $variants_array = explode('|', $variants);
         $founded = false;
         foreach ($variants_array as $variant) {
@@ -72,7 +72,7 @@ class StringUtil {
         return  $founded;
     }
 
-    static function mb_str_split($str) {
+    static function mb_str_split(string $str): array|false {
         return preg_split('~~u', $str, -1, PREG_SPLIT_NO_EMPTY);
     }
 
@@ -80,32 +80,33 @@ class StringUtil {
         return str_replace(self::mb_str_split($from), self::mb_str_split($to), $str);
     }
 
-    static function encodestring($st) {
+    static function encodestring(string $st): string
+    {
         $st = self::mb_strtr($st,"абвгдеёзийклмнопрстуфхъыэ !+()", "abvgdeeziyklmnoprstufh_ie_____");
         $st = self::mb_strtr($st,"АБВГДЕЁЗИЙКЛМНОПРСТУФХЪЫЭ", "ABVGDEEZIYKLMNOPRSTUFH_IE");
         $st = strtr($st, [
-                        " " => '_',
-                        "." => '_',
-                        "," => '_',
-                            "?" => '_',
-                        "\"" => '_',
-                        "'" => '_',
-                        "/" => '_',
-                        "\\" => '_',
-                        "%" => '_',
-                        "#" => '_',
-                        "*" => '_',
-                        "ж"=>"zh", "ц"=>"ts", "ч"=>"ch", "ш"=>"sh",
-                        "щ"=>"shch","ь"=>"", "ю"=>"yu", "я"=>"ya",
-                        "Ж"=>"ZH", "Ц"=>"TS", "Ч"=>"CH", "Ш"=>"SH",
-                        "Щ"=>"SHCH","Ь"=>"", "Ю"=>"YU", "Я"=>"YA",
-                        "Й"=>"i", "й"=>"ie", "ё"=>"Ye",
-                        "№"=>"N"
-                        ]);
+            " " => '_',
+            "." => '_',
+            "," => '_',
+                "?" => '_',
+            "\"" => '_',
+            "'" => '_',
+            "/" => '_',
+            "\\" => '_',
+            "%" => '_',
+            "#" => '_',
+            "*" => '_',
+            "ж"=>"zh", "ц"=>"ts", "ч"=>"ch", "ш"=>"sh",
+            "щ"=>"shch","ь"=>"", "ю"=>"yu", "я"=>"ya",
+            "Ж"=>"ZH", "Ц"=>"TS", "Ч"=>"CH", "Ш"=>"SH",
+            "Щ"=>"SHCH","Ь"=>"", "Ю"=>"YU", "Я"=>"YA",
+            "Й"=>"i", "й"=>"ie", "ё"=>"Ye",
+            "№"=>"N"
+        ]);
         return strtolower($st);
     }
 
-    static function validate_encoded_string($st) {
+    static function validate_encoded_string(string $st): int|false {
         $enc_st = self::encodestring($st);
         return preg_match('/^[\w_-]+(\.[\w_-]+)?$/', $enc_st);
     }
diff --git a/src/Tools/TemplateImage.php b/src/Tools/TemplateImage.php
index 12cd201..6854bb6 100644
--- a/src/Tools/TemplateImage.php
+++ b/src/Tools/TemplateImage.php
@@ -8,8 +8,8 @@ use ctiso\Tools\Drawing;
 
 class TemplateImage
 {
-    static $listfiles = array('jpg' => 'jpeg', 'gif' => 'gif', 'png' => 'png', 'bmp' => 'wbmp');
-    static $listfonts = array(
+    static array $listfiles = array('jpg' => 'jpeg', 'gif' => 'gif', 'png' => 'png', 'bmp' => 'wbmp');
+    static array $listfonts = array(
         'georgia'  => 'georgia.ttf',
         'georgiabd' => 'georgiab.ttf',
         'georgiaz' => 'georgiaz.ttf',
@@ -32,16 +32,16 @@ class TemplateImage
     );
 
     protected $src;
-    protected $context = array();
-    protected $data    = array();
-    protected $base    = "c:\\windows\\fonts\\";
+    protected array $context = [];
+    protected array $data    = [];
+    protected string $base    = "c:\\windows\\fonts\\";
     protected $image;
     protected $_prepare = true;
     public $debug = false;
     public $resource;
     public $filename;
 
-    function __construct (?string $template = null)
+    function __construct (?array $template = null)
     {
         if ($template) {
             $this->data = $template;
@@ -51,7 +51,7 @@ class TemplateImage
     /**
      * Путь к изображению
      */
-    function resourcePath(string $path)
+    function resourcePath(string $path): void
     {
         $this->resource = $path;
     }
@@ -59,7 +59,7 @@ class TemplateImage
     /**
      * Путь у шрифтам
      */
-    function fontPath(string $path)
+    function fontPath(string $path): void
     {
         $this->base = $path;
     }
@@ -69,13 +69,13 @@ class TemplateImage
         $this->context['['.$name.']'] = $this->encode($value);
     }
 
-    function setImage($name)
+    function setImage($name): void
     {
         $this->filename = $name;
         $this->image = $this->imagefromfile($name);
     }
 
-    function setEmptyImage($width, $height)
+    function setEmptyImage($width, $height): void
     {
         $this->image = imagecreatetruecolor($width, $height);
     }
@@ -92,7 +92,7 @@ class TemplateImage
         return null;
     }
 
-    function getFontFile(string $name)
+    function getFontFile(string $name): string
     {
         if(array_key_exists(strtolower($name), self::$listfonts)) {
             return $this->base . self::$listfonts[$name];
@@ -100,7 +100,7 @@ class TemplateImage
         return $this->base . 'arial.ttf';
     }
 
-    function fontSuffix(array $style)
+    function fontSuffix(array $style): string
     {
         if($style[0] && $style[1]) return "z";
 
@@ -110,14 +110,8 @@ class TemplateImage
         return "";
     }
 
-    /**
-     * @param string $text
-     * @param object $value
-     */
-    function imageText($text, $value)
+    function imageText(string $text, object $value)
     {
-        assert(is_string($text));
-
         $text     = strtr($text, $this->context);
         $size     = $value->fontSize;
         $fontfile = $this->getFontFile($value->fontFamily . $this->fontSuffix($value->fontStyle));
@@ -148,17 +142,12 @@ class TemplateImage
      * Перекодировка текста
      * @deprecated
      */
-    function encode($text)
+    function encode(string $text): string
     {
-        assert(is_string($text));
         return $text; //iconv("WINDOWS-1251", "UTF-8", $text);
     }
 
-    /**
-     * @param int $new_width
-     * @param int $new_height
-     */
-    function setSize($new_width, $new_height)
+    function setSize(int $new_width, int $new_height): void
     {
         $width  = imagesx($this->image);
         $height = imagesy($this->image);
@@ -173,7 +162,7 @@ class TemplateImage
         $this->image = $image_p;
     }
 
-    function prepare() {
+    function prepare(): void {
         if($this->_prepare) {
             $this->_prepare = false;
             foreach ($this->data as $value) {
@@ -185,10 +174,8 @@ class TemplateImage
     /**
      * Генерирует изображение из шаблона
      */
-    function render($file = null)
+    function render(?string $file = null): string|bool
     {
-        assert(is_string($file) || is_null($file));
-
         $this->prepare();
 
         if ($file == null) {
diff --git a/src/UTF8.php b/src/UTF8.php
index 5eb93a0..4eab203 100644
--- a/src/UTF8.php
+++ b/src/UTF8.php
@@ -2,13 +2,20 @@
 
 namespace ctiso;
 
-class UTF8 {
-    static function str_split($str, $split_length = 1) {
-    	$split_length = (int) $split_length;
-           
+class UTF8
+{
+    /**
+     * @param string $str
+     * @param int $split_length
+     * @return list<string>
+     */
+    static function str_split(string $str, int $split_length = 1): array
+    {
+        $split_length = (int) $split_length;
+
         $matches = [];
-    	preg_match_all('/.{'.$split_length.'}|[^\x00]{1,'.$split_length.'}$/us', $str, $matches);
-    
-    	return $matches[0];
+        preg_match_all('/.{' . $split_length . '}|[^\x00]{1,' . $split_length . '}$/us', $str, $matches);
+
+        return $matches[0];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Url.php b/src/Url.php
index ec93adb..67e145a 100644
--- a/src/Url.php
+++ b/src/Url.php
@@ -3,26 +3,23 @@
 namespace ctiso;
 
 class Url {
-    public $parts = [];
-    /** @var Url */
-    public $parent;
+    /** @var array<string, string> */
+    public array $parts = [];
+    public ?Url $parent;
 
-    function __construct() {
-    }
-
-    function setParent($parent) {
+    function setParent($parent): void {
         $this->parent = $parent;
     }
 
-    function setQuery($parts) {
+    function setQuery($parts): void {
         $this->parts = $parts;
     }
 
-    function addQueryParam($key, $value) {
+    function addQueryParam(string $key, string $value): void {
         $this->parts[$key] = $value;
     }
 
-    function toString() {
+    function toString(): string {
         return '?' . http_build_query(array_merge($this->parts, $this->parent ? $this->parent->parts : []));
     }
 }
\ No newline at end of file
diff --git a/src/Validator/Rule/AbstractRule.php b/src/Validator/Rule/AbstractRule.php
index 4ab8307..6a7ebef 100644
--- a/src/Validator/Rule/AbstractRule.php
+++ b/src/Validator/Rule/AbstractRule.php
@@ -5,43 +5,43 @@ use ctiso\Collection;
 
 abstract class AbstractRule
 {
-    public $field;
+    public string $field;
     protected $errorMsg;
     protected $ctx;
 
-    public function __construct($field, $errorMsg = null)
+    public function __construct(string $field, $errorMsg = null)
     {
         $this->field = $field;
         $this->errorMsg = $errorMsg;
     }
-	
-    public function setName($field)
+
+    public function setName(string $field): self
     {
         $this->field = $field;
         return $this;
     }
 
-    public function setErrorMsg($errorMsg)
+    public function setErrorMsg($errorMsg): self
     {
         $this->errorMsg = $errorMsg;
         return $this;
     }
 
-    public function getErrorMsg()
-    { 
+    public function getErrorMsg(): string
+    {
         return $this->errorMsg;
     }
 
-    public function isValid(Collection $container, $status = null)
+    public function isValid(Collection $container, $status = null): bool
     {
         return true;
     }
 
-    function skipEmpty() {
+    function skipEmpty(): bool {
         return true;
     }
 
-    public function setContext($ctx)
+    public function setContext($ctx): void
     {
         $this->ctx = $ctx;
     }
diff --git a/src/Validator/Rule/Alpha.php b/src/Validator/Rule/Alpha.php
index 06793fd..a353707 100644
--- a/src/Validator/Rule/Alpha.php
+++ b/src/Validator/Rule/Alpha.php
@@ -9,12 +9,12 @@ use ctiso\Validator\Rule\AbstractRule,
 
 class Alpha extends AbstractRule
 {
-    public function getErrorMsg()
-    { 
+    public function getErrorMsg(): string
+    {
         return "Поле должно содержать только буквы";
     }
 
-    public function isValid(Collection $container, $status = null)
+    public function isValid(Collection $container, $status = null): bool
     {
         return ctype_alpha($container->get($this->field));
     }
diff --git a/src/Validator/Rule/Code.php b/src/Validator/Rule/Code.php
index 1102766..30f6e5e 100644
--- a/src/Validator/Rule/Code.php
+++ b/src/Validator/Rule/Code.php
@@ -13,7 +13,7 @@ class Code extends AbstractRule
         return "Неправильно указан персональный код";
     }
 
-    function checkCode($code): bool {
+    function checkCode(array $code): bool {
         foreach($code as $c) {
             if (empty($c)) {
                 return false;
diff --git a/src/Validator/Rule/Count.php b/src/Validator/Rule/Count.php
index c346892..008e24b 100644
--- a/src/Validator/Rule/Count.php
+++ b/src/Validator/Rule/Count.php
@@ -12,22 +12,22 @@ class Count extends AbstractRule
     public $size = 1;
     public $max = null;
 
-    public function getErrorMsg()
-    { 
+    public function getErrorMsg(): string
+    {
         return "Количество записей должно быть не менне {$this->size} и не более {$this->max}";
     }
 
     function not_empty($s) {
         return $s != "";
     }
-    
-    public function isValid(Collection $container, $status = null)
+
+    public function isValid(Collection $container, $status = null): bool
     {
 
         if (!$this->max) {
             $this->max = $this->size;
-        }                        
-        $count = count(array_filter(array_map('trim', 
+        }
+        $count = count(array_filter(array_map('trim',
             explode(";", $container->get($this->field))), [$this, 'not_empty']));
 
         return  $count >= $this->size && $count <= ((int)$this->max);
diff --git a/src/Validator/Rule/Date.php b/src/Validator/Rule/Date.php
index fdfff71..a53975d 100644
--- a/src/Validator/Rule/Date.php
+++ b/src/Validator/Rule/Date.php
@@ -9,16 +9,16 @@ use ctiso\Validator\Rule\AbstractRule,
 
 class Date extends AbstractRule
 {
-    public function getErrorMsg()
-    { 
+    public function getErrorMsg(): string
+    {
         return "Неверный формат даты";
     }
-    
-    public function isValid(Collection $container, $status = null)
+
+    public function isValid(Collection $container, $status = null): bool
     {
         $pattern = "/^([0-9]{1,2})\/([0-9]{1,2})\/([0-9]{4})$/";
         $matches = [];
-        return (preg_match($pattern, $container->get($this->field), $matches) 
+        return (preg_match($pattern, $container->get($this->field), $matches)
             && checkdate((int)$matches[2], (int)$matches[1], (int)$matches[3]));
     }
 }
diff --git a/src/Validator/Rule/Email.php b/src/Validator/Rule/Email.php
index 22c1287..ebbdc17 100644
--- a/src/Validator/Rule/Email.php
+++ b/src/Validator/Rule/Email.php
@@ -9,12 +9,12 @@ use ctiso\Validator\Rule\AbstractRule,
 
 class Email extends AbstractRule
 {
-    public function getErrorMsg()
+    public function getErrorMsg(): string
     {
         return "Неверный формат электронной почты";
     }
 
-    public function isValid(Collection $container, $status = null)
+    public function isValid(Collection $container, $status = null): bool
     {
         $emails = explode(",", $container->get($this->field));
         foreach ($emails as $email) {
diff --git a/src/Validator/Rule/EmailList.php b/src/Validator/Rule/EmailList.php
index 2132d0b..068becf 100644
--- a/src/Validator/Rule/EmailList.php
+++ b/src/Validator/Rule/EmailList.php
@@ -9,20 +9,14 @@ use ctiso\Validator\Rule\AbstractRule,
 
 class EmailList extends AbstractRule
 {
-    public function getErrorMsg()
-    { 
+    public function getErrorMsg(): string
+    {
         return "Неверный формат электронной почты";
     }
 
-    public function isValid(Collection $container, $status = null) {
-        $user      = '[a-zA-Z0-9_\-\.\+\^!#\$%&*+\/\=\?\|\{\}~\']+';
-        $doIsValid = '(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]\.?)+';
-        $ipv4      = '[0-9]{1,3}(\.[0-9]{1,3}){3}';
-        $ipv6      = '[0-9a-fA-F]{1,4}(\:[0-9a-fA-F]{1,4}){7}';
-
+    public function isValid(Collection $container, $status = null): bool {
         $emails = $container->get($this->field);
         foreach ($emails as $email) {
-//            if (! preg_match("/^$user@($doIsValid|(\[($ipv4|$ipv6)\]))$/", $email)) return false;
             if (! filter_var($email, FILTER_VALIDATE_EMAIL)) return false;
         }
         return true;
diff --git a/src/Validator/Rule/FileName.php b/src/Validator/Rule/FileName.php
index d45d1f8..5f4410f 100644
--- a/src/Validator/Rule/FileName.php
+++ b/src/Validator/Rule/FileName.php
@@ -7,12 +7,12 @@ use ctiso\Validator\Rule\AbstractRule,
 
 class FileName extends AbstractRule {
 
-    public function getErrorMsg()
+    public function getErrorMsg(): string
     {
         return 'Название файла может содержать только символы латиницы в нижнем регистре и цифры';
     }
 
-    public function isValid(Collection $container, $status = null)
+    public function isValid(Collection $container, $status = null): bool
     {
         return Path::isName($container->get($this->field));
     }
diff --git a/src/Validator/Rule/IsFile.php b/src/Validator/Rule/IsFile.php
index 5304718..37115f8 100644
--- a/src/Validator/Rule/IsFile.php
+++ b/src/Validator/Rule/IsFile.php
@@ -9,42 +9,42 @@ use ctiso\Validator\Rule\AbstractRule,
 
 class IsFile extends AbstractRule
 {
-    private $type = array();
-    private $maxsize = 1024;
+    private array $type = [];
+    private int $maxsize = 1024;
 
-    function skipEmpty() {
+    function skipEmpty(): bool {
         return false;
     }
 
-    function setSize($size) {
+    function setSize(int $size): void {
         $this->maxsize = $size;
     }
 
-    function setType(array $type) {
+    function setType(array $type): void {
         $this->type = $type;
     }
 
-    public function isValid(Collection $container, $status = null)
+    public function isValid(Collection $container, $status = null): bool
     {
         if (!isset($_FILES[$this->field]) || $_FILES[$this->field]['error'] == UPLOAD_ERR_NO_FILE) {
             $this->setErrorMsg('Файл не загружен');
-            return false;    
+            return false;
         }
 
         if ($_FILES[$this->field]['error'] == UPLOAD_ERR_INI_SIZE) {
             $this->setErrorMsg('Превышен размер файла');
-            return false;    
+            return false;
         }
 
         $tmp = $_FILES[$this->field];
         if (!in_array($tmp['type'], $this->type)) {
             $this->setErrorMsg('Неверный формат файла');
-            return false;    
+            return false;
         }
 
         if (((int)$tmp['size']) > $this->maxsize*1024) {
             $this->setErrorMsg('Неверный размер файла');
-            return false;    
+            return false;
         }
 
         return true;
diff --git a/src/Validator/Rule/MatchRule.php b/src/Validator/Rule/MatchRule.php
index d54f448..ab167d3 100644
--- a/src/Validator/Rule/MatchRule.php
+++ b/src/Validator/Rule/MatchRule.php
@@ -11,12 +11,13 @@ class MatchRule extends AbstractRule
 {
     public $same;
 
-    public function getErrorMsg()
-    { 
+    public function getErrorMsg(): string
+    {
         return "Поля не совпадают";
     }
 
-    public function isValid(Collection $container, $status = null) {
+    public function isValid(Collection $container, $status = null): bool
+    {
         return (strcmp($container->get($this->field), $container->get($this->same)) == 0);
     }
 }
diff --git a/src/Validator/Rule/Notnull.php b/src/Validator/Rule/Notnull.php
index d9130da..2a146e2 100644
--- a/src/Validator/Rule/Notnull.php
+++ b/src/Validator/Rule/Notnull.php
@@ -6,16 +6,16 @@ use ctiso\Validator\Rule\AbstractRule,
 
 class Notnull extends AbstractRule
 {
-    function skipEmpty() {
+    function skipEmpty(): bool {
         return false;
     }
 
-    public function getErrorMsg()
-    { 
+    public function getErrorMsg(): string
+    {
         return "Поле не должно быть пустым";
     }
 
-    public function isValid(Collection $container, $status = null)
+    public function isValid(Collection $container, $status = null): bool
     {
         $data = $container->get($this->field);
         if (is_array($data)) {
diff --git a/src/Validator/Rule/Numeric.php b/src/Validator/Rule/Numeric.php
index a3c6a5a..1fe5b0d 100644
--- a/src/Validator/Rule/Numeric.php
+++ b/src/Validator/Rule/Numeric.php
@@ -9,12 +9,12 @@ use ctiso\Validator\Rule\AbstractRule,
 
 class Numeric extends AbstractRule
 {
-    public function getErrorMsg()
-    { 
+    public function getErrorMsg(): string
+    {
         return "Значение поля должно быть числом";
     }
 
-    public function isValid(Collection $container, $status = null)
+    public function isValid(Collection $container, $status = null): bool
     {
         return (is_numeric($container->get($this->field)));
     }
diff --git a/src/Validator/Rule/PregMatch.php b/src/Validator/Rule/PregMatch.php
index 3d400bb..6b7f75c 100644
--- a/src/Validator/Rule/PregMatch.php
+++ b/src/Validator/Rule/PregMatch.php
@@ -1,21 +1,20 @@
 <?php
 
-/**
- */
 namespace ctiso\Validator\Rule;
+
 use ctiso\Validator\Rule\AbstractRule,
     ctiso\Collection;
 
 class PregMatch extends AbstractRule
 {
-  public $pattern;
-  public function getErrorMsg()
-  {
-      return "Поле в неправильном формате";
-  }
+    public string $pattern;
+    public function getErrorMsg(): string
+    {
+        return "Поле в неправильном формате";
+    }
 
-  public function isValid(Collection $container, $status = null)
-  {
-        return preg_match($this->pattern,$container->get($this->field));
-  }
+    public function isValid(Collection $container, $status = null): bool
+    {
+        return preg_match($this->pattern, $container->get($this->field));
+    }
 }
diff --git a/src/Validator/Rule/Time.php b/src/Validator/Rule/Time.php
index c4ecc58..658e3e8 100644
--- a/src/Validator/Rule/Time.php
+++ b/src/Validator/Rule/Time.php
@@ -11,19 +11,20 @@ class Time extends AbstractRule
 {
     private $split = ":";
 
-    public function getErrorMsg()
+    public function getErrorMsg(): string
     {
         return "Неверный формат времени";
     }
 
-    static function checktime($hour, $minute)
+    static function checktime(int $hour, int $minute): bool
     {
         if ($hour > -1 && $hour < 24 && $minute > -1 && $minute < 60) {
             return true;
         }
+        return false;
     }
 
-    public function isValid(Collection $container, $status = null)
+    public function isValid(Collection $container, $status = null): bool
     {
         /** @var list<string> */
         $tmp = explode($this->split, $container->get($this->field), 2);
diff --git a/src/Validator/Rule/Unique.php b/src/Validator/Rule/Unique.php
index 81489c3..b3d49fa 100644
--- a/src/Validator/Rule/Unique.php
+++ b/src/Validator/Rule/Unique.php
@@ -8,12 +8,12 @@ use ctiso\Validator\Rule\AbstractRule,
 
 class Unique extends AbstractRule
 {
-    public function getErrorMsg()
+    public function getErrorMsg(): string
     {
         return $this->ctx->getMessage();
     }
 
-    public function isValid(Collection $container, $status = null)
+    public function isValid(Collection $container, $status = null): bool
     {
         return $this->ctx->isUnique($container->get($this->field), $status, $container);
     }
diff --git a/src/Validator/Validator.php b/src/Validator/Validator.php
index c284746..8abd7dd 100644
--- a/src/Validator/Validator.php
+++ b/src/Validator/Validator.php
@@ -1,7 +1,5 @@
 <?php
 
-///<reference path="Rule/Notnull.php"/>
-
 /**
  * Проверка коллекции
  */
@@ -12,8 +10,10 @@ use Exception,
 
 class Validator
 {
-    protected $chain = [];     // Массив правил
-    protected $errorMsg = [];  // Массив ошибок
+    /** @var AbstractRule[] */
+    protected array $chain = [];     // Массив правил
+    /** @var array<string, string> */
+    protected array $errorMsg = [];  // Массив ошибок
 
     /**
      * Поля по умолчанию
@@ -40,7 +40,12 @@ class Validator
         $this->addRuleList($rules);
     }
 
-    function addRuleType($name, $className) {
+    /**
+     * Добавление правила в список
+     * @param string $name
+     * @param class-string<Rule\AbstractRule> $className
+     */
+    function addRuleType(string $name, string $className) {
         $this->type[$name] = $className;
     }
 
@@ -83,7 +88,7 @@ class Validator
         }
     }
 
-    public function addRule($rule) {
+    public function addRule(array|AbstractRule $rule): void {
         if (is_array($rule)) {
             $this->chain = array_merge($this->chain, $rule);
         } else {
@@ -93,9 +98,8 @@ class Validator
 
     /**
      * @param AbstractRule $rule
-     * @param Collection $container
      */
-    public function skip($rule, $container) // -> Rule_Abstract
+    public function skip($rule, Collection $container) // -> Rule_Abstract
     {
         if ($rule->skipEmpty()) {
             $data = $container->get($rule->field);
@@ -111,7 +115,7 @@ class Validator
         $this->errorMsg = [];
     }
 
-    public function validate(Collection $container, $rule = null, $status = null)
+    public function validate(Collection $container, $rule = null, $status = null): bool
     {
         $fields = [];
         if ($rule) {
diff --git a/src/View/Composite.php b/src/View/Composite.php
index 046e18e..bc2101b 100644
--- a/src/View/Composite.php
+++ b/src/View/Composite.php
@@ -3,7 +3,7 @@
 namespace ctiso\View;
 use ctiso\View\View,
     PHPTAL;
-    
+
 class Composite extends View
 {
     private $tal;
@@ -15,14 +15,14 @@ class Composite extends View
 
         $this->tal = new PHPTAL($file);
         $this->tal->setPhpCodeDestination(PHPTAL_PHP_CODE_DESTINATION);
-        $this->tal->setEncoding(PHPTAL_DEFAULT_ENCODING); 
+        $this->tal->setEncoding(PHPTAL_DEFAULT_ENCODING);
         $this->tal->setTemplateRepository(PHPTAL_TEMPLATE_REPOSITORY);
         $this->tal->setOutputMode(PHPTAL::HTML5);
         $this->tal->stripComments(true);
 //        $this->tal->addPreFilter(new PHPTAL_PreFilter_Normalize());
     }
 
-    function set($key, $val) {
+    function set(string $key, mixed $val) {
         if ($key == 'title') {
             $this->setTitle($val);
         }
diff --git a/src/View/Plain.php b/src/View/Plain.php
index 8ffc877..032c259 100644
--- a/src/View/Plain.php
+++ b/src/View/Plain.php
@@ -8,7 +8,7 @@ namespace ctiso\View;
 class Plain extends \stdClass
 {
     protected $document;
-    protected $values = array();
+    protected $values = [];
 
     public function __construct ($document)
     {
@@ -36,10 +36,10 @@ class Plain extends \stdClass
         return self::getTemplateContent ($this->document, $result);
     }
 
-    static function getTemplateContent($document, $result)
+    static function getTemplateContent(string $document, $result): string
     {
         ob_start ();
-        include ($document);        
+        include ($document);
         $content = ob_get_contents ();
         ob_clean ();
         return $content;
diff --git a/src/View/View.php b/src/View/View.php
index 377e3ed..70a565e 100644
--- a/src/View/View.php
+++ b/src/View/View.php
@@ -5,23 +5,23 @@ use Exception;
 
 class View extends \stdClass
 {
-    protected $_section    = array();     // Вложенные шаблоны
+    protected array $_section    = [];     // Вложенные шаблоны
     // Блоки
-    protected $_stylesheet = array();     // Массив стилей текущего шаблона
-    protected $_script     = array();     // Массив скриптов текущего шаблона
-    public $_scriptstring  = array();
-    protected $_startup    = array();
-    protected $_values    = array();
+    protected array $_stylesheet = [];     // Массив стилей текущего шаблона
+    protected array $_script     = [];     // Массив скриптов текущего шаблона
+    public array $_scriptstring  = [];
+    protected array $_startup    = [];
+    protected array $_values     = [];
 
-    protected $_title      = null;        // Заголовок текущего шаблона
+    protected ?string $_title     = null;   // Заголовок текущего шаблона
 
-    public $active_module;
-    public $module_action;
-    public $prefix;
+    public string $active_module;
+    public string $module_action;
+    public array $prefix;
 
-    public $suggestions; //подсказки
+    public array $suggestions; //подсказки
 
-    public $alias = [];
+    public array $alias = [];
     public $codeGenerator = null;
     public $parent_view = null;
 
@@ -53,7 +53,7 @@ class View extends \stdClass
      *
      * @param string $name путь к скрипту
      */
-    public function addScript($name): void
+    public function addScript(string $name): void
     {
         $output = $this->resolveName($this->alias, $name . '?' . http_build_query($this->prefix));
         $this->_script [] = $output;
@@ -62,18 +62,18 @@ class View extends \stdClass
     /**
      * Добавляет код скипта к текущему шаблону
      *
-     * @param string $name строка javascript кода
+     * @param string $code строка javascript кода
      */
-    public function addScriptRaw($name, $startup = false): void
+    public function addScriptRaw(string $code, bool $startup = false): void
     {
         if ($startup) {
-            $this->_startup [] = $name;
+            $this->_startup [] = $code;
         } else {
-            $this->_scriptstring [] = $name;
+            $this->_scriptstring [] = $code;
         }
     }
 
-    public function setPrefix($name, $val) {
+    public function setPrefix(string $name, string $val): void {
         $this->prefix[$name] = $val;
     }
 
@@ -82,7 +82,7 @@ class View extends \stdClass
      *
      * @param string $name путь к стилю
      */
-    public function addStyleSheet($name)
+    public function addStyleSheet(string $name): void
     {
         $output = $this->resolveName($this->alias, $name . '?' . http_build_query($this->prefix));
         $this->_stylesheet [] = $output;
@@ -92,9 +92,9 @@ class View extends \stdClass
      * Рекурсивно извлекает из значение свойства обьекта
      *
      * @param string $list Имя свойства
-     * @param boolean $flatten
+     * @param bool $flatten
      */
-    protected function doTree($list, $flatten = true)
+    protected function doTree($list, bool $flatten = true)
     {
         $result = ($flatten == true) ? $this->$list : [$this->$list];
         foreach ($this->_section as $value) {
@@ -109,7 +109,7 @@ class View extends \stdClass
         return $result;
     }
 
-    /*abstract*/ public function set($key, $value)
+    /*abstract*/ public function set(string $key, mixed $value)
     {
     }
 
@@ -125,10 +125,8 @@ class View extends \stdClass
 
     /**
      * Установка заголовка шаблона
-     *
-     * @param string $title
      */
-    public function setTitle($title): void
+    public function setTitle(string $title): void
     {
         $this->_title = $title;
     }
@@ -143,13 +141,16 @@ class View extends \stdClass
         $this->alias = $alias;
     }
 
-    function addAlias($name, $path): void
+    function addAlias(string $name, string $path): void
     {
         $this->alias[$name] = $path;
         $this->set($name, $path);
     }
 
-    function findFile($pathlist, string $file): string {
+    /**
+     * @param string[] $pathlist
+     */
+    function findFile(array $pathlist, string $file): string {
 
         foreach($pathlist as $key => $www) {
             if (file_exists($key . '/' . $file)) {
@@ -160,7 +161,7 @@ class View extends \stdClass
     }
 
     // FIXME: Префикс, конфликтует с протоколом
-    function resolveName($alias, $file): string {
+    function resolveName($alias, string $file): string {
         list($type, $filename) = explode(":", $file, 2);
 
         // Сделать поиск а не просто замену папки при совпадении имени
@@ -175,7 +176,7 @@ class View extends \stdClass
         return $file;
     }
 
-    public function resolveAllNames($alias, $list) {
+    public function resolveAllNames($alias, array $list): array {
         $result = [];
         foreach($list as $item) {
             $result [] = $this->resolveName($alias, $item);