Simplify unnecessary continue constructs (#1054)

webonyx · Jan 24, 2022 · 6b8286d · 6b8286d
1 parent 9faf59a
commit 6b8286d
Show file tree

Hide file tree

Showing 33 changed files with 296 additions and 454 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -88,6 +88,7 @@ You can find and compare releases at the [GitHub release page](https://github.co
 - Remove deprecated public property access to `FieldDefinition::$type`
 - Remove alias `GraphQL\Validator\Rules\AbstractQuerySecurity`, use `GraphQL\Validator\Rules\QuerySecurityRule`
 - Remove alias `GraphQL\Validator\Rules\AbstractValidationRule`, use `GraphQL\Validator\Rules\ValidationRule`
+- Remove alias `GraphQL\Utils\FindBreakingChanges`, use `GraphQL\Utils\BreakingChangesFinder`
 - Remove `OperationParams` method `getOriginalInput()` in favor of public property `$originalInput`
 - Remove `OperationParams` method `isReadOnly()` in favor of public property `$readOnly`
 - Remove `Utils::withErrorHandling()`

diff --git a/benchmarks/Utils/QueryGenerator.php b/benchmarks/Utils/QueryGenerator.php
@@ -35,11 +35,9 @@ public function __construct(Schema $schema, float $percentOfLeafFields)
 
         $totalFields = 0;
         foreach ($schema->getTypeMap() as $type) {
-            if (! ($type instanceof ObjectType)) {
-                continue;
+            if ($type instanceof ObjectType) {
+                $totalFields += count($type->getFieldNames());
             }
-
-            $totalFields += count($type->getFieldNames());
         }
 
         $this->maxLeafFields = max(1, (int) round($totalFields * $percentOfLeafFields));

diff --git a/generate-class-reference.php b/generate-class-reference.php
@@ -86,11 +86,9 @@ function renderClass(ReflectionClass $class, array $options): string
     if ($options['props'] ?? true) {
         $props = [];
         foreach ($class->getProperties(ReflectionProperty::IS_PUBLIC) as $property) {
-            if (! isApi($property)) {
-                continue;
+            if (isApi($property)) {
+                $props[] = renderProp($property);
             }
-
-            $props[] = renderProp($property);
         }
 
         if (count($props) > 0) {
@@ -102,11 +100,9 @@ function renderClass(ReflectionClass $class, array $options): string
     if ($options['methods'] ?? true) {
         $methods = [];
         foreach ($class->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
-            if (! isApi($method)) {
-                continue;
+            if (isApi($method)) {
+                $methods[] = renderMethod($method);
             }
-
-            $methods[] = renderMethod($method);
         }
 
         if (count($methods) > 0) {

diff --git a/src/Error/Error.php b/src/Error/Error.php
@@ -206,12 +206,9 @@ public function getPositions(): array
 
             if (isset($this->nodes)) {
                 foreach ($this->nodes as $node) {
-                    $start = $node->loc->start ?? null;
-                    if (null === $start) {
-                        continue;
+                    if (isset($node->loc->start)) {
+                        $this->positions[] = $node->loc->start;
                     }
-
-                    $this->positions[] = $start;
                 }
             }
         }
@@ -248,11 +245,9 @@ public function getLocations(): array
                 }
             } elseif (null !== $nodes && 0 !== count($nodes)) {
                 foreach ($nodes as $node) {
-                    if (! isset($node->loc->source)) {
-                        continue;
+                    if (isset($node->loc->source)) {
+                        $this->locations[] = $node->loc->source->getLocation($node->loc->start);
                     }
-
-                    $this->locations[] = $node->loc->source->getLocation($node->loc->start);
                 }
             }
         }

diff --git a/src/Error/FormattedError.php b/src/Error/FormattedError.php
@@ -62,16 +62,14 @@ public static function printError(Error $error): string
         $nodes = $error->nodes;
         if (isset($nodes) && count($nodes) > 0) {
             foreach ($nodes as $node) {
-                if (! isset($node->loc->source)) {
-                    continue;
+                if (isset($node->loc->source)) {
+                    $location = $node->loc;
+                    $source = $location->source;
+                    $printedLocations[] = self::highlightSourceAtLocation(
+                        $source,
+                        $source->getLocation($location->start)
+                    );
                 }
-
-                $location = $node->loc;
-                $source = $location->source;
-                $printedLocations[] = self::highlightSourceAtLocation(
-                    $source,
-                    $source->getLocation($location->start)
-                );
             }
         } elseif (null !== $error->getSource() && 0 !== count($error->getLocations())) {
             $source = $error->getSource();

diff --git a/src/Executor/Promise/Adapter/ReactPromiseAdapter.php b/src/Executor/Promise/Adapter/ReactPromiseAdapter.php
@@ -57,11 +57,9 @@ public function all(array $promisesOrValues): Promise
         // TODO: rework with generators when PHP minimum required version is changed to 5.5+
 
         foreach ($promisesOrValues as &$promiseOrValue) {
-            if (! ($promiseOrValue instanceof Promise)) {
-                continue;
+            if ($promiseOrValue instanceof Promise) {
+                $promiseOrValue = $promiseOrValue->adoptedPromise;
             }
-
-            $promiseOrValue = $promiseOrValue->adoptedPromise;
         }
 
         $promise = all($promisesOrValues)->then(static function ($values) use ($promisesOrValues): array {

diff --git a/src/Executor/ReferenceExecutor.php b/src/Executor/ReferenceExecutor.php
@@ -1253,16 +1253,14 @@ protected function collectSubFields(ObjectType $returnType, ArrayObject $fieldNo
             $subFieldNodes = new ArrayObject();
             $visitedFragmentNames = new ArrayObject();
             foreach ($fieldNodes as $fieldNode) {
-                if (! isset($fieldNode->selectionSet)) {
-                    continue;
+                if (isset($fieldNode->selectionSet)) {
+                    $subFieldNodes = $this->collectFields(
+                        $returnType,
+                        $fieldNode->selectionSet,
+                        $subFieldNodes,
+                        $visitedFragmentNames
+                    );
                 }
-
-                $subFieldNodes = $this->collectFields(
-                    $returnType,
-                    $fieldNode->selectionSet,
-                    $subFieldNodes,
-                    $visitedFragmentNames
-                );
             }
 
             $returnTypeCache[$fieldNodes] = $subFieldNodes;

diff --git a/src/GraphQL.php b/src/GraphQL.php
@@ -134,11 +134,9 @@ public static function promiseToExecute(
                 $queryComplexity->setRawVariableValues($variableValues);
             } else {
                 foreach ($validationRules as $rule) {
-                    if (! ($rule instanceof QueryComplexity)) {
-                        continue;
+                    if ($rule instanceof QueryComplexity) {
+                        $rule->setRawVariableValues($variableValues);
                     }
-
-                    $rule->setRawVariableValues($variableValues);
                 }
             }
 

diff --git a/src/Server/OperationParams.php b/src/Server/OperationParams.php
@@ -109,11 +109,9 @@ public static function create(array $params, bool $readonly = false): OperationP
         ];
 
         foreach ($params as &$value) {
-            if ('' !== $value) {
-                continue;
+            if ('' === $value) {
+                $value = null;
             }
-
-            $value = null;
         }
 
         $instance->query = $params['query'];

diff --git a/src/Type/Definition/ResolveInfo.php b/src/Type/Definition/ResolveInfo.php
@@ -185,14 +185,12 @@ public function getFieldSelection(int $depth = 0): array
         $fields = [];
 
         foreach ($this->fieldNodes as $fieldNode) {
-            if (null === $fieldNode->selectionSet) {
-                continue;
+            if (isset($fieldNode->selectionSet)) {
+                $fields = array_merge_recursive(
+                    $fields,
+                    $this->foldSelectionSet($fieldNode->selectionSet, $depth)
+                );
             }
-
-            $fields = array_merge_recursive(
-                $fields,
-                $this->foldSelectionSet($fieldNode->selectionSet, $depth)
-            );
         }
 
         return $fields;

diff --git a/src/Type/Schema.php b/src/Type/Schema.php
@@ -23,7 +23,6 @@
 use function is_array;
 use function is_callable;
 use function is_iterable;
-use function sprintf;
 
 /**
  * Schema Definition (see [schema definition docs](schema-definition.md)).
@@ -197,11 +196,9 @@ private function collectAllTypes(): array
 
         foreach ($this->getDirectives() as $directive) {
             // @phpstan-ignore-next-line generics are not strictly enforceable, error will be caught during schema validation
-            if (! $directive instanceof Directive) {
-                continue;
+            if ($directive instanceof Directive) {
+                TypeInfo::extractTypesFromDirectives($directive, $typeMap);
             }
-
-            TypeInfo::extractTypesFromDirectives($directive, $typeMap);
         }
 
         // When types are set as array they are resolved in constructor
@@ -531,17 +528,12 @@ public function assertValid(): void
             $type->assertValid();
 
             // Make sure type loader returns the same instance as registered in other places of schema
-            if (null === $this->config->typeLoader) {
-                continue;
+            if (isset($this->config->typeLoader)) {
+                Utils::invariant(
+                    $this->loadType($name) === $type,
+                    "Type loader returns different instance for {$name} than field/argument definitions. Make sure you always return the same instance for the same type name."
+                );
             }
-
-            Utils::invariant(
-                $this->loadType($name) === $type,
-                sprintf(
-                    'Type loader returns different instance for %s than field/argument definitions. Make sure you always return the same instance for the same type name.',
-                    $name
-                )
-            );
         }
     }