From d8f41e854f97b8e8b82763f7ced1111603db61da Mon Sep 17 00:00:00 2001 From: Jeremiah VALERIE Date: Tue, 28 Aug 2018 11:28:57 +0200 Subject: [PATCH] Add static analysis tool --- .gitignore | 2 ++ .travis.yml | 21 +++++++++---------- composer.json | 8 +++++-- src/Executor/Promise/Promise.php | 1 + src/Language/Visitor.php | 1 + src/Server/StandardServer.php | 2 +- src/Validator/Rules/KnownDirectives.php | 6 +++++- .../Rules/VariablesDefaultValueAllowed.php | 4 ++-- 8 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 6586246..9846927 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ composer.phar composer.lock phpcs.xml vendor/ +bin/ +phpstan.phar diff --git a/.travis.yml b/.travis.yml index b12d6c4..422a238 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,6 @@ php: - 7.2 - nightly -matrix: - allow_failures: - - php: nightly - cache: directories: - $HOME/.composer/cache @@ -18,12 +14,9 @@ before_install: - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available" - travis_retry composer self-update -install: - - composer require react/promise:2.* - - composer require psr/http-message:1.* - - travis_retry composer update --prefer-dist +install: composer install --dev --prefer-dist -script: ./vendor/bin/phpunit --group default,ReactPromise +script: bin/phpunit --group default,ReactPromise jobs: allow_failures: @@ -41,13 +34,19 @@ jobs: - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,} - if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for coverage"; exit 1; fi script: - - ./vendor/bin/phpunit --coverage-clover clover.xml + - bin/phpunit --coverage-clover clover.xml after_script: - wget https://scrutinizer-ci.com/ocular.phar - php ocular.phar code-coverage:upload --format=php-clover clover.xml - - stage: Coding standard + - stage: Code Quality php: 7.1 install: travis_retry composer install --prefer-dist script: - ./vendor/bin/phpcs + + - stage: Code Quality + php: 7.2 + env: STATIC_ANALYSIS + install: travis_retry composer install --prefer-dist + script: composer static-analysis diff --git a/composer.json b/composer.json index d0a9d34..b36b258 100644 --- a/composer.json +++ b/composer.json @@ -16,9 +16,12 @@ "require-dev": { "doctrine/coding-standard": "^4.0", "phpunit/phpunit": "^7.2", - "psr/http-message": "^1.0" + "phpstan/phpstan-shim": "^0.10", + "psr/http-message": "^1.0", + "react/promise": "2.*" }, "config": { + "bin-dir": "bin", "preferred-install": "dist", "sort-packages": true }, @@ -39,6 +42,7 @@ "psr/http-message": "To use standard GraphQL server" }, "scripts": { - "lint" : "phpcs" + "lint" : "phpcs", + "static-analysis": "@php bin/phpstan.phar analyse --ansi -l 1 -c phpstan.neon src" } } diff --git a/src/Executor/Promise/Promise.php b/src/Executor/Promise/Promise.php index 8079663..2f060e1 100644 --- a/src/Executor/Promise/Promise.php +++ b/src/Executor/Promise/Promise.php @@ -6,6 +6,7 @@ namespace GraphQL\Executor\Promise; use GraphQL\Executor\Promise\Adapter\SyncPromise; use GraphQL\Utils\Utils; +use React\Promise\Promise as ReactPromise; /** * Convenience wrapper for promises represented by Promise Adapter diff --git a/src/Language/Visitor.php b/src/Language/Visitor.php index e266f0f..bab8079 100644 --- a/src/Language/Visitor.php +++ b/src/Language/Visitor.php @@ -264,6 +264,7 @@ class Visitor if ($visitFn) { $result = call_user_func($visitFn, $node, $key, $parent, $path, $ancestors); + $editValue = null; if ($result !== null) { if ($result instanceof VisitorOperation) { diff --git a/src/Server/StandardServer.php b/src/Server/StandardServer.php index c631a83..92a8f3d 100644 --- a/src/Server/StandardServer.php +++ b/src/Server/StandardServer.php @@ -8,7 +8,7 @@ use GraphQL\Error\FormattedError; use GraphQL\Error\InvariantViolation; use GraphQL\Executor\ExecutionResult; use GraphQL\Executor\Promise\Promise; -use GraphQL\Utils; +use GraphQL\Utils\Utils; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\StreamInterface; diff --git a/src/Validator/Rules/KnownDirectives.php b/src/Validator/Rules/KnownDirectives.php index ecccafd..a1b9fe5 100644 --- a/src/Validator/Rules/KnownDirectives.php +++ b/src/Validator/Rules/KnownDirectives.php @@ -7,7 +7,9 @@ namespace GraphQL\Validator\Rules; use GraphQL\Error\Error; use GraphQL\Language\AST\DirectiveNode; use GraphQL\Language\AST\InputObjectTypeDefinitionNode; +use GraphQL\Language\AST\Node; use GraphQL\Language\AST\NodeKind; +use GraphQL\Language\AST\NodeList; use GraphQL\Language\DirectiveLocation; use GraphQL\Validator\ValidationContext; use function count; @@ -59,7 +61,9 @@ class KnownDirectives extends ValidationRule } /** - * @param (Node|NodeList)[] $ancestors + * @param Node[]|NodeList[] $ancestors + * + * @return string */ private function getDirectiveLocationForASTPath(array $ancestors) { diff --git a/src/Validator/Rules/VariablesDefaultValueAllowed.php b/src/Validator/Rules/VariablesDefaultValueAllowed.php index 64808fc..4f2b5cf 100644 --- a/src/Validator/Rules/VariablesDefaultValueAllowed.php +++ b/src/Validator/Rules/VariablesDefaultValueAllowed.php @@ -44,10 +44,10 @@ class VariablesDefaultValueAllowed extends ValidationRule return Visitor::skipNode(); }, - NodeKind::SELECTION_SET => function (SelectionSetNode $node) use ($context) { + NodeKind::SELECTION_SET => function (SelectionSetNode $node) { return Visitor::skipNode(); }, - NodeKind::FRAGMENT_DEFINITION => function (FragmentDefinitionNode $node) use ($context) { + NodeKind::FRAGMENT_DEFINITION => function (FragmentDefinitionNode $node) { return Visitor::skipNode(); }, ];