Skip to content

Commit

Permalink
Update dev dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
enumag committed Sep 29, 2017
1 parent 260f4e8 commit 2832871
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 41 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Expand Up @@ -5,7 +5,6 @@
.php_cs export-ignore
.travis.yml export-ignore
codeception.yml export-ignore
composer-tools.* export-ignore
docs export-ignore
phpstan.neon export-ignore
tests export-ignore
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
@@ -1,8 +1,7 @@
/vendor
/vendor-tools
/tests/_log/*
/tests/_temp/*
/composer*.lock
/composer.lock

.php_cs.cache

Expand Down
12 changes: 3 additions & 9 deletions .travis.yml
Expand Up @@ -5,24 +5,18 @@ cache:
- $HOME/.composer/cache

php:
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2
- nightly
- hhvm

matrix:
fast_finish: true
allow_failures:
- php: nightly
- php: hhvm

install:
- export PATH="$PATH:$HOME/.composer/vendor/bin"
- if php -v | grep -q 'PHP 7'; then composer tools; fi
- composer global require satooshi/php-coveralls ^1.0.0
- composer global require php-coveralls/php-coveralls ^1.0.0
- composer update --no-interaction

before_script:
Expand All @@ -31,8 +25,8 @@ before_script:

script:
- "! (composer outdated --direct | grep ^)"
- if php -v | grep -q 'PHP 7'; then vendor-tools/bin/php-cs-fixer fix --dry-run; fi
- if php -v | grep -q 'PHP 7'; then vendor-tools/bin/phpstan analyse --level=7 --configuration=phpstan.neon src tests; fi
- vendor/bin/php-cs-fixer fix --dry-run
- vendor/bin/phpstan analyse --level=max --configuration=phpstan.neon src tests
- vendor/bin/codecept run $coverage

after_success:
Expand Down
10 changes: 0 additions & 10 deletions composer-tools.json

This file was deleted.

2 changes: 0 additions & 2 deletions composer-tools.sh

This file was deleted.

20 changes: 11 additions & 9 deletions composer.json
Expand Up @@ -12,14 +12,17 @@
}
],
"require": {
"php": "^5.5.0|^7.0.0",
"nette/di": "^2.3.0",
"nette/http": "^2.3.0",
"symfony/security-csrf": "^2.8.0|^3.0.0"
"php": "^7.1.0",
"nette/di": "^2.4.0",
"nette/http": "^2.4.0",
"symfony/security-csrf": "^3.0.0"
},
"require-dev": {
"arachne/codeception": "^0.7.3",
"codeception/codeception": "^2.3.2"
"codeception/codeception": "^2.3.2",
"friendsofphp/php-cs-fixer": "^2.7.0@dev",
"phpstan/phpstan": "^0.8.5",
"phpstan/phpstan-nette": "^0.8.3"
},
"autoload": {
"psr-4": {
Expand All @@ -35,22 +38,21 @@
]
},
"scripts": {
"tools": "sh composer-tools.sh",
"ci": [
"@fix",
"@analyse",
"@test"
],
"fix": "\"vendor-tools/bin/php-cs-fixer\" fix",
"analyse": "\"vendor-tools/bin/phpstan\" analyse --no-progress --level=7 --configuration=phpstan.neon src tests",
"fix": "\"vendor/bin/php-cs-fixer\" fix",
"analyse": "\"vendor/bin/phpstan\" analyse --no-progress --level=max --configuration=phpstan.neon src tests",
"test": [
"\"vendor/bin/codecept\" build",
"\"vendor/bin/codecept\" run --debug"
]
},
"extra": {
"branch-alias": {
"dev-master": "0.2-dev"
"dev-master": "1.0-dev"
}
}
}
4 changes: 2 additions & 2 deletions phpstan.neon
@@ -1,6 +1,6 @@
includes:
- vendor-tools/phpstan/phpstan-nette/extension.neon
- vendor-tools/phpstan/phpstan-nette/rules.neon
- vendor/phpstan/phpstan-nette/extension.neon
- vendor/phpstan/phpstan-nette/rules.neon

parameters:
excludes_analyse:
Expand Down
6 changes: 0 additions & 6 deletions tests.md
Expand Up @@ -2,12 +2,6 @@ How to run tests
====

```
# install php-cs-fixer and phpstan
composer tools
# go to the project's root directory, but NOT the tests subdirectory
cd <project_dir>
# install dependencies
composer update
Expand Down

0 comments on commit 2832871

Please sign in to comment.