From 2832871b58117b5f99b620678adc3eefd1173943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= <enumag@gmail.com>
Date: Fri, 29 Sep 2017 20:53:30 +0200
Subject: [PATCH] Update dev dependencies

---
 .gitattributes      |  1 -
 .gitignore          |  3 +--
 .travis.yml         | 12 +++---------
 composer-tools.json | 10 ----------
 composer-tools.sh   |  2 --
 composer.json       | 20 +++++++++++---------
 phpstan.neon        |  4 ++--
 tests.md            |  6 ------
 8 files changed, 17 insertions(+), 41 deletions(-)
 delete mode 100644 composer-tools.json
 delete mode 100644 composer-tools.sh

diff --git a/.gitattributes b/.gitattributes
index 0d60c65..a96bdf2 100644
--- a/.gitattributes
+++ b/.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
diff --git a/.gitignore b/.gitignore
index e40b990..d373804 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
 /vendor
-/vendor-tools
 /tests/_log/*
 /tests/_temp/*
-/composer*.lock
+/composer.lock
 
 .php_cs.cache
 
diff --git a/.travis.yml b/.travis.yml
index 72e8764..6e5bd38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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:
@@ -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:
diff --git a/composer-tools.json b/composer-tools.json
deleted file mode 100644
index 9902e39..0000000
--- a/composer-tools.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "require-dev": {
-        "friendsofphp/php-cs-fixer": "@stable",
-        "phpstan/phpstan": "@stable",
-        "phpstan/phpstan-nette": "@stable"
-    },
-    "config": {
-        "vendor-dir": "vendor-tools"
-    }
-}
diff --git a/composer-tools.sh b/composer-tools.sh
deleted file mode 100644
index 952e7e0..0000000
--- a/composer-tools.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env sh
-COMPOSER=composer-tools.json composer update
diff --git a/composer.json b/composer.json
index 949250f..06f2d19 100644
--- a/composer.json
+++ b/composer.json
@@ -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": {
@@ -35,14 +38,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"
@@ -50,7 +52,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.2-dev"
+            "dev-master": "1.0-dev"
         }
     }
 }
diff --git a/phpstan.neon b/phpstan.neon
index 856e89d..b6bc938 100644
--- a/phpstan.neon
+++ b/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:
diff --git a/tests.md b/tests.md
index bc67dab..7eedccf 100644
--- a/tests.md
+++ b/tests.md
@@ -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