Skip to content

Commit

Permalink
Merge pull request #10 from bluzphp/develop
Browse files Browse the repository at this point in the history
 Added scrutinizer configuration
  • Loading branch information
Anton authored Mar 7, 2019
2 parents 9250a80 + fe05854 commit 16dd60e
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
.DS_Store
.idea
vendor
composer.lock
composer.phar
29 changes: 29 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
build:
nodes:
analysis:
tests:
override:
- php-scrutinizer-run
checks:
php:
psr2_switch_declaration: true
psr2_class_declaration: true
no_short_open_tag: true
deprecated_code_usage: true
code_rating: true
filter:
excluded_paths: [bin, docs, docker, data, tests, vendor]
tools:
php_analyzer: true
php_code_sniffer:
config:
standard: PSR2
php_cpd:
enabled: true
excluded_dirs: [bin, docs, docker, data, tests, vendor]
php_loc:
enabled: true
excluded_dirs: [bin, docs, docker, data, tests, vendor]
php_mess_detector: true
php_pdepend: true
sensiolabs_security_checker: true
9 changes: 1 addition & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,10 @@ script:
- php vendor/bin/phpcs ./application --standard=PSR1,PSR2 --encoding=utf-8 --ignore=./application/_loader.php
# Run built-in web-server
- php vendor/bin/bluzman server:start --host 127.0.0.1 -b
# Run CodeCeption tests
# Run codeception tests
- php vendor/bin/bluzman test module-$BLUZ_MODULE
notifications:
email: false
webhooks:
urls:
- https://webhooks.gitter.im/e/b84e6a583d6eea87d0eb
- https://webhooks.gitter.im/e/c4fa557829c5bd992271
on_success: change # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: false # default: false
branches:
only:
- master
Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Module auth for Bluz Skeleton

### Achievements
## Achievements

[![PHP >= 7.1+](https://img.shields.io/packagist/php-v/bluzphp/module-auth.svg?style=flat)](https://php.net/)

Expand All @@ -14,8 +13,7 @@

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

Usage
-------------------------
##Usage
### Install module
To install the module run the command:

Expand All @@ -28,4 +26,4 @@ To remove the module, run the command:

```bash
php /vendor/bin/bluzman module:remove auth
```
```
2 changes: 1 addition & 1 deletion application/modules/auth/controllers/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
$authRow->token = $accessToken['access_token'];
$authRow->save();
Response::redirectTo('users', 'profile');
} else if ($authRow) {
} elseif ($authRow) {
// Try to login
$user = Users\Table::findRow($authRow->userId);
Auth\Table::tryLogin($user);
Expand Down

0 comments on commit 16dd60e

Please sign in to comment.