Skip to content

Commit ffe1a38

Browse files
author
Anton
authored
Merge pull request #21 from bluzphp/develop
Develop
2 parents 0641a0d + db8628e commit ffe1a38

File tree

5 files changed

+23
-19
lines changed

5 files changed

+23
-19
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
.DS_Store
22
.idea
3+
vendor
4+
composer.lock
5+
composer.phar

.scrutinizer.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
build:
2+
nodes:
3+
analysis:
4+
tests:
5+
override:
6+
- php-scrutinizer-run
17
checks:
28
javascript: true
39
php:
@@ -7,11 +13,18 @@ checks:
713
deprecated_code_usage: true
814
code_rating: true
915
filter:
10-
excluded_paths:
11-
- 'tests/*'
12-
- 'public/js/vendor/*'
16+
excluded_paths: [bin, docs, docker, data, tests, vendor]
1317
tools:
1418
php_analyzer: true
1519
php_code_sniffer:
1620
config:
1721
standard: PSR2
22+
php_cpd:
23+
enabled: true
24+
excluded_dirs: [bin, docs, docker, data, tests, vendor]
25+
php_loc:
26+
enabled: true
27+
excluded_dirs: [bin, docs, docker, data, tests, vendor]
28+
php_mess_detector: true
29+
php_pdepend: true
30+
sensiolabs_security_checker: true

.travis.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,13 @@ script:
3131
# Check code style
3232
- php vendor/bin/phpcs ./application --standard=PSR12 --encoding=utf-8 --ignore=./application/_loader.php
3333
# Run built-in web-server
34-
- php vendor/bin/bluzman server:start --host 127.0.0.1 -b
34+
- php vendor/bin/bluzman server:start --host 127.0.0.1 -b -e testing
3535
# Run CodeCeption tests
3636
- php vendor/bin/bluzman test module-$BLUZ_MODULE
3737
# Run postman/newman tests
3838
- newman run tests/postman/$BLUZ_MODULE/collection.json -e tests/postman/$BLUZ_MODULE/environment.json
3939
notifications:
4040
email: false
41-
webhooks:
42-
urls:
43-
- https://webhooks.gitter.im/e/b84e6a583d6eea87d0eb
44-
- https://webhooks.gitter.im/e/c4fa557829c5bd992271
45-
on_success: change # options: [always|never|change] default: always
46-
on_failure: always # options: [always|never|change] default: always
47-
on_start: false # default: false
4841
branches:
4942
only:
5043
- master

README.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# Module test for Bluz Skeleton
2-
3-
### Achievements
4-
5-
[![PHP >= 7.1+](https://img.shields.io/packagist/php-v/bluzphp/module-test.svg?style=flat)](https://php.net/)
2+
## Achievements
63

74
[![Latest Stable Version](https://img.shields.io/packagist/v/bluzphp/module-test.svg?label=version&style=flat)](https://packagist.org/packages/bluzphp/module-test)
85

@@ -14,9 +11,7 @@
1411

1512
[![License](https://img.shields.io/packagist/l/bluzphp/module-test.svg?style=flat)](https://packagist.org/packages/bluzphp/module-test)
1613

17-
18-
Usage
19-
-------------------------
14+
## Usage
2015
### Install module
2116
To install the module run the command:
2217

application/modules/test/controllers/cache-data.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
// try to load profile of current user
3838
if (!$id && $this->user()) {
39-
$id = $this->user()->id;
39+
$id = $this->user()->getId();
4040
}
4141

4242
if (!$id) {

0 commit comments

Comments
 (0)