Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ workflows:
php-docker-template: &php-docker-template
steps:
- checkout
- run:
name: validate composer.json
command: composer validate
- run:
name: install current dependencies
command: composer install --no-progress
Expand Down Expand Up @@ -67,8 +70,14 @@ jobs:
sudo php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer
- checkout
- run:
name: update dependencies # the dependencies in composer.lock don't work with 5.5
command: composer update --no-progress
name: validate composer.json
command: composer validate
- run:
name: install current dependencies
command: composer install --no-progress
- run:
name: run php-cs-fixer
command: vendor/bin/php-cs-fixer fix --diff --dry-run --verbose
- run:
name: run tests
command: vendor/bin/phpunit --log-junit ~/phpunit/junit.xml --coverage-text tests
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/doc/
*.iml
composer.phar
.php_cs.cache
.vagrant
integration-tests/vendor
composer.lock
10 changes: 10 additions & 0 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

$finder = PhpCsFixer\Finder::create()->in(__DIR__);

return PhpCsFixer\Config::create()
->setFinder($finder)
->setUsingCache(true)
->setRules([
'@PSR2' => true,
]);
4 changes: 4 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"psr/log": "^1.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~2.2.19",
"guzzlehttp/guzzle": "^6.2.1",
"kevinrob/guzzle-cache-middleware": "^1.4.1",
"phpdocumentor/phpdocumentor": "^2.0",
Expand All @@ -43,5 +44,8 @@
},
"config": {
"sort-packages": true
},
"scripts": {
"cs": "vendor/bin/php-cs-fixer fix --diff --verbose"
}
}
Loading