Merge pull request #79 from swaggest/update-ci

Update CI

Author: vearutop

.gitignore

@@ -1,7 +1,8 @@
 vendor
 .idea
 composer.phar
-clover.xml
+/clover.xml
 build
 /xhprof_report.*
-benchmark-result.json
+benchmark-result.json
+/coverage.xml

.travis.yml

@@ -10,6 +10,7 @@ php:
   - 5.4
 
 sudo: false
+dist: trusty
 
 ## Cache composer bits
 cache:
@@ -19,7 +20,6 @@ cache:
 before_script:
   - composer install --dev --no-interaction --prefer-dist
   - if ! [[ $(phpenv version-name) =~ 7.3 ]] ; then phpenv config-rm xdebug.ini || true ; fi
-  - if [[ $(phpenv version-name) =~ 7.2 ]] ; then test -f $HOME/.cache/composer/phpstan-0.11.8.phar || wget https://github.com/phpstan/phpstan/releases/download/0.11.8/phpstan.phar -O $HOME/.cache/composer/phpstan-0.11.8.phar; fi
 
 matrix:
   allow_failures:
@@ -28,7 +28,8 @@ matrix:
 
 script:
   - php -derror_reporting="E_ALL & ~E_DEPRECATED" ./vendor/bin/phpunit -v --configuration phpunit.xml --coverage-text --coverage-clover=coverage.xml
-  - if [[ $(phpenv version-name) =~ 7.2 ]] ; then php $HOME/.cache/composer/phpstan-0.11.8.phar analyze -l 7 -c phpstan.neon ./src; fi
+  - if [[ $(phpenv version-name) =~ 7.3 ]] ; then make test-coverage; else make test; fi
+  - if [[ $(phpenv version-name) =~ 7.2 ]] ; then make lint; fi
 
 after_script:
   - if [[ $(phpenv version-name) =~ 7.3 ]] ; then bash <(curl -s https://codecov.io/bash); fi

Makefile

@@ -1,9 +1,11 @@
+PHPSTAN_VERSION ?= 0.11.15
+
 deps:
 	@git submodule init && git submodule update
 
 lint:
-	@test -f $$HOME/.cache/composer/phpstan-0.11.8.phar || wget https://github.com/phpstan/phpstan/releases/download/0.11.8/phpstan.phar -O $$HOME/.cache/composer/phpstan-0.11.8.phar
-	@php $$HOME/.cache/composer/phpstan-0.11.8.phar analyze -l 7 -c phpstan.neon ./src
+	@test -f ${HOME}/.cache/composer/phpstan-${PHPSTAN_VERSION}.phar || (mkdir -p ${HOME}/.cache/composer/ && wget https://github.com/phpstan/phpstan/releases/download/${PHPSTAN_VERSION}/phpstan.phar -O ${HOME}/.cache/composer/phpstan-${PHPSTAN_VERSION}.phar)
+	@php $$HOME/.cache/composer/phpstan-${PHPSTAN_VERSION}.phar analyze -l 7 -c phpstan.neon ./src
 
 docker-lint:
 	@docker run -v $$PWD:/app --rm phpstan/phpstan analyze -l 7 -c phpstan.neon ./src
@@ -12,4 +14,4 @@ test:
 	@php -derror_reporting="E_ALL & ~E_DEPRECATED" vendor/bin/phpunit
 
 test-coverage:
-	@php -derror_reporting="E_ALL & ~E_DEPRECATED" -dzend_extension=xdebug.so vendor/bin/phpunit --coverage-text
+	@php -derror_reporting="E_ALL & ~E_DEPRECATED" -dzend_extension=xdebug.so vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml

phpstan.neon

@@ -1,4 +1,5 @@
 parameters:
+	inferPrivatePropertyTypeFromConstructor: true
 	ignoreErrors:
 		- '#Access to an undefined property static\(Swaggest\\JsonSchema\\JsonSchema\)\|Swaggest\\JsonSchema\\Constraint\\Properties::#'
 		- '#Access to an undefined property .+Swaggest\\JsonSchema\\NameMirror::.+#'