Merge pull request #18 from bluzphp/develop

Migrate to PHP 7.1

Author: Anton

.travis.yml

@@ -1,12 +1,10 @@
 language: php
 php:
-  - 7.0
   - 7.1
   - 7.2
   - master
 matrix:
   allow_failures:
-    - php: 7.2
     - php: master
 env:
   - BLUZ_MODULE=test

application/models/Test/ArrayGrid.php

@@ -22,11 +22,9 @@ class ArrayGrid extends Grid
     protected $uid = 'arr';
 
     /**
-     * init
-     *
-     * @return self
+     * {@inheritdoc}
      */
-    public function init()
+    public function init() : void
     {
         // Source of grid
         $adapter = new ArraySource();
@@ -49,7 +47,5 @@ public function init()
         $this->setDefaultLimit(3);
         $this->setAllowOrders(['name', 'email', 'id']);
         $this->setAllowFilters(['name', 'status', 'id']);
-
-        return $this;
     }
 }

application/models/Test/Row.php

@@ -35,7 +35,7 @@ class Row extends \Bluz\Db\Row
      *
      * @return void
      */
-    protected function beforeSave()
+    protected function beforeSave() : void
     {
         // name validator
         $this->addValidator('name')

application/models/Test/SelectGrid.php

@@ -23,11 +23,9 @@ class SelectGrid extends Grid
     protected $uid = 'sel';
 
     /**
-     * init
-     *
-     * @return self
+     * {@inheritdoc}
      */
-    public function init()
+    public function init() : void
     {
         // Source of grid
         $adapter = new SelectSource();
@@ -41,7 +39,5 @@ public function init()
         $this->setDefaultLimit(15);
         $this->setAllowOrders(['name', 'id', 'status']);
         $this->setAllowFilters(['status', 'id']);
-
-        return $this;
     }
 }

application/models/Test/SqlGrid.php

@@ -22,11 +22,9 @@ class SqlGrid extends Grid
     protected $uid = 'sql';
 
     /**
-     * init
-     *
-     * @return self
+     * {@inheritdoc}
      */
-    public function init()
+    public function init() : void
     {
         // Source of grid
         $adapter = new SqlSource();
@@ -37,7 +35,5 @@ public function init()
         $this->setAllowOrders(['name', 'id', 'status']);
         $this->setAllowFilters(['status', 'id']);
         $this->setDefaultOrder('name', Grid::ORDER_DESC);
-
-        return $this;
     }
 }

application/models/Test/Table.php

@@ -33,7 +33,7 @@ class Table extends \Bluz\Db\Table
      *
      * @var array
      */
-    protected $primary = array('id');
+    protected $primary = ['id'];
 
     /**
      * save test row

application/models/Test/TableGrid.php

@@ -22,11 +22,9 @@ class TableGrid extends Grid
     protected $uid = 'tbl';
 
     /**
-     * init
-     *
-     * @return self
+     * {@inheritdoc}
      */
-    public function init()
+    public function init() : void
     {
         // Source of grid
         $adapter = new SelectSource();
@@ -39,7 +37,5 @@ public function init()
         $this->setDefaultLimit(15);
         $this->setAllowOrders(['name', 'id', 'status']);
         $this->setAllowFilters(['status', 'id']);
-
-        return $this;
     }
 }

application/modules/test/controllers/rest.php

@@ -11,7 +11,7 @@
 namespace Application;
 
 use Application\Test;
-use Bluz\Application\Exception\ForbiddenException;
+use Bluz\Http\Exception\ForbiddenException;
 use Bluz\Controller\Controller;
 use Bluz\Controller\Mapper\Rest;
 

application/modules/test/views/grid-array.phtml

@@ -12,12 +12,13 @@ if (!$grid) {
     // use data-spy="grid" for use AJAX for reload grid
     require(['bluz.grid']);
   </script>
-  <p>
-    Filters:<br/>
-    <a href="<?= $grid->filter('id', 'gt', 3) ?>">With Id &gt; 3</a> <br/>
-    <a href="<?= $grid->filter('id', 'lt', 9) ?>">With Id &lt; 9</a> <br/>
-    <a href="<?= $grid->filter('id', 'ne', 5, false) ?>">AND Id != 5</a>
-  </p>
+  <nav class="navbar navbar-light bg-light justify-content-start">
+    <a class="navbar-brand" href="#">Filters:</a>
+    <a href="<?= $grid->filter('id', 'gt', 3) ?>" class="btn btn-info ml-3" data-ajax>With Id &gt; 3</a>
+    <a href="<?= $grid->filter('id', 'lt', 9) ?>" class="btn btn-info ml-3" data-ajax>With Id &lt; 9</a>
+    <a href="<?= $grid->filter('id', 'ne', 5, false) ?>" class="btn btn-info ml-3" data-ajax>AND Id != 5</a>
+  </nav>
+
   <hr/>
 
   <?= $this->partial('grid/total.phtml', ['grid' => $grid]) ?>

application/modules/test/views/grid-sql.phtml

@@ -14,18 +14,20 @@ if (!$grid) {
 </script>
 
 <div class="clearfix" data-spy="grid" data-grid="<?= $grid->getUid() ?>">
-  <p>
-    Filters:<br/>
-    <a href="<?= $grid->filter('status', 'eq', 'active') ?>">All Active Users</a> <br/>
-    <a href="<?= $grid->filter('id', 'gt', 30) ?>">All users with Id &gt; 30</a> <br/>
-    <a href="<?= $grid->filter('id', 'lt', 70, false) ?>">AND users with Id &lt; 70</a> <br/>
-    <a href="<?= $grid->filter('status', 'eq', 'active', false) ?>">AND Active Users</a> <br/>
-    <a href="<?= $grid->filter('id', 'ne', 42, false) ?>">AND without user with Id = 42</a> <br/>
-  </p>
-  <div class="input-group">
-    <a href="<?= $this->url('test', 'crud') ?>" class="btn btn-primary pull-left"
+  <nav class="navbar navbar-light bg-light justify-content-start">
+    <a class="navbar-brand ml-3" href="#">Filters:</a>
+    <a href="<?= $grid->filter('status', 'eq', 'active') ?>" class="btn btn-info ml-3" data-ajax>All Active Users</a>
+    <a href="<?= $grid->filter('id', 'gt', 30) ?>" class="btn btn-info ml-3" data-ajax>All users with Id &gt; 30</a>
+    <a href="<?= $grid->filter('id', 'lt', 70, false) ?>" class="btn btn-info ml-3" data-ajax>AND users with Id &lt; 70</a>
+    <a href="<?= $grid->filter('status', 'eq', 'active', false) ?>" class="btn btn-info ml-3" data-ajax>AND Active Users</a>
+    <a href="<?= $grid->filter('id', 'ne', 42, false) ?>" class="btn btn-info ml-3" data-ajax>AND without user with Id = 42</a>
+  </nav>
+  <hr/>
+  <nav class="navbar navbar-light bg-light justify-content-start">
+    <a href="<?= $this->url('test', 'crud') ?>" class="btn btn-primary"
        data-ajax-dialog data-ajax-method="get">Create</a>
-  </div>
+  </nav>
+
   <hr/>
   <?= $this->partial('grid/total.phtml', ['grid' => $grid]) ?>
   <?= $this->partial('grid/limit.phtml', ['grid' => $grid]) ?>