Fix switch...continue for php 7.3

This commit is contained in:
Vitaliy Chesnokov 2019-07-19 18:57:49 +03:00
parent f438a726cd
commit a6cc13314d
No known key found for this signature in database
GPG Key ID: AC6BB820C988C8AB
2 changed files with 6 additions and 6 deletions

View File

@ -529,7 +529,7 @@ class Executor
switch ($selection->kind) {
case NodeKind::FIELD:
if (!$this->shouldIncludeNode($selection)) {
continue;
continue 2;
}
$name = self::getFieldEntryKey($selection);
if (!isset($fields[$name])) {
@ -541,7 +541,7 @@ class Executor
if (!$this->shouldIncludeNode($selection) ||
!$this->doesFragmentConditionMatch($selection, $runtimeType)
) {
continue;
continue 2;
}
$this->collectFields(
$runtimeType,
@ -553,14 +553,14 @@ class Executor
case NodeKind::FRAGMENT_SPREAD:
$fragName = $selection->name->value;
if (!empty($visitedFragmentNames[$fragName]) || !$this->shouldIncludeNode($selection)) {
continue;
continue 2;
}
$visitedFragmentNames[$fragName] = true;
/** @var FragmentDefinitionNode|null $fragment */
$fragment = isset($exeContext->fragments[$fragName]) ? $exeContext->fragments[$fragName] : null;
if (!$fragment || !$this->doesFragmentConditionMatch($fragment, $runtimeType)) {
continue;
continue 2;
}
$this->collectFields(
$runtimeType,

View File

@ -352,12 +352,12 @@ class OverlappingFieldsCanBeMerged extends AbstractValidationRule
/** @var FragmentSpreadNode $selection */
$fragName = $selection->name->value;
if (!empty($_visitedFragmentNames[$fragName])) {
continue;
continue 2;
}
$_visitedFragmentNames[$fragName] = true;
$fragment = $context->getFragment($fragName);
if (!$fragment) {
continue;
continue 2;
}
$fragmentType = TypeInfo::typeFromAST($context->getSchema(), $fragment->typeCondition);
$_astAndDefs = $this->collectFieldNodesAndDefs(