Skip to content

Commit db8628e

Browse files
author
Anton Shevchuk
committed
Merge branch 'master' of https://github.com/bluzphp/module-test into develop
� Conflicts: � public/js/test/pager.js � public/js/test/react.jsx
2 parents 66662cf + 0641a0d commit db8628e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+912
-17410
lines changed

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
language: php
22
php:
3-
- 7.1
4-
- 7.2
53
- 7.3
6-
- master
4+
- 7.4
5+
- 8.0
76
matrix:
87
allow_failures:
9-
- php: master
8+
- php: 8.0
109
env:
1110
- BLUZ_MODULE=test
1211
before_install:
@@ -30,7 +29,7 @@ before_script:
3029
- php vendor/bin/bluzman db:seed:run
3130
script:
3231
# Check code style
33-
- php vendor/bin/phpcs ./application --standard=PSR1,PSR2 --encoding=utf-8 --ignore=./application/_loader.php
32+
- php vendor/bin/phpcs ./application --standard=PSR12 --encoding=utf-8 --ignore=./application/_loader.php
3433
# Run built-in web-server
3534
- php vendor/bin/bluzman server:start --host 127.0.0.1 -b -e testing
3635
# Run CodeCeption tests

README.md

Lines changed: 5 additions & 4 deletions

application/models/Test/ArrayGrid.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @copyright Bluz PHP Team
45
* @link https://github.com/bluzphp/skeleton
@@ -24,7 +25,7 @@ class ArrayGrid extends Grid
2425
/**
2526
* {@inheritdoc}
2627
*/
27-
public function init() : void
28+
public function init(): void
2829
{
2930
// Source of grid
3031
$adapter = new ArraySource();

application/models/Test/Crud.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @copyright Bluz PHP Team
45
* @link https://github.com/bluzphp/skeleton

application/models/Test/Row.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @copyright Bluz PHP Team
45
* @link https://github.com/bluzphp/skeleton
@@ -35,7 +36,7 @@ class Row extends \Bluz\Db\Row
3536
*
3637
* @return void
3738
*/
38-
protected function beforeSave() : void
39+
protected function beforeSave(): void
3940
{
4041
// name validator
4142
$this->addValidator('name')

application/models/Test/SelectGrid.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @copyright Bluz PHP Team
45
* @link https://github.com/bluzphp/skeleton
@@ -25,7 +26,7 @@ class SelectGrid extends Grid
2526
/**
2627
* {@inheritdoc}
2728
*/
28-
public function init() : void
29+
public function init(): void
2930
{
3031
// Source of grid
3132
$adapter = new SelectSource();

application/models/Test/SqlGrid.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @copyright Bluz PHP Team
45
* @link https://github.com/bluzphp/skeleton
@@ -24,7 +25,7 @@ class SqlGrid extends Grid
2425
/**
2526
* {@inheritdoc}
2627
*/
27-
public function init() : void
28+
public function init(): void
2829
{
2930
// Source of grid
3031
$adapter = new SqlSource();

application/models/Test/Table.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @copyright Bluz PHP Team
45
* @link https://github.com/bluzphp/skeleton

application/models/Test/TableGrid.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @copyright Bluz PHP Team
45
* @link https://github.com/bluzphp/skeleton
@@ -24,7 +25,7 @@ class TableGrid extends Grid
2425
/**
2526
* {@inheritdoc}
2627
*/
27-
public function init() : void
28+
public function init(): void
2829
{
2930
// Source of grid
3031
$adapter = new SelectSource();

application/modules/test/api.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Annotations for swagger
45
*

0 commit comments

Comments
 (0)