RetailCRM-Mirror/graphql-php
1
0
Fork 0
mirror of https://github.com/retailcrm/graphql-php.git synced 2024-11-24 22:06:04 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #375 from simPod/fix-build

Browse Source 
Fixing build
This commit is contained in:
Vladimir Razuvaev 2018-10-25 13:29:41 +02:00 committed by GitHub
commit 2bddfe2225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@ -16,9 +16,9 @@
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^5.0", "doctrine/coding-standard": "^5.0",
"phpbench/phpbench": "^0.14.0", "phpbench/phpbench": "^0.14.0",
"phpstan/phpstan": "^0.10.3", "phpstan/phpstan": "0.10.5",
"phpstan/phpstan-phpunit": "^0.10.0", "phpstan/phpstan-phpunit": "0.10.0",
"phpstan/phpstan-strict-rules": "^0.10.1", "phpstan/phpstan-strict-rules": "0.10.1",
"phpunit/phpunit": "^7.2", "phpunit/phpunit": "^7.2",
"psr/http-message": "^1.0", "psr/http-message": "^1.0",
"react/promise": "2.*" "react/promise": "2.*"

4
phpcs.xml.dist
View File

@ -13,10 +13,12 @@
<file>tests</file> <file>tests</file>
<rule ref="Doctrine"> <rule ref="Doctrine">
<!--Disable PHP7+ features that might cause BC breaks for now --> <!-- Disable PHP7+ features that might cause BC breaks for now -->
<exclude name="SlevomatCodingStandard.Classes.ClassConstantVisibility.MissingConstantVisibility" /> <exclude name="SlevomatCodingStandard.Classes.ClassConstantVisibility.MissingConstantVisibility" />
<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint" /> <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint" />
<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint" /> <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint" />
<!-- Enable when Slevomat starts supporting variadics, see https://github.com/slevomat/coding-standard/issues/251 -->
<exclude name="SlevomatCodingStandard.Namespaces.UnusedUses.UnusedUse" />
</rule> </rule>
<!--@api annotation is required for now --> <!--@api annotation is required for now -->

8
src/Executor/Promise/Adapter/SyncPromise.php
View File

@ -123,7 +123,7 @@ class SyncPromise
if ($this->state === self::FULFILLED) { if ($this->state === self::FULFILLED) {
try { try {
$promise->resolve($onFulfilled ? $onFulfilled($this->result) : $this->result); $promise->resolve($onFulfilled === null ? $this->result : $onFulfilled($this->result));
} catch (Exception $e) { } catch (Exception $e) {
$promise->reject($e); $promise->reject($e);
} catch (Throwable $e) { } catch (Throwable $e) {
@ -131,10 +131,10 @@ class SyncPromise
} }
} elseif ($this->state === self::REJECTED) { } elseif ($this->state === self::REJECTED) {
try { try {
if ($onRejected) { if ($onRejected === null) {
$promise->resolve($onRejected($this->result));
} else {
$promise->reject($this->result); $promise->reject($this->result);
} else {
$promise->resolve($onRejected($this->result));
} }
} catch (Exception $e) { } catch (Exception $e) {
$promise->reject($e); $promise->reject($e);

2
src/Type/Definition/EnumType.php
View File

@ -188,7 +188,7 @@ class EnumType extends Type implements InputType, OutputType, LeafType, NamedTyp
$lookup = $this->getNameLookup(); $lookup = $this->getNameLookup();
if (isset($lookup[$valueNode->value])) { if (isset($lookup[$valueNode->value])) {
$enumValue = $lookup[$valueNode->value]; $enumValue = $lookup[$valueNode->value];
if ($enumValue) { if ($enumValue !== null) {
return $enumValue->value; return $enumValue->value;
} }
} }

1
src/Utils/TypeInfo.php
View File

@ -22,6 +22,7 @@ use GraphQL\Type\Definition\InputType;
use GraphQL\Type\Definition\InterfaceType; use GraphQL\Type\Definition\InterfaceType;
use GraphQL\Type\Definition\ListOfType; use GraphQL\Type\Definition\ListOfType;
use GraphQL\Type\Definition\ObjectType; use GraphQL\Type\Definition\ObjectType;
use GraphQL\Type\Definition\OutputType;
use GraphQL\Type\Definition\Type; use GraphQL\Type\Definition\Type;
use GraphQL\Type\Definition\UnionType; use GraphQL\Type\Definition\UnionType;
use GraphQL\Type\Definition\WrappingType; use GraphQL\Type\Definition\WrappingType;

4
src/Validator/Rules/OverlappingFieldsCanBeMerged.php
View File

@ -366,8 +366,8 @@ class OverlappingFieldsCanBeMerged extends ValidationRule
); );
// The return type for each field. // The return type for each field.
$type1 = $def1 ? $def1->getType() : null; $type1 = $def1 === null ? null : $def1->getType();
$type2 = $def2 ? $def2->getType() : null; $type2 = $def2 === null ? null : $def2->getType();
if (! $areMutuallyExclusive) { if (! $areMutuallyExclusive) {
// Two aliases must refer to the same field. // Two aliases must refer to the same field.