From f40cedc62d75e124bcf99c3e1de5edea2a8bbe10 Mon Sep 17 00:00:00 2001 From: Jay Klehr Date: Fri, 22 Feb 2019 12:32:46 -0700 Subject: [PATCH] bumping travis php versions, composer deps --- .travis.yml | 6 ++---- composer.json | 7 +++---- grumphp.yml.dist | 1 - phpstan.neon | 3 +++ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 609911e..7540d49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,16 +18,14 @@ stages: jobs: fast_finish: true - allow_failures: - - php: nightly include: - stage: style check - php: 7.1 + php: 7.2 env: TMPDIR=/tmp USE_XDEBUG=false script: - composer style-check - stage: phpstan analysis - php: 7.1 + php: 7.2 env: TMPDIR=/tmp USE_XDEBUG=false script: - composer phpstan \ No newline at end of file diff --git a/composer.json b/composer.json index 8d06465..855a6e3 100644 --- a/composer.json +++ b/composer.json @@ -21,14 +21,13 @@ } }, "require-dev": { - "phpunit/phpunit": "^6.0", - "phpstan/phpstan": "^0.9.2", + "phpstan/phpstan": "^0.11.2", "friendsofphp/php-cs-fixer": "^2.11", - "maglnet/composer-require-checker": "^0.1.6 | ^0.2.1", + "maglnet/composer-require-checker": "^1.1.0", "phpro/grumphp": "^0.14.0" }, "scripts": { - "phpstan": "phpstan analyze -l7 -c phpstan.neon --no-progress ./ --ansi", + "phpstan": "phpstan analyze -c phpstan.neon --no-progress --ansi", "style-check": "php-cs-fixer fix --dry-run -vv" } } diff --git a/grumphp.yml.dist b/grumphp.yml.dist index e02cf91..40ec6b4 100644 --- a/grumphp.yml.dist +++ b/grumphp.yml.dist @@ -8,5 +8,4 @@ parameters: allow_risky: true config: .php_cs phpstan: - level: 7 configuration: phpstan.neon diff --git a/phpstan.neon b/phpstan.neon index 4184f13..88a9024 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,4 +1,7 @@ parameters: + level: 7 + paths: + - ./ excludes_analyse: - %rootDir%/../../../vendor/* ignoreErrors: