Merge pull request #20 from bluzphp/develop

Added PHP 7.3 build for TravisCI

Author: Anton

.scrutinizer.yml

@@ -1,4 +1,5 @@
 checks:
+  javascript: true
   php:
     psr2_switch_declaration: true
     psr2_class_declaration: true
@@ -9,9 +10,6 @@ filter:
   excluded_paths:
     - 'tests/*'
     - 'public/js/vendor/*'
-checks:
-  php: true
-  javascript: true
 tools:
   php_analyzer: true
   php_code_sniffer:

.travis.yml

@@ -2,6 +2,7 @@ language: php
 php:
   - 7.1
   - 7.2
+  - 7.3
   - master
 matrix:
   allow_failures:

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2012-2017 by Bluz PHP Team
+Copyright (c) 2012-2019 by Bluz PHP Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,16 +1,19 @@
 # Module test for Bluz Skeleton
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bluzphp/main)
-
 ### Achievements
 
-[![Build Status](https://travis-ci.org/bluzphp/module-test.svg?branch=master)](https://travis-ci.org/bluzphp/module-test)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/bluzphp/module-test/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/bluzphp/module-test/?branch=master)
+[![PHP >= 7.1+](https://img.shields.io/packagist/php-v/bluzphp/module-test.svg?style=flat)](https://php.net/)
+
+[![Latest Stable Version](https://img.shields.io/packagist/v/bluzphp/module-test.svg?label=version&style=flat)](https://packagist.org/packages/bluzphp/module-test)
+
+[![Build Status](https://img.shields.io/travis/bluzphp/module-test/master.svg?style=flat)](https://travis-ci.org/bluzphp/module-test)
+
+[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/bluzphp/module-test.svg?style=flat)](https://scrutinizer-ci.com/g/bluzphp/module-test/)
+
+[![Total Downloads](https://img.shields.io/packagist/dt/bluzphp/module-test.svg?style=flat)](https://packagist.org/packages/bluzphp/module-test)
 
-[![Latest Stable Version](https://poser.pugx.org/bluzphp/module-test/v/stable)](https://packagist.org/packages/bluzphp/module-test)
-[![Total Downloads](https://poser.pugx.org/bluzphp/module-test/downloads)](https://packagist.org/packages/bluzphp/module-test)
+[![License](https://img.shields.io/packagist/l/bluzphp/module-test.svg?style=flat)](https://packagist.org/packages/bluzphp/module-test)
 
-[![License](https://poser.pugx.org/bluzphp/module-test/license)](https://packagist.org/packages/bluzphp/module-test)
 
 Usage
 -------------------------

application/modules/test/controllers/options.php

@@ -33,7 +33,7 @@
         Options\Table::remove('example');
     } else {
         $message = 'Option `example` not found, try again later';
-        Options\Table::set('example', uniqid('example_'));
+        Options\Table::set('example', uniqid('example_', true));
     }
 
     $this->assign('message', $message);

application/modules/test/controllers/rest.php

@@ -24,7 +24,6 @@
  * @acl    Delete
  *
  * @return mixed
- * @throws ForbiddenException
  */
 return function () {
     /**

application/modules/test/views/db-relations.phtml

@@ -33,7 +33,16 @@ $roles = $user->getRelations('Roles');
 demo($roles);
 ?>
 
-<h3>User - Page relation</h3>
+<h3>User - Find pages by user ID</h3>
+<hr/>
+<pre class="alert alert-secondary"><code>Db\Relations::findRelations('Users', 'Pages', [1, 2, 3])</code></pre>
+
+<?php
+$result = \Bluz\Db\Relations::findRelations('Users', 'Pages', [1, 2, 3]);
+demo($result);
+?>
+
+<h3>User - Fetch page relation</h3>
 <hr/>
 <pre class="alert alert-secondary"><code>Db::fetchRelations(
   "SELECT '__users', u.*, '__pages', p.* FROM users u LEFT JOIN pages p ON p.userId = u.id LIMIT 1"

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

@@ -50,7 +50,7 @@ if (!$grid) {
         <td class="controls d-flex justify-content-around">
           <a href="<?= $this->url('test', 'crud', ['id' => $row['id']]) ?>" class="btn btn-primary"
              data-ajax-dialog data-ajax-method="get">
-            <i class="fa fa-pencil"></i>
+            <i class="fas fa-pencil-alt"></i>
           </a>
           <a href="<?= $this->url('test', 'crud', ['id' => $row['id']]) ?>" class="btn btn-danger"
              data-confirm data-ajax data-ajax-method="delete">

application/modules/test/views/index.phtml

@@ -208,10 +208,10 @@ $this->headScript($this->baseUrl('js/test/config.js'));
     $(function(){
       $('#ajax-callback') <em>// button above</em>
         .on('success.bluz.ajax', function(){
-          notify.addSuccess("Event `success.bluz.ajax` is fired")
+          notify.addSuccess("Event `success.bluz.ajax` has been fired")
         })
         .on('error.bluz.ajax', function(){
-          notify.addSuccess("Event `error.bluz.ajax` is fired")
+          notify.addSuccess("Event `error.bluz.ajax` has been fired")
         });
     });
   });</code></pre>
@@ -220,13 +220,13 @@ $this->headScript($this->baseUrl('js/test/config.js'));
       $(function () {
         $('#ajax-callback')
           .on('success.bluz.ajax', function () {
-            notify.addSuccess("Event `success.bluz.ajax` is fired")
+            notify.addSuccess("Event `success.bluz.ajax` has been fired")
               .done(function () {
                 console.log("Deferred call")
               });
           })
           .on('error.bluz.ajax', function () {
-            notify.addSuccess("Event `error.bluz.ajax` is fired")
+            notify.addSuccess("Event `error.bluz.ajax` has been fired")
               .done(function () {
                 console.log("Deferred call")
               });
@@ -254,7 +254,7 @@ $this->headScript($this->baseUrl('js/test/config.js'));
       <?= $this->ahref(
           'Load + Confirm',
           ['test', 'ajax-html'],
-          ['class' => 'btn btn-warning', 'data-ajax-load', 'data-ajax-target' => '#load', 'data-confirm' => 'Are you wand to load data from server?']
+          ['class' => 'btn btn-warning', 'data-ajax-load', 'data-ajax-target' => '#load', 'data-confirm' => 'Are you want to load data from server?']
       ); ?>
     <div>
     <select class="form-control" name="formName"

application/modules/test/views/mailer.phtml

@@ -5,7 +5,9 @@
 <form action="<?= $this->url('test', 'mailer') ?>" method="POST">
   <div class="form-group">
     <label class="input-group">
-      <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
+      <div class="input-group-prepend">
+        <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+      </div>
       <input type="email" class="form-control" name="email" value="<?= $email ?>" placeholder="<?= __('email') ?>"/>
     </label>
   </div>