From 2178b4b3fa1c92b8f26b7c74e80330d22291faf8 Mon Sep 17 00:00:00 2001
From: Anton Shevchuk <AntonShevchuk@gmail.com>
Date: Wed, 8 Nov 2017 15:30:42 +0200
Subject: [PATCH 1/4] Updated codestyle

---
 application/layouts/partial/nav-bar.phtml     |  2 +-
 application/modules/acl/views/index.phtml     |  1 +
 application/modules/acl/views/roles.phtml     |  1 +
 application/modules/acl/views/user.phtml      |  1 +
 .../modules/cache/views/widgets/index.phtml   |  1 +
 .../modules/dashboard/views/index.phtml       |  1 +
 application/modules/error/views/index.phtml   |  4 ++
 application/modules/index/views/index.phtml   |  1 +
 application/modules/pages/views/crud.phtml    |  6 +--
 application/modules/pages/views/grid.phtml    |  1 +
 application/modules/pages/views/index.phtml   |  1 +
 .../modules/system/views/bookmarks.phtml      |  4 +-
 application/modules/system/views/info.phtml   |  1 +
 .../modules/system/views/routers.phtml        |  1 +
 .../modules/users/views/change-email.phtml    |  1 +
 .../modules/users/views/change-password.phtml |  1 +
 application/modules/users/views/crud.phtml    |  1 +
 application/modules/users/views/signup.phtml  |  1 +
 public/js/bluz.ajax.js                        | 45 ++++++++++---------
 public/js/bluz.js                             |  8 +---
 20 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/application/layouts/partial/nav-bar.phtml b/application/layouts/partial/nav-bar.phtml
index c68a8d1c..6b05911c 100644
--- a/application/layouts/partial/nav-bar.phtml
+++ b/application/layouts/partial/nav-bar.phtml
@@ -43,7 +43,7 @@
       </li>
       <?php endif; ?>
     </ul>
-    <div id="loading" data-ajax-loading-show data-ajax-loading-hide></div>
+    <div id="loading" data-ajax-loading></div>
     <span class="navbar-text">
       <?php if ($identity = $this->user()) : ?>
         <?= __(
diff --git a/application/modules/acl/views/index.phtml b/application/modules/acl/views/index.phtml
index b57d5fc5..c9d69ac1 100644
--- a/application/modules/acl/views/index.phtml
+++ b/application/modules/acl/views/index.phtml
@@ -1,3 +1,4 @@
+<?php /** @var \Bluz\View\View $this */ ?>
 <nav class="navbar navbar-light bg-light">
   <a href="<?= $this->url('acl', 'roles') ?>" id="create-role" class="btn btn-primary"
        data-ajax-dialog data-ajax-method="get"><?= __('Create role') ?></a>
diff --git a/application/modules/acl/views/roles.phtml b/application/modules/acl/views/roles.phtml
index 505ea2ee..1f2cd1c4 100644
--- a/application/modules/acl/views/roles.phtml
+++ b/application/modules/acl/views/roles.phtml
@@ -1,3 +1,4 @@
+<?php /** @var \Bluz\View\View $this */ ?>
 <?php $uid = uniqid('form_', false); ?>
 <form id="<?= $uid ?>" action="<?= $this->url('acl', 'roles') ?>" class="form-horizontal" data-ajax method="<?= $method ?>">
   <input type="hidden" name="id" value="<?= $row->id ?>"/>
diff --git a/application/modules/acl/views/user.phtml b/application/modules/acl/views/user.phtml
index a5f1115d..ab6f29c4 100644
--- a/application/modules/acl/views/user.phtml
+++ b/application/modules/acl/views/user.phtml
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @var \Bluz\View\View $this
  * @var \Application\Users\Row $user
  */
 ?>
diff --git a/application/modules/cache/views/widgets/index.phtml b/application/modules/cache/views/widgets/index.phtml
index a20a2838..220f5d2a 100644
--- a/application/modules/cache/views/widgets/index.phtml
+++ b/application/modules/cache/views/widgets/index.phtml
@@ -1,3 +1,4 @@
+<?php /** @var \Bluz\View\View $this */ ?>
 <?php if ($adapter) : ?>
   <div class="card text-white bg-success mb-3">
     <div class="card-header"><?= __('Cache') ?></div>
diff --git a/application/modules/dashboard/views/index.phtml b/application/modules/dashboard/views/index.phtml
index 0966c52c..41043294 100644
--- a/application/modules/dashboard/views/index.phtml
+++ b/application/modules/dashboard/views/index.phtml
@@ -1,3 +1,4 @@
+<?php /** @var \Bluz\View\View $this */ ?>
 <div class="card-columns">
   <?= $this->dispatch('system', 'widgets/load') ?>
   <?= $this->dispatch('cache', 'widgets/index') ?>
diff --git a/application/modules/error/views/index.phtml b/application/modules/error/views/index.phtml
index c302fb4d..bcf524b0 100644
--- a/application/modules/error/views/index.phtml
+++ b/application/modules/error/views/index.phtml
@@ -1,3 +1,4 @@
+<?php /** @var \Bluz\View\View $this */ ?>
 <div class="modal-header">
   <h3 class="modal-title"><?= esc($error) ?></h3>
 </div>
@@ -5,3 +6,6 @@
   <p><?= esc($message) ?></p>
   <?= $this->exception($exception) ?>
 </div>
+<div class="modal-footer">
+
+</div>
diff --git a/application/modules/index/views/index.phtml b/application/modules/index/views/index.phtml
index ab5a2427..5707a89e 100644
--- a/application/modules/index/views/index.phtml
+++ b/application/modules/index/views/index.phtml
@@ -1,3 +1,4 @@
+<?php /** @var \Bluz\View\View $this */ ?>
 <h2>What next?</h2>
 <hr/>
 <div id="setup" role="tablist">
diff --git a/application/modules/pages/views/crud.phtml b/application/modules/pages/views/crud.phtml
index 485493fe..c4896341 100644
--- a/application/modules/pages/views/crud.phtml
+++ b/application/modules/pages/views/crud.phtml
@@ -1,8 +1,4 @@
-<?php
-/**
- * @var \Bluz\View\View $this
- */
-?>
+<?php /** @var \Bluz\View\View $this */ ?>
 <?php $uid = uniqid('form_', false); ?>
   <form id="<?= $uid ?>" action="<?= $this->url('pages', 'crud') ?>" class="form-horizontal" data-ajax
         method="<?= $method ?>">
diff --git a/application/modules/pages/views/grid.phtml b/application/modules/pages/views/grid.phtml
index 90dadcbb..88c0aad2 100644
--- a/application/modules/pages/views/grid.phtml
+++ b/application/modules/pages/views/grid.phtml
@@ -1,6 +1,7 @@
 <?php
 /**
  * @var \Bluz\Grid\Grid $grid
+ * @var \Bluz\View\View $this
  */
 if (!$grid) {
     return;
diff --git a/application/modules/pages/views/index.phtml b/application/modules/pages/views/index.phtml
index fc2693bd..369cb934 100644
--- a/application/modules/pages/views/index.phtml
+++ b/application/modules/pages/views/index.phtml
@@ -1,3 +1,4 @@
+<?php /** @var \Bluz\View\View $this */ ?>
 <h1><?= esc($page->title) ?></h1>
 <hr/>
 <?= $page->content ?>
diff --git a/application/modules/system/views/bookmarks.phtml b/application/modules/system/views/bookmarks.phtml
index 55110b8e..ae037abe 100644
--- a/application/modules/system/views/bookmarks.phtml
+++ b/application/modules/system/views/bookmarks.phtml
@@ -1,7 +1,7 @@
 <?php
+/** @var \Bluz\View\View $this */
 use Bluz\Application\Application;
-// for IDE syntax highlighter
-/** @var $key */
+
 $on = "javascript:(function(){document.cookie='BLUZ_DEBUG=1;path=/;';window.location.reload();})()";
 $off = "javascript:(function(){document.cookie='BLUZ_DEBUG=;expires=Mon,%2005%20Jul%202000%2000:00:00%20GMT;path=/;';window.location.reload();})()";
 
diff --git a/application/modules/system/views/info.phtml b/application/modules/system/views/info.phtml
index ba9d5306..ecb83354 100644
--- a/application/modules/system/views/info.phtml
+++ b/application/modules/system/views/info.phtml
@@ -1 +1,2 @@
+<?php /** @var \Bluz\View\View $this */ ?>
 <iframe src="<?= $this->url('system', 'phpinfo') ?>" width="100%" height="600px"></iframe>
diff --git a/application/modules/system/views/routers.phtml b/application/modules/system/views/routers.phtml
index 7fa12b11..7602cd3b 100644
--- a/application/modules/system/views/routers.phtml
+++ b/application/modules/system/views/routers.phtml
@@ -1,3 +1,4 @@
+<?php /** @var \Bluz\View\View $this */ ?>
 <div>
   <table class="table table-striped table-bordered table-condensed table-hover">
     <thead>
diff --git a/application/modules/users/views/change-email.phtml b/application/modules/users/views/change-email.phtml
index ef954d70..11720228 100644
--- a/application/modules/users/views/change-email.phtml
+++ b/application/modules/users/views/change-email.phtml
@@ -1,3 +1,4 @@
+<?php /** @var \Bluz\View\View $this */ ?>
 <?php $uid = uniqid('form_', false); ?>
 <div class="card text-center">
   <?php require_once __DIR__ .'/partial/card-header.phtml' ?>
diff --git a/application/modules/users/views/change-password.phtml b/application/modules/users/views/change-password.phtml
index 102d5c56..6a76d71e 100644
--- a/application/modules/users/views/change-password.phtml
+++ b/application/modules/users/views/change-password.phtml
@@ -1,3 +1,4 @@
+<?php /** @var \Bluz\View\View $this */ ?>
 <?php $uid = uniqid('form_', false); ?>
 <div class="card text-center">
   <?php require_once __DIR__ .'/partial/card-header.phtml' ?>
diff --git a/application/modules/users/views/crud.phtml b/application/modules/users/views/crud.phtml
index 9ad85059..34c7a103 100644
--- a/application/modules/users/views/crud.phtml
+++ b/application/modules/users/views/crud.phtml
@@ -1,4 +1,5 @@
 <?php
+/** @var \Bluz\View\View $this */
 use Application\Users\Table;
 
 $uid = uniqid('form_', false); ?>
diff --git a/application/modules/users/views/signup.phtml b/application/modules/users/views/signup.phtml
index 39db2d0c..063f17d9 100644
--- a/application/modules/users/views/signup.phtml
+++ b/application/modules/users/views/signup.phtml
@@ -1,3 +1,4 @@
+<?php /** @var \Bluz\View\View $this */ ?>
 <?php $uid = uniqid('form_', false); ?>
 
 <form id="<?= $uid ?>" action="<?= $this->url('users', 'signup') ?>" data-ajax method="post">
diff --git a/public/js/bluz.ajax.js b/public/js/bluz.ajax.js
index 53b1f54b..24735845 100644
--- a/public/js/bluz.ajax.js
+++ b/public/js/bluz.ajax.js
@@ -2,11 +2,11 @@
  * Declarative AJAX development
  *
  * <code>
- *  <a href="/get" class="ajax">Click Me!</a>
- *  <a href="/dialog" class="dialog">Click Me!</a>
- *  <a href="/delete" class="confirm" data-confirm="Are you sure?">Click Me!</a>
- *  <a href="/delete" class="ajax confirm" data-id="3" data-ajax-method="DELETE">Click Me!</a>
- *  <form action="/save/" class="ajax">
+ *  <a href="/get" data-ajax">Click Me!</a>
+ *  <a href="/dialog" data-ajax-dialog>Click Me!</a>
+ *  <a href="/delete" data-confirm="Are you sure?">Click Me!</a>
+ *  <a href="/delete" data-confirm data-ajax data-ajax-method="DELETE" data-id="3">Click Me!</a>
+ *  <form action="/save/" data-ajax>
  *    ...
  *  </form>
  *  <source>
@@ -23,6 +23,15 @@
 define(['jquery', 'bluz', 'bluz.modal', 'bluz.notify'], function ($, bluz, modal, notify) {
   'use strict';
 
+  let ajax = {
+    showLoading: () => {
+      $('[data-ajax-loading]').show();
+    },
+    hideLoading: () => {
+      $('[data-ajax-loading]').hide();
+    }
+  };
+
   /**
    * Repack data to simple hash
    * @param {{}} data of DOM Element
@@ -95,7 +104,7 @@ define(['jquery', 'bluz', 'bluz.modal', 'bluz.notify'], function ($, bluz, modal
      * @link http://api.jquery.com/ajaxStop/
      */
     $(document)
-      .ajaxStart(bluz.showLoading)
+      .ajaxStart(ajax.showLoading)
       .ajaxSend(function (event, jqXHR, options) {
         let $element = $(options.context);
         if ($element.hasClass('disabled')) {
@@ -106,8 +115,8 @@ define(['jquery', 'bluz', 'bluz.modal', 'bluz.notify'], function ($, bluz, modal
       })
       .ajaxSuccess(function (event, jqXHR, options) {
         try {
-          let $element = $(options.context);
-          $element.trigger('success.bluz.ajax', arguments);
+          // trigger `success.bluz.ajax` event
+          $(options.context).trigger('success.bluz.ajax', arguments);
 
           // try to get messages from headers
           extractNotifyHeader(jqXHR);
@@ -120,8 +129,8 @@ define(['jquery', 'bluz', 'bluz.modal', 'bluz.notify'], function ($, bluz, modal
       })
       .ajaxError(function (event, jqXHR, options, thrownError) {
         try {
-          let $element = $(options.context);
-          $element.trigger('error.bluz.ajax', arguments);
+          // trigger `error.bluz.ajax` event
+          $(options.context).trigger('error.bluz.ajax', arguments);
 
           // try to get messages from headers
           extractNotifyHeader(jqXHR);
@@ -142,10 +151,9 @@ define(['jquery', 'bluz', 'bluz.modal', 'bluz.notify'], function ($, bluz, modal
         }
       })
       .ajaxComplete(function (event, jqXHR, options) {
-        let $element = $(options.context);
-        $element.removeClass('disabled');
+        $(options.context).removeClass('disabled');
       })
-      .ajaxStop(bluz.hideLoading);
+      .ajaxStop(ajax.hideLoading);
 
     // live event handlers
     $('body')
@@ -292,25 +300,22 @@ define(['jquery', 'bluz', 'bluz.modal', 'bluz.notify'], function ($, bluz, modal
       event.preventDefault();
 
       let $this = $(this);
-
       let url = $this.is('a') ? $this.attr('href') : $this.data('preview');
 
       if (!url) {
-        event.preventDefault();
         return;
       }
 
-      let $img = $('<img>', {'src': url, 'class': 'img-polaroid'});
+      let $img = $('<img>', {'src': url, 'class': 'img-thumbnail'});
       $img.css({
         width: '100%',
         margin: '0 auto',
         display: 'block'
       });
 
-      let $span = $('<span>', {'class': 'thumbnail'});
-      $span.append($img);
-
-      modal.create($this, $span, '').modal('show');
+      modal.create($this, $img, '').modal('show');
     }
   });
+
+  return ajax;
 });
diff --git a/public/js/bluz.js b/public/js/bluz.js
index f2021b74..5c26dfcd 100644
--- a/public/js/bluz.js
+++ b/public/js/bluz.js
@@ -12,7 +12,7 @@ define(['jquery', 'popper'], function ($, popper) {
 
   // TODO: fix this after release new version of boostrap
   // @link https://github.com/twbs/bootstrap/issues/23381#issuecomment-330850892
-  require(['bootstrap'], function() {
+  require(['bootstrap'], function () {
     // do nothing - just let Bootstrap initialise itself
     $(function () {
       // TODO: require other modules if needed
@@ -29,12 +29,6 @@ define(['jquery', 'popper'], function ($, popper) {
   });
 
   return {
-    showLoading: () => {
-      $('[data-ajax-loading-show]').show();
-    },
-    hideLoading: () => {
-      $('[data-ajax-loading-hide]').hide();
-    },
     log: (message, text) => {
       if (window.console !== undefined) {
         window.console.log(message, text);

From be36e35c4a5ca4689577e8d6b18e373edf91cc61 Mon Sep 17 00:00:00 2001
From: Anton Shevchuk <AntonShevchuk@gmail.com>
Date: Mon, 13 Nov 2017 10:07:37 +0200
Subject: [PATCH 2/4] Migrate to PHP 7.1

---
 .travis.yml                                   |  1 -
 application/layouts/partial/nav-bar.phtml     |  5 +---
 application/layouts/partial/nav-menu.phtml    |  2 +-
 application/library/Application/Bootstrap.php | 20 +++++++-------
 .../models/Auth/Provider/AbstractProvider.php |  5 ++--
 application/models/Auth/Provider/Cookie.php   |  2 +-
 application/models/Auth/Provider/Equals.php   |  2 +-
 application/models/Auth/Provider/Token.php    |  2 +-
 application/models/Auth/Row.php               | 14 ++++------
 application/models/Auth/Table.php             | 16 ++++++------
 application/models/Pages/Grid.php             |  6 ++---
 application/models/Pages/Row.php              |  8 +++---
 application/models/Pages/Table.php            |  4 +--
 application/models/Privileges/Table.php       | 10 +++----
 application/models/Roles/Row.php              | 12 ++++-----
 application/models/Roles/Table.php            | 13 +++++++---
 application/models/Users/Grid.php             |  4 +--
 application/models/Users/Mail.php             | 26 +++++++++++++++----
 application/models/Users/Row.php              | 21 ++++++++-------
 application/models/Users/Table.php            |  6 ++---
 application/models/UsersActions/Table.php     |  2 +-
 application/models/UsersRoles/Table.php       |  2 +-
 application/modules/acl/controllers/index.php |  6 ++---
 application/modules/acl/controllers/save.php  |  2 +-
 .../modules/system/controllers/routers.php    |  2 +-
 composer.json                                 |  2 +-
 public/index.php                              |  1 -
 tests/src/ControllerTestCase.php              |  8 +++---
 tests/unit/_bootstrap.php                     |  2 +-
 .../modules/index/controllers/IndexTest.php   |  6 ++---
 30 files changed, 114 insertions(+), 98 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f61ecee5..04d69d6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: php
 php:
-  - 7.0
   - 7.1
   - 7.2
   - master
diff --git a/application/layouts/partial/nav-bar.phtml b/application/layouts/partial/nav-bar.phtml
index 6b05911c..f81cae89 100644
--- a/application/layouts/partial/nav-bar.phtml
+++ b/application/layouts/partial/nav-bar.phtml
@@ -46,10 +46,7 @@
     <div id="loading" data-ajax-loading></div>
     <span class="navbar-text">
       <?php if ($identity = $this->user()) : ?>
-        <?= __(
-            'Logged in as %s',
-            $this->ahref($identity->login, ['users', 'profile'])
-        ) ?>
+        <?= __('Logged in as %s', $this->ahref($identity->login, ['users', 'profile'])) ?>
         (<?= $this->ahref(__('Sign Out'), ['users', 'signout']) ?>)
       <?php else: ?>
         <?= $this->ahref(__('Sign In'), ['users', 'signin'], ['data-ajax-dialog', 'data-ajax-method' => 'get']) ?>
diff --git a/application/layouts/partial/nav-menu.phtml b/application/layouts/partial/nav-menu.phtml
index 914bad98..4bb5298c 100644
--- a/application/layouts/partial/nav-menu.phtml
+++ b/application/layouts/partial/nav-menu.phtml
@@ -1,4 +1,4 @@
-
+<?php /** @var \Bluz\Layout\Layout $this */ ?>
 <nav class="col-sm-3 col-md-2 d-none d-sm-block bg-light sidebar">
     <hr/>
     <ul class="nav nav-pills flex-column">
diff --git a/application/library/Application/Bootstrap.php b/application/library/Application/Bootstrap.php
index c5989eb5..e0cf1ced 100644
--- a/application/library/Application/Bootstrap.php
+++ b/application/library/Application/Bootstrap.php
@@ -11,6 +11,7 @@
 use Application\Auth;
 use Bluz\Application\Application;
 use Bluz\Application\Exception\ForbiddenException;
+use Bluz\Application\Exception\RedirectException;
 use Bluz\Auth\AuthException;
 use Bluz\Controller\Controller;
 use Bluz\Proxy\Auth as AuthProxy;
@@ -36,7 +37,7 @@ class Bootstrap extends Application
     /**
      * {@inheritdoc}
      */
-    protected function preProcess()
+    protected function preProcess() : void
     {
         parent::preProcess();
 
@@ -56,7 +57,7 @@ protected function preProcess()
      * @throws \Bluz\Auth\AuthException
      * @throws \InvalidArgumentException
      */
-    protected function preDispatch($controller)
+    protected function preDispatch($controller) : void
     {
         // example of setup default title
         Layout::title('Bluz Skeleton');
@@ -84,7 +85,7 @@ protected function preDispatch($controller)
      *
      * @return \Bluz\Controller\Controller|null
      */
-    public function forbidden(ForbiddenException $exception)
+    public function forbidden(ForbiddenException $exception) : ?Controller
     {
         // for AJAX and API calls (over JSON)
         $jsonOrApi = Request::isXmlHttpRequest()
@@ -97,8 +98,9 @@ public function forbidden(ForbiddenException $exception)
             // add error notice
             Messages::addError('You don\'t have permissions, please sign in');
             // redirect to Sign In page
-            $url = Router::getUrl('users', 'signin');
-            return $this->redirect($url);
+            $redirect = new RedirectException();
+            $redirect->setUrl(Router::getUrl('users', 'signin'));
+            return $this->redirect($redirect);
         }
         return $this->error($exception);
     }
@@ -108,7 +110,7 @@ public function forbidden(ForbiddenException $exception)
      *
      * @return void
      */
-    public function render()
+    public function render() : void
     {
         Logger::info('app:render');
         Logger::info('app:files:' . count(get_included_files()));
@@ -130,7 +132,7 @@ public function render()
      *
      * @return void
      */
-    public function end()
+    public function end() : void
     {
         if ($errors = Logger::get('error')) {
             $this->sendErrors($errors);
@@ -142,7 +144,7 @@ public function end()
      *
      * @return void
      */
-    protected function sendInfoHeaders()
+    protected function sendInfoHeaders() : void
     {
         $debugString = sprintf(
             '%fsec; %skb',
@@ -167,7 +169,7 @@ protected function sendInfoHeaders()
      *
      * @return void
      */
-    protected function sendErrors($errors)
+    protected function sendErrors($errors) : void
     {
         foreach ($errors as $message) {
             errorLog(new \ErrorException($message, 0, E_USER_ERROR));
diff --git a/application/models/Auth/Provider/AbstractProvider.php b/application/models/Auth/Provider/AbstractProvider.php
index e22bf0d5..5fc704f6 100644
--- a/application/models/Auth/Provider/AbstractProvider.php
+++ b/application/models/Auth/Provider/AbstractProvider.php
@@ -31,7 +31,7 @@ abstract class AbstractProvider
      * @throws \Application\Exception
      * @throws \Bluz\Auth\AuthException
      */
-    abstract public static function authenticate($token);
+    abstract public static function authenticate($token) : void;
 
     /**
      * Check if supplied cookie is valid
@@ -60,9 +60,10 @@ abstract public static function create($user) : Row;
      * @param integer $id User ID
      *
      * @return void
+     * @throws \Bluz\Common\Exception\ConfigurationException
      * @throws \Bluz\Db\Exception\DbException
      */
-    public static function remove($id)
+    public static function remove($id) : void
     {
         // clear previous generated Auth record
         // works with change password
diff --git a/application/models/Auth/Provider/Cookie.php b/application/models/Auth/Provider/Cookie.php
index be45ad09..fae39ef9 100644
--- a/application/models/Auth/Provider/Cookie.php
+++ b/application/models/Auth/Provider/Cookie.php
@@ -25,7 +25,7 @@ class Cookie extends AbstractProvider
 {
     const PROVIDER = Table::PROVIDER_COOKIE;
 
-    public static function authenticate($token)
+    public static function authenticate($token) : void
     {
         $authRow = self::verify($token);
         $user = UsersTable::findRow($authRow->userId);
diff --git a/application/models/Auth/Provider/Equals.php b/application/models/Auth/Provider/Equals.php
index 4b181f46..d623da42 100644
--- a/application/models/Auth/Provider/Equals.php
+++ b/application/models/Auth/Provider/Equals.php
@@ -23,7 +23,7 @@ class Equals extends AbstractProvider
 {
     const PROVIDER = Table::PROVIDER_EQUALS;
 
-    public static function authenticate($username, $password = '')
+    public static function authenticate($username, $password = '') : void
     {
         $authRow = self::verify($username, $password);
         $user = UsersTable::findRow($authRow->userId);
diff --git a/application/models/Auth/Provider/Token.php b/application/models/Auth/Provider/Token.php
index 44a6f0e3..93f02578 100644
--- a/application/models/Auth/Provider/Token.php
+++ b/application/models/Auth/Provider/Token.php
@@ -24,7 +24,7 @@ class Token extends AbstractProvider
 {
     const PROVIDER = Table::PROVIDER_TOKEN;
 
-    public static function authenticate($token)
+    public static function authenticate($token) : void
     {
         $authRow = self::verify($token);
         $user = UsersTable::findRow($authRow->userId);
diff --git a/application/models/Auth/Row.php b/application/models/Auth/Row.php
index b29d101f..eeca574f 100644
--- a/application/models/Auth/Row.php
+++ b/application/models/Auth/Row.php
@@ -8,7 +8,7 @@
 
 namespace Application\Auth;
 
-use Bluz\Auth\AbstractRow;
+use Bluz\Auth\Model\AbstractRow;
 
 /**
  * Auth Row
@@ -24,21 +24,17 @@
 class Row extends AbstractRow
 {
     /**
-     * __insert
-     *
-     * @return void
+     * {@inheritdoc}
      */
-    public function beforeInsert()
+    public function beforeInsert() : void
     {
         $this->created = gmdate('Y-m-d H:i:s');
     }
 
     /**
-     * __update
-     *
-     * @return void
+     * {@inheritdoc}
      */
-    public function beforeUpdate()
+    public function beforeUpdate() : void
     {
         $this->updated = gmdate('Y-m-d H:i:s');
     }
diff --git a/application/models/Auth/Table.php b/application/models/Auth/Table.php
index 118efa8a..eb7117b6 100644
--- a/application/models/Auth/Table.php
+++ b/application/models/Auth/Table.php
@@ -11,10 +11,10 @@
 use Application\Exception;
 use Application\Users;
 use Bluz\Application;
-use Bluz\Auth\AbstractTable;
+
 use Bluz\Auth\AuthException;
+use Bluz\Auth\Model\AbstractTable;
 use Bluz\Proxy\Auth;
-use Bluz\Proxy\Session;
 
 /**
  * Auth Table
@@ -22,9 +22,9 @@
  * @package  Application\Auth
  *
  * @method   static Row findRow($primaryKey)
- * @see \Bluz\Db\Table::findRow()
+ * @see      \Bluz\Db\Table::findRow()
  * @method   static Row findRowWhere($whereList)
- * @see \Bluz\Db\Table::findRowWhere()
+ * @see      \Bluz\Db\Table::findRowWhere()
  *
  * @author   Anton Shevchuk
  * @created  12.07.11 15:28
@@ -39,7 +39,7 @@ class Table extends AbstractTable
      * @throws \Application\Exception
      * @return string
      */
-    public static function hash($password)
+    public static function hash($password) : string
     {
         $hash = Auth::getInstance()->getOption('hash');
 
@@ -58,9 +58,9 @@ public static function hash($password)
      * @param string $hash
      *
      * @throws \Application\Exception
-     * @return string
+     * @return bool
      */
-    public static function verify($password, $hash)
+    public static function verify($password, $hash) : bool
     {
         $verify = Auth::getInstance()->getOption('verify');
 
@@ -79,7 +79,7 @@ public static function verify($password, $hash)
      *
      * @throws AuthException
      */
-    public static function tryLogin($user)
+    public static function tryLogin($user) : void
     {
         switch ($user->status) {
             case (Users\Table::STATUS_PENDING):
diff --git a/application/models/Pages/Grid.php b/application/models/Pages/Grid.php
index 2447d9c7..31ac871d 100644
--- a/application/models/Pages/Grid.php
+++ b/application/models/Pages/Grid.php
@@ -23,9 +23,9 @@ class Grid extends \Bluz\Grid\Grid
     protected $uid = 'pages';
 
     /**
-     * init
+     * {@inheritdoc}
      *
-     * @return self
+     * @throws \Bluz\Grid\GridException
      */
     public function init()
     {
@@ -37,7 +37,5 @@ public function init()
         $this->setDefaultLimit(25);
         $this->setAllowOrders(['title', 'id', 'created', 'updated']);
         $this->setAllowFilters(['title', 'alias', 'description', 'content', 'id']);
-
-        return $this;
     }
 }
diff --git a/application/models/Pages/Row.php b/application/models/Pages/Row.php
index 804be963..ff192b82 100644
--- a/application/models/Pages/Row.php
+++ b/application/models/Pages/Row.php
@@ -54,9 +54,9 @@ class Row extends \Bluz\Db\Row
     /**
      * {@inheritdoc}
      *
-     * @return void
+     * @throws \Bluz\Validator\Exception\ComponentException
      */
-    public function beforeSave()
+    public function beforeSave() : void
     {
         // title validator
         $this->addValidator('title')
@@ -104,7 +104,7 @@ function ($input) {
      *
      * @return void
      */
-    public function beforeInsert()
+    public function beforeInsert() : void
     {
         $this->created = gmdate('Y-m-d H:i:s');
 
@@ -121,7 +121,7 @@ public function beforeInsert()
      *
      * @return void
      */
-    public function beforeUpdate()
+    public function beforeUpdate() : void
     {
         $this->updated = gmdate('Y-m-d H:i:s');
     }
diff --git a/application/models/Pages/Table.php b/application/models/Pages/Table.php
index a8fe4801..8564526b 100644
--- a/application/models/Pages/Table.php
+++ b/application/models/Pages/Table.php
@@ -30,7 +30,7 @@ class Table extends \Bluz\Db\Table
      *
      * @var array
      */
-    protected $primary = array('id');
+    protected $primary = ['id'];
 
     /**
      * Get page by Alias
@@ -41,7 +41,7 @@ class Table extends \Bluz\Db\Table
      */
     public function getByAlias($alias)
     {
-        return self::findRowWhere(['alias' => $alias]);
+        return static::findRowWhere(['alias' => $alias]);
     }
 
     /**
diff --git a/application/models/Privileges/Table.php b/application/models/Privileges/Table.php
index 0fd6645d..97761700 100644
--- a/application/models/Privileges/Table.php
+++ b/application/models/Privileges/Table.php
@@ -17,8 +17,8 @@
  *
  * @package  Application\Privileges
  *
- * @method   static Row findRow($primaryKey)
- * @method   static Row findRowWhere($whereList)
+ * @method   static ?Row findRow($primaryKey)
+ * @method   static ?Row findRowWhere($whereList)
  */
 class Table extends \Bluz\Db\Table
 {
@@ -34,7 +34,7 @@ class Table extends \Bluz\Db\Table
      *
      * @var array
      */
-    protected $primary = array('roleId', 'module', 'privilege');
+    protected $primary = ['roleId', 'module', 'privilege'];
 
     /**
      * Get all privileges
@@ -80,7 +80,7 @@ public function getUserPrivileges($userId)
                 FROM acl_privileges AS p, acl_roles AS r, acl_users_roles AS u2r
                 WHERE p.roleId = r.id AND r.id = u2r.roleId AND u2r.userId = ?
                 ORDER BY module, privilege",
-                array((int) $userId)
+                [(int) $userId]
             );
 
             Cache::set($cacheKey, $data, Cache::TTL_NO_EXPIRY);
@@ -106,7 +106,7 @@ public function getRolePrivileges($roleId)
                 FROM acl_privileges AS p, acl_roles AS r
                 WHERE p.roleId = r.id AND r.id = ?
                 ORDER BY CONCAT(p.module, ':', p.privilege)",
-                array((int)$roleId)
+                [(int)$roleId]
             );
 
             Cache::set($cacheKey, $data, Cache::TTL_NO_EXPIRY, ['system', 'roles', 'privileges']);
diff --git a/application/models/Roles/Row.php b/application/models/Roles/Row.php
index 247d1ddb..76873ef4 100644
--- a/application/models/Roles/Row.php
+++ b/application/models/Roles/Row.php
@@ -23,11 +23,11 @@ class Row extends \Bluz\Db\Row
     use Validator;
 
     /**
-     * Before Insert/Update
+     * {@inheritdoc}
      *
-     * @return void
+     * @throws \Bluz\Validator\Exception\ComponentException
      */
-    protected function beforeInsert()
+    protected function beforeInsert() : void
     {
         $this->addValidator('name')
             ->required()
@@ -41,11 +41,11 @@ function ($name) {
     }
 
     /**
-     * Before Update
+     * {@inheritdoc}
      *
-     * @return void
+     * @throws \Bluz\Validator\Exception\ComponentException
      */
-    protected function beforeUpdate()
+    protected function beforeUpdate() : void
     {
         $this->addValidator('name')
             ->required()
diff --git a/application/models/Roles/Table.php b/application/models/Roles/Table.php
index 42533d91..8f22b9a0 100644
--- a/application/models/Roles/Table.php
+++ b/application/models/Roles/Table.php
@@ -38,12 +38,17 @@ class Table extends \Bluz\Db\Table
      *
      * @var array
      */
-    protected $primary = array('id');
+    protected $primary = ['id'];
 
     /**
      * @var array
      */
-    protected $basicRoles = [self::BASIC_ADMIN, self::BASIC_GUEST, self::BASIC_MEMBER, self::BASIC_SYSTEM];
+    protected $basicRoles = [
+        self::BASIC_ADMIN,
+        self::BASIC_GUEST,
+        self::BASIC_MEMBER,
+        self::BASIC_SYSTEM
+    ];
 
     /**
      * Init table relations
@@ -89,7 +94,7 @@ public function getUserRoles($userId)
             'SELECT r.*
             FROM acl_roles AS r, acl_users_roles AS u2r
             WHERE r.id = u2r.roleId AND u2r.userId = ?',
-            array($userId)
+            [$userId]
         );
         return $data;
     }
@@ -110,7 +115,7 @@ public function getUserRolesIdentity($userId)
                 FROM acl_roles AS r, acl_users_roles AS u2r
                 WHERE r.id = u2r.roleId AND u2r.userId = ?
                 ORDER BY r.id ASC',
-                array($userId)
+                [$userId]
             );
             Cache::set($cacheKey, $data, Cache::TTL_NO_EXPIRY, ['system', 'users', 'roles']);
         }
diff --git a/application/models/Users/Grid.php b/application/models/Users/Grid.php
index 18b7594c..1d165a97 100644
--- a/application/models/Users/Grid.php
+++ b/application/models/Users/Grid.php
@@ -22,9 +22,9 @@ class Grid extends \Bluz\Grid\Grid
     protected $uid = 'users';
 
     /**
-     * init
+     * {@inheritdoc}
      *
-     * @return self
+     * @throws \Bluz\Grid\GridException
      */
     public function init()
     {
diff --git a/application/models/Users/Mail.php b/application/models/Users/Mail.php
index d69704a0..47bd66e0 100644
--- a/application/models/Users/Mail.php
+++ b/application/models/Users/Mail.php
@@ -30,9 +30,14 @@ class Mail
      * @param string $password
      *
      * @return bool
-     * @throws Exception
+     * @throws \Bluz\Application\Exception\NotAllowedException
+     * @throws \Bluz\Application\Exception\NotAcceptableException
+     * @throws \Bluz\Application\Exception\ForbiddenException
+     * @throws \Bluz\Controller\ControllerException
+     * @throws \Bluz\Common\Exception\ComponentException
+     * @throws \Bluz\Common\Exception\CommonException
      */
-    public static function activation($user, $password)
+    public static function activation($user, $password) : ?bool
     {
         // email subject
         $subject = __('Activation');
@@ -87,8 +92,14 @@ public static function activation($user, $password)
      * @param Row $user
      *
      * @return bool
+     * @throws \Bluz\Application\Exception\NotAllowedException
+     * @throws \Bluz\Application\Exception\NotAcceptableException
+     * @throws \Bluz\Application\Exception\ForbiddenException
+     * @throws \Bluz\Controller\ControllerException
+     * @throws \Bluz\Common\Exception\ComponentException
+     * @throws \Bluz\Common\Exception\CommonException
      */
-    public static function recovery($user)
+    public static function recovery($user) : ?bool
     {
         // email subject
         $subject = __('Password Recovery');
@@ -143,9 +154,14 @@ public static function recovery($user)
      * @param string $email
      *
      * @return bool
-     * @throws Exception
+     * @throws \Bluz\Application\Exception\NotAllowedException
+     * @throws \Bluz\Application\Exception\NotAcceptableException
+     * @throws \Bluz\Application\Exception\ForbiddenException
+     * @throws \Bluz\Controller\ControllerException
+     * @throws \Bluz\Common\Exception\ComponentException
+     * @throws \Bluz\Common\Exception\CommonException
      */
-    public static function changeEmail($user, $email)
+    public static function changeEmail($user, $email) : ?bool
     {
         // email subject
         $subject = __('Change email');
diff --git a/application/models/Users/Row.php b/application/models/Users/Row.php
index 17b8ff79..e305e285 100644
--- a/application/models/Users/Row.php
+++ b/application/models/Users/Row.php
@@ -10,7 +10,7 @@
 
 use Application\Privileges;
 use Application\Roles;
-use Bluz\Auth\AbstractRowEntity;
+use Bluz\Auth\AbstractIdentity;
 use Bluz\Validator\Traits\Validator;
 
 /**
@@ -33,7 +33,7 @@
  * @SWG\Property(property="updated", type="string", format="date-time", example="2017-01-01 20:17:01")
  * @SWG\Property(property="status", type="string", enum={"pending", "active", "disabled", "deleted"})
  */
-class Row extends AbstractRowEntity
+class Row extends AbstractIdentity
 {
     use Validator;
 
@@ -45,9 +45,12 @@ class Row extends AbstractRowEntity
     protected $privileges;
 
     /**
-     * @return void
+     * {@inheritdoc}
+     *
+     * @throws \Bluz\Validator\Exception\ComponentException
+     * @throws \Bluz\Db\Exception\TableNotFoundException
      */
-    public function beforeSave()
+    public function beforeSave() : void
     {
         $this->email = strtolower($this->email ?? '');
 
@@ -94,7 +97,7 @@ function ($email) {
     /**
      * @return void
      */
-    public function beforeInsert()
+    public function beforeInsert() : void
     {
         $this->created = gmdate('Y-m-d H:i:s');
     }
@@ -102,7 +105,7 @@ public function beforeInsert()
     /**
      * @return void
      */
-    public function beforeUpdate()
+    public function beforeUpdate() : void
     {
         $this->updated = gmdate('Y-m-d H:i:s');
     }
@@ -118,7 +121,7 @@ public function getRoles()
     /**
      * {@inheritdoc}
      */
-    public function getPrivileges(): array
+    public function getPrivileges() : array
     {
         if (!$this->privileges) {
             $this->privileges = Privileges\Table::getInstance()->getUserPrivileges($this->id);
@@ -133,10 +136,10 @@ public function getPrivileges(): array
      *
      * @return boolean
      */
-    public function hasRole($roleId)
+    public function hasRole($roleId) : bool
     {
         $roles = Roles\Table::getInstance()->getUserRolesIdentity($this->id);
 
-        return in_array($roleId, $roles);
+        return in_array($roleId, $roles, false);
     }
 }
diff --git a/application/models/Users/Table.php b/application/models/Users/Table.php
index f1dcd27a..cd294d89 100644
--- a/application/models/Users/Table.php
+++ b/application/models/Users/Table.php
@@ -13,8 +13,8 @@
  *
  * @package  Application\Users
  *
- * @method   static Row findRow($primaryKey)
- * @method   static Row findRowWhere($whereList)
+ * @method   static ?Row findRow($primaryKey)
+ * @method   static ?Row findRowWhere($whereList)
  *
  * @author   Anton Shevchuk
  * @created  08.07.11 17:36
@@ -54,7 +54,7 @@ class Table extends \Bluz\Db\Table
      *
      * @var array
      */
-    protected $primary = array('id');
+    protected $primary = ['id'];
 
     /**
      * Init table relations
diff --git a/application/models/UsersActions/Table.php b/application/models/UsersActions/Table.php
index 991790f1..38963b2c 100644
--- a/application/models/UsersActions/Table.php
+++ b/application/models/UsersActions/Table.php
@@ -40,7 +40,7 @@ class Table extends \Bluz\Db\Table
      *
      * @var array
      */
-    protected $primary = array('userId', 'code');
+    protected $primary = ['userId', 'code'];
 
     /**
      * generate action with token
diff --git a/application/models/UsersRoles/Table.php b/application/models/UsersRoles/Table.php
index 5cd00b5e..9a68c098 100644
--- a/application/models/UsersRoles/Table.php
+++ b/application/models/UsersRoles/Table.php
@@ -30,7 +30,7 @@ class Table extends \Bluz\Db\Table
      *
      * @var array
      */
-    protected $primary = array('userId', 'roleId');
+    protected $primary = ['userId', 'roleId'];
 
     /**
      * init
diff --git a/application/modules/acl/controllers/index.php b/application/modules/acl/controllers/index.php
index 84bade66..3f1d07c0 100644
--- a/application/modules/acl/controllers/index.php
+++ b/application/modules/acl/controllers/index.php
@@ -29,10 +29,10 @@
         ]
     );
 
-    $set = array();
+    $set = [];
     $path = PATH_APPLICATION . '/modules';
     $directoryIterator = new \DirectoryIterator($path);
-    $modules = array();
+    $modules = [];
 
     foreach ($directoryIterator as $directory) {
         if ($directory->isDot() || !$directory->isDir()) {
@@ -90,7 +90,7 @@
     $this->assign('set', $set);
 
     $privilegesRowset = Privileges\Table::getInstance()->getPrivileges();
-    $privileges = array();
+    $privileges = [];
 
     foreach ($privilegesRowset as $privilege) {
         array_add($privileges, $privilege->roleId, $privilege->module, $privilege->privilege);
diff --git a/application/modules/acl/controllers/save.php b/application/modules/acl/controllers/save.php
index e0e94103..c78a1334 100644
--- a/application/modules/acl/controllers/save.php
+++ b/application/modules/acl/controllers/save.php
@@ -37,7 +37,7 @@
                 foreach ($privileges as $privilege => $flag) {
                     Db::query(
                         'INSERT INTO acl_privileges SET roleId = ?, module = ?, privilege = ?',
-                        array($roleId, $module, $privilege)
+                        [$roleId, $module, $privilege]
                     );
                 }
             }
diff --git a/application/modules/system/controllers/routers.php b/application/modules/system/controllers/routers.php
index 8281f6f6..389ccf01 100644
--- a/application/modules/system/controllers/routers.php
+++ b/application/modules/system/controllers/routers.php
@@ -29,7 +29,7 @@
             __('Routers Map'),
         ]
     );
-    $routers = array();
+    $routers = [];
     foreach (new \GlobIterator(PATH_APPLICATION . '/modules/*/controllers/*.php') as $file) {
         $module = pathinfo(dirname($file->getPathname(), 2), PATHINFO_FILENAME);
         $controller = pathinfo($file->getPathname(), PATHINFO_FILENAME);
diff --git a/composer.json b/composer.json
index f85c4d04..0b2bd8cd 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
   "minimum-stability": "dev",
   "type": "library",
   "require": {
-    "php": ">=7.0",
+    "php": ">=7.1",
     "bluzphp/bluzman": "~2.2",
     "bluzphp/framework": "~7.7",
     "bluzphp/composer-plugin": "~2.1",
diff --git a/public/index.php b/public/index.php
index 30f2289e..2ac5f920 100644
--- a/public/index.php
+++ b/public/index.php
@@ -24,7 +24,6 @@
 
 // Make fake header
 header('X-Powered-By: backend');
-
 // Try to run application
 try {
     /**
diff --git a/tests/src/ControllerTestCase.php b/tests/src/ControllerTestCase.php
index bedc12a1..ef7c2e0e 100644
--- a/tests/src/ControllerTestCase.php
+++ b/tests/src/ControllerTestCase.php
@@ -120,7 +120,7 @@ protected static function assertController($controller)
      * @param int $code
      * @return void
      */
-    protected static function assertRedirect($module, $controller, $params = array(), $code = StatusCode::FOUND)
+    protected static function assertRedirect($module, $controller, $params = [], $code = StatusCode::FOUND)
     {
         $url = Router::getFullUrl($module, $controller, $params);
 
@@ -225,7 +225,7 @@ private static function checkMessage($type, $text = null)
      */
     protected static function assertErrorMessage($text = null)
     {
-        self::checkMessage(MessagesInstance::TYPE_ERROR, $text);
+        self::checkMessage('error', $text);
     }
 
     /**
@@ -236,7 +236,7 @@ protected static function assertErrorMessage($text = null)
      */
     protected static function assertNoticeMessage($text = null)
     {
-        self::checkMessage(MessagesInstance::TYPE_NOTICE, $text);
+        self::checkMessage('notice', $text);
     }
 
     /**
@@ -247,7 +247,7 @@ protected static function assertNoticeMessage($text = null)
      */
     protected static function assertSuccessMessage($text = null)
     {
-        self::checkMessage(MessagesInstance::TYPE_SUCCESS, $text);
+        self::checkMessage('success', $text);
     }
 
     /**
diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php
index a29dd2ca..97de162c 100644
--- a/tests/unit/_bootstrap.php
+++ b/tests/unit/_bootstrap.php
@@ -1,4 +1,4 @@
 <?php
 // Emulate session
-$_SESSION = array();
+$_SESSION = [];
 $_COOKIE[session_name()] = uniqid('bluz-skeleton-test', false);
diff --git a/tests/unit/modules/index/controllers/IndexTest.php b/tests/unit/modules/index/controllers/IndexTest.php
index ce1b3b0d..88c36793 100644
--- a/tests/unit/modules/index/controllers/IndexTest.php
+++ b/tests/unit/modules/index/controllers/IndexTest.php
@@ -10,7 +10,7 @@
 namespace Application\Tests\Index;
 
 use Application\Tests\ControllerTestCase;
-use Bluz\Router\Router;
+use Bluz\Proxy\Router;
 
 /**
  * @group    index
@@ -27,8 +27,8 @@ class IndexTest extends ControllerTestCase
     public function testIndexPage()
     {
         $this->dispatch('/');
-        self::assertModule(Router::DEFAULT_MODULE);
-        self::assertController(Router::DEFAULT_CONTROLLER);
+        self::assertModule(Router::getDefaultModule());
+        self::assertController(Router::getDefaultController());
         self::assertQueryContentContains('h1', 'Congratulations!');
     }
 }

From d63a67a74cdef32d1228373ae33cdf528abc5034 Mon Sep 17 00:00:00 2001
From: Anton Shevchuk <AntonShevchuk@gmail.com>
Date: Tue, 14 Nov 2017 18:51:58 +0200
Subject: [PATCH 3/4] Migrate to PHP 7.1

---
 application/layouts/helpers/Username.php      |  3 +-
 application/library/Application/Bootstrap.php |  4 +-
 application/models/Pages/Grid.php             |  2 +-
 application/models/Pages/Row.php              |  2 +-
 application/models/Pages/Table.php            |  2 +-
 application/models/Roles/Table.php            |  2 +-
 application/models/Users/Grid.php             |  5 +-
 application/models/Users/Mail.php             | 24 ++---
 application/models/Users/Table.php            |  2 +-
 application/models/UsersActions/Row.php       |  4 +-
 application/models/UsersRoles/Table.php       |  2 +-
 application/modules/api/controllers/login.php |  2 +-
 application/modules/api/controllers/pages.php |  2 +-
 .../modules/api/controllers/profile.php       |  2 +-
 application/modules/api/controllers/users.php |  2 +-
 .../modules/pages/controllers/index.php       |  2 +-
 .../system/controllers/crud/delete.php        |  6 +-
 .../modules/system/controllers/crud/get.php   |  1 +
 .../modules/system/controllers/crud/put.php   |  4 +-
 .../system/controllers/rest/delete.php        |  6 +-
 .../modules/system/controllers/rest/post.php  |  4 +-
 .../modules/system/controllers/rest/put.php   |  7 +-
 .../users/controllers/change-email.php        |  2 +-
 .../users/controllers/change-password.php     |  4 +-
 .../modules/users/controllers/profile.php     |  2 +-
 public/js/bluz.grid.js                        | 98 ++++++++-----------
 tests/src/ControllerTestCase.php              | 51 +++++-----
 .../Fixtures/Users/UserFixtureContainer.php   |  4 +-
 .../src/Fixtures/Users/UserHasPermission.php  | 13 ++-
 .../dashboard/controllers/IndexTest.php       |  2 +-
 .../modules/pages/controllers/CrudTest.php    | 19 +---
 .../modules/pages/controllers/IndexTest.php   |  4 +-
 32 files changed, 131 insertions(+), 158 deletions(-)

diff --git a/application/layouts/helpers/Username.php b/application/layouts/helpers/Username.php
index e44ee154..0909f4ed 100644
--- a/application/layouts/helpers/Username.php
+++ b/application/layouts/helpers/Username.php
@@ -24,7 +24,6 @@ function () {
          */
         if ($user = Auth::getIdentity()) {
             return $user->login;
-        } else {
-            return __('Guest');
         }
+        return __('Guest');
     };
diff --git a/application/library/Application/Bootstrap.php b/application/library/Application/Bootstrap.php
index e0cf1ced..14d4b521 100644
--- a/application/library/Application/Bootstrap.php
+++ b/application/library/Application/Bootstrap.php
@@ -10,10 +10,10 @@
 
 use Application\Auth;
 use Bluz\Application\Application;
-use Bluz\Application\Exception\ForbiddenException;
-use Bluz\Application\Exception\RedirectException;
 use Bluz\Auth\AuthException;
 use Bluz\Controller\Controller;
+use Bluz\Http\Exception\ForbiddenException;
+use Bluz\Http\Exception\RedirectException;
 use Bluz\Proxy\Auth as AuthProxy;
 use Bluz\Proxy\Layout;
 use Bluz\Proxy\Logger;
diff --git a/application/models/Pages/Grid.php b/application/models/Pages/Grid.php
index 31ac871d..8fb5ee12 100644
--- a/application/models/Pages/Grid.php
+++ b/application/models/Pages/Grid.php
@@ -27,7 +27,7 @@ class Grid extends \Bluz\Grid\Grid
      *
      * @throws \Bluz\Grid\GridException
      */
-    public function init()
+    public function init() : void
     {
         // Setup source
         $adapter = new SqlSource();
diff --git a/application/models/Pages/Row.php b/application/models/Pages/Row.php
index ff192b82..43a0eeaf 100644
--- a/application/models/Pages/Row.php
+++ b/application/models/Pages/Row.php
@@ -110,7 +110,7 @@ public function beforeInsert() : void
 
         /* @var \Application\Users\Row $user */
         if ($user = Auth::getIdentity()) {
-            $this->userId = $user->id;
+            $this->userId = $user->getId();
         } else {
             $this->userId = Users\Table::SYSTEM_USER;
         }
diff --git a/application/models/Pages/Table.php b/application/models/Pages/Table.php
index 8564526b..0f007a58 100644
--- a/application/models/Pages/Table.php
+++ b/application/models/Pages/Table.php
@@ -49,7 +49,7 @@ public function getByAlias($alias)
      *
      * @return void
      */
-    public function init()
+    public function init() : void
     {
         $this->linkTo('userId', 'Users', 'id');
     }
diff --git a/application/models/Roles/Table.php b/application/models/Roles/Table.php
index 8f22b9a0..5c0f51e2 100644
--- a/application/models/Roles/Table.php
+++ b/application/models/Roles/Table.php
@@ -55,7 +55,7 @@ class Table extends \Bluz\Db\Table
      *
      * @return void
      */
-    public function init()
+    public function init() : void
     {
         $this->linkTo('id', 'UsersRoles', 'roleId');
         $this->linkToMany('Users', 'UsersRoles');
diff --git a/application/models/Users/Grid.php b/application/models/Users/Grid.php
index 1d165a97..be4416c4 100644
--- a/application/models/Users/Grid.php
+++ b/application/models/Users/Grid.php
@@ -23,10 +23,9 @@ class Grid extends \Bluz\Grid\Grid
 
     /**
      * {@inheritdoc}
-     *
      * @throws \Bluz\Grid\GridException
      */
-    public function init()
+    public function init() : void
     {
         // Create Select
         $select = new Select();
@@ -45,7 +44,5 @@ public function init()
         $this->setDefaultLimit(25);
         $this->setAllowOrders(['login', 'email', 'status', 'id']);
         $this->setAllowFilters(['login', 'email', 'status', 'id', 'roleId']);
-
-        return $this;
     }
 }
diff --git a/application/models/Users/Mail.php b/application/models/Users/Mail.php
index 47bd66e0..f20385ec 100644
--- a/application/models/Users/Mail.php
+++ b/application/models/Users/Mail.php
@@ -30,12 +30,12 @@ class Mail
      * @param string $password
      *
      * @return bool
-     * @throws \Bluz\Application\Exception\NotAllowedException
-     * @throws \Bluz\Application\Exception\NotAcceptableException
-     * @throws \Bluz\Application\Exception\ForbiddenException
-     * @throws \Bluz\Controller\ControllerException
      * @throws \Bluz\Common\Exception\ComponentException
      * @throws \Bluz\Common\Exception\CommonException
+     * @throws \Bluz\Controller\ControllerException
+     * @throws \Bluz\Http\Exception\NotAllowedException
+     * @throws \Bluz\Http\Exception\NotAcceptableException
+     * @throws \Bluz\Http\Exception\ForbiddenException
      */
     public static function activation($user, $password) : ?bool
     {
@@ -92,12 +92,12 @@ public static function activation($user, $password) : ?bool
      * @param Row $user
      *
      * @return bool
-     * @throws \Bluz\Application\Exception\NotAllowedException
-     * @throws \Bluz\Application\Exception\NotAcceptableException
-     * @throws \Bluz\Application\Exception\ForbiddenException
-     * @throws \Bluz\Controller\ControllerException
      * @throws \Bluz\Common\Exception\ComponentException
      * @throws \Bluz\Common\Exception\CommonException
+     * @throws \Bluz\Controller\ControllerException
+     * @throws \Bluz\Http\Exception\NotAllowedException
+     * @throws \Bluz\Http\Exception\NotAcceptableException
+     * @throws \Bluz\Http\Exception\ForbiddenException
      */
     public static function recovery($user) : ?bool
     {
@@ -154,12 +154,12 @@ public static function recovery($user) : ?bool
      * @param string $email
      *
      * @return bool
-     * @throws \Bluz\Application\Exception\NotAllowedException
-     * @throws \Bluz\Application\Exception\NotAcceptableException
-     * @throws \Bluz\Application\Exception\ForbiddenException
-     * @throws \Bluz\Controller\ControllerException
      * @throws \Bluz\Common\Exception\ComponentException
      * @throws \Bluz\Common\Exception\CommonException
+     * @throws \Bluz\Controller\ControllerException
+     * @throws \Bluz\Http\Exception\NotAllowedException
+     * @throws \Bluz\Http\Exception\NotAcceptableException
+     * @throws \Bluz\Http\Exception\ForbiddenException
      */
     public static function changeEmail($user, $email) : ?bool
     {
diff --git a/application/models/Users/Table.php b/application/models/Users/Table.php
index cd294d89..3f4a42a0 100644
--- a/application/models/Users/Table.php
+++ b/application/models/Users/Table.php
@@ -61,7 +61,7 @@ class Table extends \Bluz\Db\Table
      *
      * @return void
      */
-    public function init()
+    public function init() : void
     {
         $this->linkTo('id', 'UsersRoles', 'userId');
         $this->linkToMany('Roles', 'UsersRoles');
diff --git a/application/models/UsersActions/Row.php b/application/models/UsersActions/Row.php
index 5df2c4b0..f95e26ec 100644
--- a/application/models/UsersActions/Row.php
+++ b/application/models/UsersActions/Row.php
@@ -30,7 +30,7 @@ class Row extends \Bluz\Db\Row
      *
      * @return void
      */
-    public function beforeSave()
+    public function beforeSave() : void
     {
         $this->params = serialize($this->params);
     }
@@ -42,6 +42,6 @@ public function beforeSave()
      */
     public function getParams()
     {
-        return $this->params ? unserialize($this->params) : [];
+        return $this->params ? unserialize($this->params, []) : [];
     }
 }
diff --git a/application/models/UsersRoles/Table.php b/application/models/UsersRoles/Table.php
index 9a68c098..dae6f194 100644
--- a/application/models/UsersRoles/Table.php
+++ b/application/models/UsersRoles/Table.php
@@ -37,7 +37,7 @@ class Table extends \Bluz\Db\Table
      *
      * @return void
      */
-    public function init()
+    public function init() : void
     {
         $this->linkTo('userId', 'Users', 'id');
         $this->linkTo('roleId', 'Roles', 'id');
diff --git a/application/modules/api/controllers/login.php b/application/modules/api/controllers/login.php
index 69b9b3e8..a653f09a 100644
--- a/application/modules/api/controllers/login.php
+++ b/application/modules/api/controllers/login.php
@@ -9,8 +9,8 @@
 namespace Application;
 
 use Application\Auth;
-use Bluz\Application\Exception\BadRequestException;
 use Bluz\Controller\Controller;
+use Bluz\Http\Exception\BadRequestException;
 
 /**
  * Authorization by login and password
diff --git a/application/modules/api/controllers/pages.php b/application/modules/api/controllers/pages.php
index 01194712..356871de 100644
--- a/application/modules/api/controllers/pages.php
+++ b/application/modules/api/controllers/pages.php
@@ -60,7 +60,7 @@
  *     @SWG\Response(response=206, description="Collection present")
  * )
  *
- * @accept JSON
+ * @ accept JSON
  * @return mixed
  */
 return function () {
diff --git a/application/modules/api/controllers/profile.php b/application/modules/api/controllers/profile.php
index a3e1fd51..1fc22898 100644
--- a/application/modules/api/controllers/profile.php
+++ b/application/modules/api/controllers/profile.php
@@ -9,8 +9,8 @@
 namespace Application;
 
 use Application\Users;
-use Bluz\Application\Exception\NotFoundException;
 use Bluz\Controller\Controller;
+use Bluz\Http\Exception\NotFoundException;
 
 /**
  * Get profile of current user
diff --git a/application/modules/api/controllers/users.php b/application/modules/api/controllers/users.php
index ed169ca3..d8a709c6 100644
--- a/application/modules/api/controllers/users.php
+++ b/application/modules/api/controllers/users.php
@@ -9,8 +9,8 @@
 namespace Application;
 
 use Application\Users;
-use Bluz\Application\Exception\NotFoundException;
 use Bluz\Controller\Controller;
+use Bluz\Http\Exception\NotFoundException;
 
 /**
  * @SWG\Get(
diff --git a/application/modules/pages/controllers/index.php b/application/modules/pages/controllers/index.php
index 33ea28f1..fda6ebfb 100644
--- a/application/modules/pages/controllers/index.php
+++ b/application/modules/pages/controllers/index.php
@@ -8,8 +8,8 @@
 
 namespace Application;
 
-use Bluz\Application\Exception\NotFoundException;
 use Bluz\Controller\Controller;
+use Bluz\Http\Exception\NotFoundException;
 use Bluz\Proxy\HttpCacheControl;
 use Bluz\Proxy\Layout;
 
diff --git a/application/modules/system/controllers/crud/delete.php b/application/modules/system/controllers/crud/delete.php
index 87164917..8fc52125 100644
--- a/application/modules/system/controllers/crud/delete.php
+++ b/application/modules/system/controllers/crud/delete.php
@@ -10,9 +10,9 @@
 
 namespace Application;
 
-use Bluz\Application\Exception\BadRequestException;
-use Bluz\Application\Exception\NotFoundException;
-use Bluz\Application\Exception\NotImplementedException;
+use Bluz\Http\Exception\BadRequestException;
+use Bluz\Http\Exception\NotFoundException;
+use Bluz\Http\Exception\NotImplementedException;
 use Bluz\Proxy\Messages;
 
 /**
diff --git a/application/modules/system/controllers/crud/get.php b/application/modules/system/controllers/crud/get.php
index 975f2ad4..f3c26af0 100644
--- a/application/modules/system/controllers/crud/get.php
+++ b/application/modules/system/controllers/crud/get.php
@@ -23,6 +23,7 @@
  * @return array
  */
 return function ($crud, $primary) {
+    $primary = array_filter($primary);
     return [
         'row' => $crud->readOne($primary),
         'method' => empty($primary) ? RequestMethod::POST : RequestMethod::PUT
diff --git a/application/modules/system/controllers/crud/put.php b/application/modules/system/controllers/crud/put.php
index 3965af02..c51dd52a 100644
--- a/application/modules/system/controllers/crud/put.php
+++ b/application/modules/system/controllers/crud/put.php
@@ -10,8 +10,8 @@
 
 namespace Application;
 
-use Bluz\Application\Exception\BadRequestException;
-use Bluz\Application\Exception\NotImplementedException;
+use Bluz\Http\Exception\BadRequestException;
+use Bluz\Http\Exception\NotImplementedException;
 use Bluz\Proxy\Messages;
 use Bluz\Proxy\Request;
 use Bluz\Validator\Exception\ValidatorException;
diff --git a/application/modules/system/controllers/rest/delete.php b/application/modules/system/controllers/rest/delete.php
index dae035ec..3b53f25b 100644
--- a/application/modules/system/controllers/rest/delete.php
+++ b/application/modules/system/controllers/rest/delete.php
@@ -10,9 +10,9 @@
 
 namespace Application;
 
-use Bluz\Application\Exception\BadRequestException;
-use Bluz\Application\Exception\NotFoundException;
-use Bluz\Application\Exception\NotImplementedException;
+use Bluz\Http\Exception\BadRequestException;
+use Bluz\Http\Exception\NotFoundException;
+use Bluz\Http\Exception\NotImplementedException;
 use Bluz\Http\StatusCode;
 use Bluz\Proxy\Response;
 
diff --git a/application/modules/system/controllers/rest/post.php b/application/modules/system/controllers/rest/post.php
index 8bfde403..bd18557d 100644
--- a/application/modules/system/controllers/rest/post.php
+++ b/application/modules/system/controllers/rest/post.php
@@ -10,9 +10,9 @@
 
 namespace Application;
 
-use Bluz\Application\Exception\BadRequestException;
-use Bluz\Application\Exception\NotImplementedException;
 use Bluz\Controller;
+use Bluz\Http\Exception\BadRequestException;
+use Bluz\Http\Exception\NotImplementedException;
 use Bluz\Http\StatusCode;
 use Bluz\Proxy\Request;
 use Bluz\Proxy\Response;
diff --git a/application/modules/system/controllers/rest/put.php b/application/modules/system/controllers/rest/put.php
index 2e354c44..f1199195 100644
--- a/application/modules/system/controllers/rest/put.php
+++ b/application/modules/system/controllers/rest/put.php
@@ -10,9 +10,9 @@
 
 namespace Application;
 
-use Bluz\Application\Exception\BadRequestException;
-use Bluz\Application\Exception\NotImplementedException;
 use Bluz\Controller;
+use Bluz\Http\Exception\BadRequestException;
+use Bluz\Http\Exception\NotImplementedException;
 use Bluz\Http\StatusCode;
 use Bluz\Proxy\Response;
 use Bluz\Validator\Exception\ValidatorException;
@@ -34,9 +34,8 @@
 return function ($crud, $primary, $data) {
     if (!count($data)) {
         // data not found
-        throw new BadRequestException();
+        throw new BadRequestException;
     }
-
     try {
         if (!empty($primary)) {
             // update one item
diff --git a/application/modules/users/controllers/change-email.php b/application/modules/users/controllers/change-email.php
index 0b41a070..1595bf5c 100644
--- a/application/modules/users/controllers/change-email.php
+++ b/application/modules/users/controllers/change-email.php
@@ -10,9 +10,9 @@
 
 use Application\Users;
 use Application\UsersActions;
-use Bluz\Application\Exception\NotFoundException;
 use Bluz\Auth\AuthException;
 use Bluz\Controller\Controller;
+use Bluz\Http\Exception\NotFoundException;
 use Bluz\Proxy\Messages;
 use Bluz\Proxy\Request;
 use Bluz\Proxy\Response;
diff --git a/application/modules/users/controllers/change-password.php b/application/modules/users/controllers/change-password.php
index 41c8f330..b771da12 100644
--- a/application/modules/users/controllers/change-password.php
+++ b/application/modules/users/controllers/change-password.php
@@ -10,10 +10,10 @@
 
 use Application\Auth\Provider;
 use Application\Users;
-use Bluz\Application\Exception\BadRequestException;
-use Bluz\Application\Exception\NotFoundException;
 use Bluz\Auth\AuthException;
 use Bluz\Controller\Controller;
+use Bluz\Http\Exception\BadRequestException;
+use Bluz\Http\Exception\NotFoundException;
 use Bluz\Proxy\Messages;
 use Bluz\Proxy\Request;
 use Bluz\Proxy\Response;
diff --git a/application/modules/users/controllers/profile.php b/application/modules/users/controllers/profile.php
index bc53d5b9..5a643a7f 100644
--- a/application/modules/users/controllers/profile.php
+++ b/application/modules/users/controllers/profile.php
@@ -9,8 +9,8 @@
 namespace Application;
 
 use Application\Users;
-use Bluz\Application\Exception\NotFoundException;
 use Bluz\Controller\Controller;
+use Bluz\Http\Exception\NotFoundException;
 use Bluz\Proxy\Layout;
 
 /**
diff --git a/public/js/bluz.grid.js b/public/js/bluz.grid.js
index ec33ecfd..532b17dd 100644
--- a/public/js/bluz.grid.js
+++ b/public/js/bluz.grid.js
@@ -10,70 +10,57 @@ define(['jquery', 'bluz'], function ($) {
   $(function () {
     $('[data-spy=grid]').each(function (i, el) {
       let $grid = $(el);
-      // TODO: work with hash from URI
       if (!$grid.data('url')) {
         $grid.data('url', window.location.pathname);
       }
 
+      function loadGrid(url) {
+        $grid.data('url', url);
+        window.history.pushState('', '', url);
+        $.ajax({
+          url: url,
+          type: 'get',
+          dataType: 'html',
+          beforeSend: disableControls,
+          success: refreshGrid
+        });
+      }
+
+      function disableControls() {
+        $grid.find('a, .btn').addClass('disabled');
+      }
+
+      function refreshGrid(html) {
+        /*
+         need to replace only content of grid
+         current     loaded
+         <div>       <div>
+         [...]   <--   [...]
+         </div>      </div>
+         */
+        $grid.html($(html).children().unwrap());
+      }
+
+      function reloadGrid() {
+        let url = $grid.data('url');
+        loadGrid(url);
+      }
+
       // pagination, sorting and filtering over AJAX
-      $grid.on('click.bluz.ajax', '.pagination li a, thead a, .navbar a.ajax', function () {
+      $grid.on('click.bluz.ajax', '.pagination li a, thead a, .navbar a[data-ajax]', function () {
         let $link = $(this);
+        $link.addClass('active');
         let href = $link.attr('href');
-
         if (href === '#') {
           return false;
         }
-
-        $.ajax({
-          url: href,
-          type: 'get',
-          dataType: 'html',
-          beforeSend: function () {
-            $link.addClass('active');
-            $grid.find('a, .btn').addClass('disabled');
-          },
-          success: function (html) {
-            /*
-             need to replace only content of grid
-             current     loaded
-             <div>       <div>
-             [...]   <--   [...]
-             </div>      </div>
-             */
-            $grid.data('url', href);
-            $grid.html($(html).children().unwrap());
-          }
-        });
+        loadGrid(href);
         return false;
       });
       // refresh grid if form was success sent
-      $grid.on('success.bluz.dialog', 'a.dialog', function () {
-        $.ajax({
-          url: $grid.data('url'),
-          type: 'get',
-          dataType: 'html',
-          beforeSend: function () {
-            $grid.find('a, .btn').addClass('disabled');
-          },
-          success: function (html) {
-            $grid.html($(html).children().unwrap());
-          }
-        });
-      });
+      $grid.on('success.bluz.dialog', 'a[data-ajax-dialog]', reloadGrid);
       // refresh grid if confirmed ajax button (e.g. delete record)
-      $grid.on('success.bluz.ajax', 'a.ajax.confirm', function () {
-        $.ajax({
-          url: $grid.data('url'),
-          type: 'get',
-          dataType: 'html',
-          beforeSend: function () {
-            $grid.find('a, .btn').addClass('disabled');
-          },
-          success: function (html) {
-            $grid.html($(html).children().unwrap());
-          }
-        });
-      });
+      $grid.on('success.bluz.ajax', 'a[data-confirm]', reloadGrid);
 
       // apply filter form
       $grid.on('submit.bluz.ajax', 'form.filter-form', function () {
@@ -88,18 +75,15 @@ define(['jquery', 'bluz'], function ($) {
           );
         }
 
+        $form.addClass('disabled');
+
         $.ajax({
           url: $form.attr('action'),
           type: 'get',
           data: $form.serializeArray(),
           dataType: 'html',
-          beforeSend: function () {
-            $form.addClass('disabled');
-            $grid.find('a, .btn').addClass('disabled');
-          },
-          success: function (html) {
-            $grid.html($(html).children().unwrap());
-          }
+          beforeSend: disableControls,
+          success: refreshGrid
         });
         return false;
       });
diff --git a/tests/src/ControllerTestCase.php b/tests/src/ControllerTestCase.php
index ef7c2e0e..6d7a887b 100644
--- a/tests/src/ControllerTestCase.php
+++ b/tests/src/ControllerTestCase.php
@@ -11,10 +11,9 @@
 
 use Application\Users;
 use Application\Tests\Fixtures\Users\UserHasPermission;
-use Bluz\Application\Exception\ForbiddenException;
-use Bluz\Application\Exception\RedirectException;
+use Bluz\Http\Exception\ForbiddenException;
+use Bluz\Http\Exception\RedirectException;
 use Bluz\Http\StatusCode;
-use Bluz\Messages\Messages as MessagesInstance;
 use Bluz\Proxy\Auth;
 use Bluz\Proxy\Messages;
 use Bluz\Proxy\Response;
@@ -53,7 +52,7 @@ protected function setUp()
      *
      * @return void
      */
-    protected static function setupGuestIdentity()
+    protected static function setupGuestIdentity() : void
     {
         Auth::setIdentity(new Users\Row());
     }
@@ -63,7 +62,7 @@ protected static function setupGuestIdentity()
      *
      * @return void
      */
-    protected static function setupSuperUserIdentity()
+    protected static function setupSuperUserIdentity() : void
     {
         Auth::setIdentity(new UserHasPermission());
     }
@@ -73,7 +72,7 @@ protected static function setupSuperUserIdentity()
      *
      * @return void
      */
-    protected static function assertOk()
+    protected static function assertOk() : void
     {
         self::assertResponseCode(StatusCode::OK);
     }
@@ -84,7 +83,7 @@ protected static function assertOk()
      * @param int $code
      * @return void
      */
-    protected static function assertResponseCode($code)
+    protected static function assertResponseCode($code) : void
     {
         self::assertEquals($code, Response::getStatusCode());
     }
@@ -95,7 +94,7 @@ protected static function assertResponseCode($code)
      * @param string $module
      * @return void
      */
-    protected static function assertModule($module)
+    protected static function assertModule($module) : void
     {
         self::assertEquals($module, self::getApp()->getModule());
     }
@@ -106,7 +105,7 @@ protected static function assertModule($module)
      * @param string $controller
      * @return void
      */
-    protected static function assertController($controller)
+    protected static function assertController($controller) : void
     {
         self::assertEquals($controller, self::getApp()->getController());
     }
@@ -120,7 +119,7 @@ protected static function assertController($controller)
      * @param int $code
      * @return void
      */
-    protected static function assertRedirect($module, $controller, $params = [], $code = StatusCode::FOUND)
+    protected static function assertRedirect($module, $controller, $params = [], $code = StatusCode::FOUND) : void
     {
         $url = Router::getFullUrl($module, $controller, $params);
 
@@ -139,7 +138,7 @@ protected static function assertRedirect($module, $controller, $params = [], $co
      *
      * @return void
      */
-    protected static function assertRedirectToLogin()
+    protected static function assertRedirectToLogin() : void
     {
         $url = Router::getUrl('users', 'signin');
 
@@ -158,7 +157,7 @@ protected static function assertRedirectToLogin()
      *
      * @return void
      */
-    protected static function assertReload()
+    protected static function assertReload() : void
     {
         $exception = self::getApp()->getException();
 
@@ -170,7 +169,7 @@ protected static function assertReload()
      *
      * @return void
      */
-    protected static function assertForbidden()
+    protected static function assertForbidden() : void
     {
         $exception = self::getApp()->getException();
 
@@ -187,13 +186,13 @@ protected static function assertForbidden()
      * @param mixed $value
      * @return void
      */
-    protected static function assertResponseVariable($key, $value)
+    protected static function assertResponseVariable($key, $value) : void
     {
         if (self::getApp()->useLayout()) {
             self::fail('Method `assertResponseVariable` required to disable Layout, please update test');
         }
 
-        $variable = Response::getBody()->getData()->__get($key);
+        $variable = Response::getBody()->getData()->$key;
         self::assertEquals($variable, $value);
     }
 
@@ -204,7 +203,7 @@ protected static function assertResponseVariable($key, $value)
      * @param string $text
      * @return void
      */
-    private static function checkMessage($type, $text = null)
+    private static function checkMessage($type, $text = null) : void
     {
         $message = Messages::pop($type);
 
@@ -223,7 +222,7 @@ private static function checkMessage($type, $text = null)
      * @param string $text
      * @return void
      */
-    protected static function assertErrorMessage($text = null)
+    protected static function assertErrorMessage($text = null) : void
     {
         self::checkMessage('error', $text);
     }
@@ -234,7 +233,7 @@ protected static function assertErrorMessage($text = null)
      * @param string $text
      * @return void
      */
-    protected static function assertNoticeMessage($text = null)
+    protected static function assertNoticeMessage($text = null) : void
     {
         self::checkMessage('notice', $text);
     }
@@ -245,7 +244,7 @@ protected static function assertNoticeMessage($text = null)
      * @param string $text
      * @return void
      */
-    protected static function assertSuccessMessage($text = null)
+    protected static function assertSuccessMessage($text = null) : void
     {
         self::checkMessage('success', $text);
     }
@@ -287,10 +286,10 @@ private static function queryCount($path)
      * @param string $path
      * @throws ExpectationFailedException
      */
-    public static function assertQuery($path)
+    public static function assertQuery($path) : void
     {
         $match = self::queryCount($path);
-        if (!$match > 0) {
+        if (!($match > 0)) {
             throw new ExpectationFailedException(sprintf(
                     'Failed asserting node DENOTED BY %s EXISTS',
                     $path
@@ -305,7 +304,7 @@ public static function assertQuery($path)
      * @param string $path CSS selector path
      * @throws ExpectationFailedException
      */
-    public static function assertNotQuery($path)
+    public static function assertNotQuery($path) : void
     {
         $match  = self::queryCount($path);
         if ($match !== 0) {
@@ -324,7 +323,7 @@ public static function assertNotQuery($path)
      * @param string $count Number of nodes that should match
      * @throws ExpectationFailedException
      */
-    public static function assertQueryCount($path, $count)
+    public static function assertQueryCount($path, $count) : void
     {
         $match = self::queryCount($path);
         if ($match !== $count) {
@@ -345,7 +344,7 @@ public static function assertQueryCount($path, $count)
      * @param  string $count Number of nodes that should NOT match
      * @throws ExpectationFailedException
      */
-    public static function assertNotQueryCount($path, $count)
+    public static function assertNotQueryCount($path, $count) : void
     {
         $match = self::queryCount($path);
         if ($match === $count) {
@@ -365,7 +364,7 @@ public static function assertNotQueryCount($path, $count)
      * @param  string $match content that should be contained in matched nodes
      * @throws ExpectationFailedException
      */
-    public static function assertQueryContentContains($path, $match)
+    public static function assertQueryContentContains($path, $match) : void
     {
         $result = self::query($path);
         if ($result->count() === 0) {
@@ -395,7 +394,7 @@ public static function assertQueryContentContains($path, $match)
      * @param  string $pattern Pattern that should be contained in matched nodes
      * @throws ExpectationFailedException
      */
-    public static function assertQueryContentRegex($path, $pattern)
+    public static function assertQueryContentRegex($path, $pattern) : void
     {
         $result = self::query($path);
 
diff --git a/tests/src/Fixtures/Users/UserFixtureContainer.php b/tests/src/Fixtures/Users/UserFixtureContainer.php
index affc0c89..403b9fcc 100644
--- a/tests/src/Fixtures/Users/UserFixtureContainer.php
+++ b/tests/src/Fixtures/Users/UserFixtureContainer.php
@@ -19,12 +19,12 @@ class UserFixtureContainer
      * User fixture for test
      * @var array
      */
-    public static $fixture = array(
+    public static $fixture = [
         'id' => 1,
         'login' => 'admin',
         'email' => null,
         'created' => '2012-11-09 07:38:41',
         'updated' => '2014-06-04 11:51:07',
         'status' => 'active'
-    );
+    ];
 }
diff --git a/tests/src/Fixtures/Users/UserHasPermission.php b/tests/src/Fixtures/Users/UserHasPermission.php
index f4bd2a81..4f950cc8 100644
--- a/tests/src/Fixtures/Users/UserHasPermission.php
+++ b/tests/src/Fixtures/Users/UserHasPermission.php
@@ -5,6 +5,7 @@
 namespace Application\Tests\Fixtures\Users;
 
 use Application\Users\Row;
+use Application\Users\Table;
 
 /**
  * Row
@@ -16,13 +17,23 @@
  */
 class UserHasPermission extends Row
 {
+    /**
+     * getId
+     *
+     * @return int
+     */
+    public function getId() : int
+    {
+        return Table::SYSTEM_USER;
+    }
+
     /**
      * Check user role
      *
      * @param integer $roleId
      * @return boolean
      */
-    public function hasRole($roleId)
+    public function hasRole($roleId) : bool
     {
         return true;
     }
diff --git a/tests/unit/modules/dashboard/controllers/IndexTest.php b/tests/unit/modules/dashboard/controllers/IndexTest.php
index a1c29873..ea79d785 100644
--- a/tests/unit/modules/dashboard/controllers/IndexTest.php
+++ b/tests/unit/modules/dashboard/controllers/IndexTest.php
@@ -25,7 +25,7 @@ class IndexTest extends ControllerTestCase
      * Dispatch controller w/out application:
      *  - as user
      *  - w/out permission
-     * @expectedException \Bluz\Application\Exception\ForbiddenException
+     * @expectedException \Bluz\Http\Exception\ForbiddenException
      */
     public function testForbidden()
     {
diff --git a/tests/unit/modules/pages/controllers/CrudTest.php b/tests/unit/modules/pages/controllers/CrudTest.php
index 751ca9b4..5abcf497 100644
--- a/tests/unit/modules/pages/controllers/CrudTest.php
+++ b/tests/unit/modules/pages/controllers/CrudTest.php
@@ -21,22 +21,6 @@
  */
 class CrudTest extends ControllerTestCase
 {
-    /**
-     * Setup `test` table before the first test
-     */
-    public static function setUpBeforeClass()
-    {
-
-    }
-
-    /**
-     * Drop `test` table after the last test
-     */
-    public static function tearDownAfterClass()
-    {
-
-    }
-
     /**
      * setUp
      *
@@ -45,7 +29,7 @@ public static function tearDownAfterClass()
     public function setUp()
     {
         parent::setUp();
-        $this->getApp()->useLayout(false);
+        self::getApp()->useLayout(false);
         self::setupSuperUserIdentity();
     }
 
@@ -56,7 +40,6 @@ public function testCreateForm()
     {
         $this->dispatch('/pages/crud/');
         self::assertOk();
-
         self::assertQueryCount('form[method="POST"]', 1);
     }
 
diff --git a/tests/unit/modules/pages/controllers/IndexTest.php b/tests/unit/modules/pages/controllers/IndexTest.php
index 73a05084..9d3d7a07 100644
--- a/tests/unit/modules/pages/controllers/IndexTest.php
+++ b/tests/unit/modules/pages/controllers/IndexTest.php
@@ -22,11 +22,11 @@ class IndexTest extends ControllerTestCase
 {
     /**
      * Dispatch controller only, w/out application
-     * @expectedException \Bluz\Application\Exception\NotFoundException
+     * @expectedException \Bluz\Http\Exception\NotFoundException
      */
     public function testNotFoundPage()
     {
-        $this->getApp()->dispatch('pages', 'index', ['alias' => uniqid('random_name_', true)]);
+        self::getApp()->dispatch('pages', 'index', ['alias' => uniqid('random_name_', true)]);
     }
 
     /**

From 07734d640ccadb203f818a28ef49ddae9d494a7f Mon Sep 17 00:00:00 2001
From: Anton Shevchuk <AntonShevchuk@gmail.com>
Date: Thu, 16 Nov 2017 11:43:46 +0200
Subject: [PATCH 4/4] Updated framework version

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 0b2bd8cd..fa2f6761 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
   "require": {
     "php": ">=7.1",
     "bluzphp/bluzman": "~2.2",
-    "bluzphp/framework": "~7.7",
+    "bluzphp/framework": "~7.8",
     "bluzphp/composer-plugin": "~2.1",
     "phpmailer/phpmailer": "~5.2",
     "zircote/swagger-php": "~2.0",