Update dependencies

.gitattributes

@@ -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

.gitignore

@@ -1,8 +1,7 @@
 /vendor
-/vendor-tools
 /tests/_log/*
 /tests/_temp/*
-/composer*.lock
+/composer.lock
 
 .php_cs.cache
 

.travis.yml

@@ -5,23 +5,18 @@ cache:
         - $HOME/.composer/cache
 
 php:
-    - 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:
@@ -30,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:

composer.json

@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "^5.6.0|^7.0.0",
+        "php": "^7.1.0",
         "arachne/service-collections": "^0.1.0",
         "nette/di": "^2.4.10",
         "nette/http": "^2.4.0",
@@ -22,8 +22,11 @@
     "require-dev": {
         "arachne/codeception": "^0.7.0",
         "codeception/codeception": "^2.3.2",
-        "eloquent/phony": "^1.0.0|^2.0.0",
-        "eloquent/phony-phpunit": "^1.0.0|^2.0.0|^3.0.0"
+        "eloquent/phony": "^2.0.0",
+        "eloquent/phony-phpunit": "^3.0.0",
+        "friendsofphp/php-cs-fixer": "^2.7.0@dev",
+        "phpstan/phpstan": "^0.8.5",
+        "phpstan/phpstan-nette": "^0.8.3"
     },
     "autoload": {
         "psr-4": {
@@ -40,14 +43,13 @@
         ]
     },
     "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"

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:

tests.md

@@ -2,13 +2,6 @@ How to run tests
 ====
 
 ```
-# install php-cs-fixer and phpstan
-composer global require friendsofphp/php-cs-fixer
-composer global require phpstan/phpstan
-
-# go to the project's root directory, but NOT the tests subdirectory 
-cd <project_dir>
-
 # install dependencies
 composer update