Merge pull request #312 from AntonShevchuk/master

Migrate to PHP 7.1
bluzphp · Nov 16, 2017 · f01bd23 · f01bd23
2 parents b8b4c0d + 07734d6
commit f01bd23
Show file tree

Hide file tree

Showing 71 changed files with 280 additions and 278 deletions.
diff --git 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/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/layouts/partial/nav-bar.phtml b/application/layouts/partial/nav-bar.phtml
@@ -43,13 +43,10 @@
       </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()) : ?>
-        <?= __(
-            '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
@@ -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
@@ -10,9 +10,10 @@
 
 use Application\Auth;
 use Bluz\Application\Application;
-use Bluz\Application\Exception\ForbiddenException;
 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;
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -11,20 +11,20 @@
 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
  *
  * @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
@@ -23,11 +23,11 @@ class Grid extends \Bluz\Grid\Grid
     protected $uid = 'pages';
 
     /**
-     * init
+     * {@inheritdoc}
      *
-     * @return self
+     * @throws \Bluz\Grid\GridException
      */
-    public function init()
+    public function init() : void
     {
         // Setup source
         $adapter = new SqlSource();
@@ -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
@@ -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,13 +104,13 @@ function ($input) {
      *
      * @return void
      */
-    public function beforeInsert()
+    public function beforeInsert() : void
     {
         $this->created = gmdate('Y-m-d H:i:s');
 
         /* @var \Application\Users\Row $user */
         if ($user = Auth::getIdentity()) {
-            $this->userId = $user->id;
+            $this->userId = $user->getId();
         } else {
             $this->userId = Users\Table::SYSTEM_USER;
         }
@@ -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
@@ -30,7 +30,7 @@ class Table extends \Bluz\Db\Table
      *
      * @var array
      */
-    protected $primary = array('id');
+    protected $primary = ['id'];
 
     /**
      * Get page by Alias
@@ -41,15 +41,15 @@ class Table extends \Bluz\Db\Table
      */
     public function getByAlias($alias)
     {
-        return self::findRowWhere(['alias' => $alias]);
+        return static::findRowWhere(['alias' => $alias]);
     }
 
     /**
      * Init table relations
      *
      * @return void
      */
-    public function init()
+    public function init() : void
     {
         $this->linkTo('userId', 'Users', 'id');
     }

diff --git 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']);