Skip to content

Commit 030f0ae

Browse files
committed
Update meta files
1 parent 29ec2f2 commit 030f0ae

File tree

10 files changed

+27
-13
lines changed

10 files changed

+27
-13
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ composer-tools.* export-ignore
99
docs export-ignore
1010
phpstan.neon export-ignore
1111
tests export-ignore
12+
*.md export-ignore

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/vendor
2+
/vendor-tools
23
/tests/_log/*
34
/tests/_temp/*
45
/composer*.lock

.php_cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ $finder = PhpCsFixer\Finder::create()
55
->ignoreDotFiles(false)
66
->exclude('_helpers')
77
->exclude('_temp')
8+
->exclude('vendor-tools')
89
->in(__DIR__);
910

1011
return PhpCsFixer\Config::create()

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ matrix:
1616

1717
install:
1818
- export PATH="$PATH:$HOME/.composer/vendor/bin"
19-
- composer global require friendsofphp/php-cs-fixer ^2.0.0
20-
- composer global require phpstan/phpstan ^0.6.0
19+
- if php -v | grep -q 'PHP 7'; then composer tools; fi
2120
- composer global require satooshi/php-coveralls ^1.0.0
2221
- composer update --no-interaction
2322

@@ -26,8 +25,8 @@ before_script:
2625
- vendor/bin/codecept build
2726

2827
script:
29-
- php-cs-fixer fix --dry-run
30-
- phpstan analyse --level=4 --configuration=phpstan.neon src tests
28+
- if php -v | grep -q 'PHP 7'; then vendor-tools/bin/php-cs-fixer fix --dry-run; fi
29+
- if php -v | grep -q 'PHP 7'; then vendor-tools/bin/phpstan analyse --level=4 --configuration=phpstan.neon src tests; fi
3130
- vendor/bin/codecept run $coverage
3231

3332
after_success:

codeception.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ settings:
1010
bootstrap: _bootstrap.php
1111
log: true
1212

13-
extensions:
14-
enabled:
15-
- Arachne\Codeception\Tracy\Logger
16-
1713
coverage:
1814
enabled: true
1915
include:

composer-tools.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"require-dev": {
3+
"friendsofphp/php-cs-fixer": "^2.0.0",
4+
"nette/http": "^3.0.0",
5+
"phpstan/phpstan": "^0.6.3",
6+
"phpstan/phpstan-nette": "^0.6.1"
7+
},
8+
"minimum-stability": "alpha",
9+
"config": {
10+
"vendor-dir": "vendor-tools"
11+
}
12+
}

composer-tools.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
COMPOSER=composer-tools.json composer update

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@
4545
"@analyse",
4646
"@test"
4747
],
48-
"fix": "php-cs-fixer fix",
49-
"analyse": "phpstan analyse --no-progress --level=4 --configuration=phpstan.neon src tests",
48+
"tools": "sh composer-tools.sh",
49+
"fix": "\"vendor-tools/bin/php-cs-fixer\" fix",
50+
"analyse": "\"vendor-tools/bin/phpstan\" analyse --no-progress --level=4 --configuration=phpstan.neon src tests",
5051
"test": [
5152
"\"vendor/bin/codecept\" build",
5253
"\"vendor/bin/codecept\" run"

phpstan.neon

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
includes:
2+
- vendor-tools/phpstan/phpstan-nette/extension.neon
3+
- vendor-tools/phpstan/phpstan-nette/rules.neon
4+
15
parameters:
26
ignoreErrors:
3-
- '#^Arachne\\Codeception\\Http\\Request::__construct\(\) does not call parent constructor from Nette\\Http\\Request#'

tests.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ How to run tests
33

44
```
55
# install php-cs-fixer and phpstan
6-
composer global require friendsofphp/php-cs-fixer
7-
composer global require phpstan/phpstan
6+
composer tools
87
98
# go to the project's root directory, but NOT the tests subdirectory
109
cd <project_dir>

0 commit comments

Comments
 (0)