diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b11eedb..e327a37b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,16 +23,3 @@ test:7.1:
     image: php:7.1-alpine
     script:
       - phpdbg -qrr -- vendor/bin/phpunit --coverage-text --colors=never
-
-#test:hhvm:
-#    stage: test
-#    allow_failure: true
-#    before_script:
-#      - /usr/local/bin/composer self-update
-#      - curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
-#      - chmod +x /usr/local/bin/phpunit
-#      - composer install --no-dev --ignore-platform-reqs
-#    #image: 51systems/docker-gitlab-ci-runner-hhvm
-#    image: 2ndkauboy/gitlab-ci-runner-hhvm
-#    script:
-#      - hhvm -d hhvm.php7.all=true /usr/local/bin/phpunit -c build --coverage-text --colors=never
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 0719d141..828b4f64 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
 		"aura/router": "^3.0",
 		"aura/session": "^2.0",
 		"aviat/banker": "^1.0.0",
-		"aviat/ion": "1.0.*",
+		"aviat/ion": "dev-master",
 		"filp/whoops": "^2.1.5",
 		"monolog/monolog": "^1.0",
 		"psr/http-message": "~1.0",
@@ -42,12 +42,14 @@
 		"consolidation/robo": "~1.0",
 		"henrikbjorn/lurker": "^1.1.0",
 		"symfony/var-dumper": "^3.1",
-		"squizlabs/php_codesniffer": "^3.0.0@beta"
+		"squizlabs/php_codesniffer": "^3.0.0@beta",
+		"phpstan/phpstan": "^0.6.4"
 	},
 	"scripts": {
 		"build:css": "cd public && npm run build && cd ..",
 		"coverage": "vendor/bin/phpunit -c build",
 		"docs": "vendor/bin/phpdox",
+		"phpstan": "phpstan analyse src tests",
 		"watch:css": "cd public && npm run watch",
 		"test": "vendor/bin/phpunit"
 	}