Code cleanup and fixes.

LastDragon-ru · Jan 30, 2022 · 70b8d3f · 70b8d3f
1 parent b3edd76
commit 70b8d3f
Show file tree

Hide file tree

Showing 19 changed files with 34 additions and 34 deletions.
diff --git a/src/SchemaPrinter/Blocks/Ast/ListValueList.php b/src/SchemaPrinter/Blocks/Ast/ListValueList.php
@@ -2,6 +2,7 @@
 
 namespace LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Blocks\Ast;
 
+use LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Blocks\Block;
 use LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Blocks\BlockList;
 
 /**

diff --git a/src/SchemaPrinter/Blocks/Ast/ObjectValueList.php b/src/SchemaPrinter/Blocks/Ast/ObjectValueList.php
@@ -2,6 +2,7 @@
 
 namespace LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Blocks\Ast;
 
+use LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Blocks\Block;
 use LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Blocks\BlockList;
 
 /**

diff --git a/src/SchemaPrinter/Blocks/BlockList.php b/src/SchemaPrinter/Blocks/BlockList.php
@@ -208,8 +208,6 @@ protected function analyze(Block $block): Block {
 
  /**
  * @param TBlock $value
- *
- * @return mixed
  */
  protected function isValidBlock(Block $value): bool {
  return !$value->isEmpty();

diff --git a/src/SchemaPrinter/Blocks/BlockListTest.php b/src/SchemaPrinter/Blocks/BlockListTest.php
@@ -712,7 +712,7 @@ public function dataProviderToString(): array {
  */
 class BlockListTest__BlockList extends BlockList {
  public function __construct(
- Settings $settings,
+ PrinterSettings $settings,
  int $level,
  int $used,
  private bool $normalized,
@@ -813,8 +813,8 @@ protected function space(): string {
  */
 class BlockListTest__StatisticsBlock extends Block {
  /**
- * @param array<string,string> $types
- * @param array<string,string> $directives
+ * @param array<string> $types
+ * @param array<string> $directives
  *
  * @noinspection PhpMissingParentConstructorInspection
  */

diff --git a/src/SchemaPrinter/Blocks/BlockTest.php b/src/SchemaPrinter/Blocks/BlockTest.php
@@ -99,7 +99,7 @@ public function testIsEmpty(bool $expected, string $content): void {
  // <editor-fold desc="DataProviders">
  // =========================================================================
  /**
- * @return array<string, array{bool, PrinterSettings, string}>
+ * @return array<string, array{bool, Settings, string}>
  */
  public function dataProviderIsMultiline(): array {
  $settings = new TestSettings();

diff --git a/src/SchemaPrinter/Blocks/Types/DescriptionTest.php b/src/SchemaPrinter/Blocks/Types/DescriptionTest.php
@@ -50,7 +50,7 @@ public function testToString(
  // <editor-fold desc="DataProviders">
  // =========================================================================
  /**
- * @return array<string,array{string, \LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Contracts\Settings, int, int, ?string, array<DirectiveNode>|null}>
+ * @return array<string,array{string, Settings, int, int, ?string, array<DirectiveNode>|null}>
  */
  public function dataProviderToString(): array {
  $settings = (new TestSettings())

diff --git a/src/SchemaPrinter/Blocks/Types/EnumTypeDefinitionBlockTest.php b/src/SchemaPrinter/Blocks/Types/EnumTypeDefinitionBlockTest.php
@@ -49,7 +49,7 @@ public function testToString(
  // <editor-fold desc="DataProviders">
  // =========================================================================
  /**
- * @return array<string,array{string, \LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Contracts\Settings, int, int, Closure():EnumType|EnumType}>
+ * @return array<string,array{string, Settings, int, int, Closure():EnumType|EnumType}>
  */
  public function dataProviderToString(): array {
  $settings = (new TestSettings())

diff --git a/src/SchemaPrinter/Blocks/Types/FieldDefinitionBlockTest.php b/src/SchemaPrinter/Blocks/Types/FieldDefinitionBlockTest.php
@@ -67,7 +67,7 @@ public function testStatistics(): void {
  // <editor-fold desc="DataProviders">
  // =========================================================================
  /**
- * @return array<string,array{string, \LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Contracts\Settings, int, int, FieldDefinition}>
+ * @return array<string,array{string, Settings, int, int, FieldDefinition}>
  */
  public function dataProviderToString(): array {
  $settings = (new TestSettings())

diff --git a/src/SchemaPrinter/Blocks/Types/InputValueDefinitionBlockTest.php b/src/SchemaPrinter/Blocks/Types/InputValueDefinitionBlockTest.php
@@ -67,7 +67,7 @@ public function testStatistics(): void {
  // <editor-fold desc="DataProviders">
  // =========================================================================
  /**
- * @return array<string,array{string, \LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Contracts\Settings, int, int, FieldArgument}>
+ * @return array<string,array{string, Settings, int, int, FieldArgument}>
  */
  public function dataProviderToString(): array {
  $settings = new TestSettings();

diff --git a/src/SchemaPrinter/Blocks/Types/InterfaceTypeDefinitionBlockTest.php b/src/SchemaPrinter/Blocks/Types/InterfaceTypeDefinitionBlockTest.php
@@ -82,7 +82,7 @@ public function testStatistics(): void {
  // <editor-fold desc="DataProviders">
  // =========================================================================
  /**
- * @return array<string,array{string, \LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Contracts\Settings, int, int, InterfaceType}>
+ * @return array<string,array{string, Settings, int, int, InterfaceType}>
  */
  public function dataProviderToString(): array {
  $settings = (new TestSettings())

diff --git a/src/SchemaPrinter/Blocks/Types/SchemaDefinitionBlockTest.php b/src/SchemaPrinter/Blocks/Types/SchemaDefinitionBlockTest.php
@@ -47,7 +47,7 @@ public function testToString(
  // <editor-fold desc="DataProviders">
  // =========================================================================
  /**
- * @return array<string,array{string, \LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Contracts\Settings, int, int, Schema}>
+ * @return array<string,array{string, Settings, int, int, Schema}>
  */
  public function dataProviderToString(): array {
  $settings = (new TestSettings())

diff --git a/src/SchemaPrinter/Blocks/Types/StringBlockTest.php b/src/SchemaPrinter/Blocks/Types/StringBlockTest.php
@@ -44,7 +44,7 @@ public function testToString(
  // <editor-fold desc="DataProviders">
  // =========================================================================
  /**
- * @return array<string,array{string, \LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Contracts\Settings, int, int, string}>
+ * @return array<string,array{string, Settings, int, int, string}>
  */
  public function dataProviderToString(): array {
  $settings = new TestSettings();

diff --git a/src/SchemaPrinter/Blocks/Types/TypeBlockTest.php b/src/SchemaPrinter/Blocks/Types/TypeBlockTest.php
@@ -60,7 +60,7 @@ public function testStatistics(): void {
  // <editor-fold desc="DataProviders">
  // =========================================================================
  /**
- * @return array<string,array{string, \LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Contracts\Settings, int, int, Type}>
+ * @return array<string,array{string, Settings, int, int, Type}>
  */
  public function dataProviderToString(): array {
  $settings = new TestSettings();

diff --git a/src/SchemaPrinter/Blocks/Types/UnionTypeDefinitionBlockTest.php b/src/SchemaPrinter/Blocks/Types/UnionTypeDefinitionBlockTest.php
@@ -68,7 +68,7 @@ public function testStatistics(): void {
  // <editor-fold desc="DataProviders">
  // =========================================================================
  /**
- * @return array<string,array{string, \LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Contracts\Settings, int, int, UnionType}>
+ * @return array<string,array{string, Settings, int, int, UnionType}>
  */
  public function dataProviderToString(): array {
  $settings = (new TestSettings())

diff --git a/src/SchemaPrinter/IntrospectionPrinterTest.php b/src/SchemaPrinter/IntrospectionPrinterTest.php
@@ -37,7 +37,7 @@ public function testPrint(string $expected, Settings $settings, int $level): voi
  */
  public function dataProviderPrint(): array {
  return [
- GraphQLSettings::class => [
+ GraphQLSettings::class  => [
  '~graphql-settings.graphql',
  new GraphQLSettings(),
  0,

diff --git a/src/SchemaPrinter/Misc/DirectiveResolver.php b/src/SchemaPrinter/Misc/DirectiveResolver.php
@@ -30,7 +30,7 @@ class DirectiveResolver {
  protected array $directives;
 
  /**
- * @param array<string,GraphQLDirective> $directives
+ * @param array<GraphQLDirective> $directives
  */
  public function __construct(
  protected DirectiveLocator $locator,
@@ -68,8 +68,8 @@ public function getDefinitions(): array {
  $directives = $this->directives;
 
  foreach ($this->locator->definitions() as $definition) {
- $directive  = $this->factory->handle($definition);
- $directives[$directives->name] = $directive;
+ $directive = $this->factory->handle($definition);
+ $directives[$directive->name] = $directive;
  }
 
  return $directives;

diff --git a/src/SchemaPrinter/PrintedSchema.php b/src/SchemaPrinter/PrintedSchema.php
@@ -6,8 +6,6 @@
 use LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Contracts\Statistics;
 use Stringable;
 
-use function array_values;
-
 class PrintedSchema implements Statistics, Stringable {
  public function __construct(
  protected Block $schema,
@@ -20,16 +18,16 @@ public function __toString(): string {
  }
 
  /**
- * @return array<string>
+ * @inheritDoc
  */
  public function getUsedTypes(): array {
- return array_values($this->schema->getUsedTypes());
+ return $this->schema->getUsedTypes();
  }
 
  /**
- * @return array<string>
+ * @inheritDoc
  */
  public function getUsedDirectives(): array {
- return array_values($this->schema->getUsedDirectives());
+ return $this->schema->getUsedDirectives();
  }
 }
diff --git a/src/SchemaPrinter/Printer.php b/src/SchemaPrinter/Printer.php
@@ -167,7 +167,7 @@ protected function getUsedDefinitions(PrinterSettings $settings, Schema $schema,
  } else {
  $type = $schema->getType($name);
 
- if ($this->isType($type)) {
+ if ($type && $this->isType($type)) {
  $block = $this->getDefinitionBlock($settings, $type);
  $types[$name] = $block;
  }
@@ -198,11 +198,11 @@ protected function getDefinitionBlock(
  return new DefinitionBlock($settings, $this->getLevel(), $definition);
  }
 
- private function isType(Type $type): bool {
- return !Type::isBuiltInType($type);
+ private function isType(?Type $type): bool {
+ return $type && !Type::isBuiltInType($type);
  }
 
- private function isDirective(Directive $directive): bool {
- return !Directive::isSpecifiedDirective($directive);
+ private function isDirective(?Directive $directive): bool {
+ return $directive && !Directive::isSpecifiedDirective($directive);
  }
 }
diff --git a/src/SchemaPrinter/PrinterTest.php b/src/SchemaPrinter/PrinterTest.php
@@ -20,6 +20,8 @@
 use Nuwave\Lighthouse\Schema\Directives\BaseDirective;
 use Nuwave\Lighthouse\Schema\TypeRegistry;
 
+use function array_values;
+
 /**
  * @internal
  * @coversDefaultClass \LastDragon_ru\LaraASP\GraphQL\SchemaPrinter\Printer
@@ -32,7 +34,7 @@ class PrinterTest extends TestCase {
  *
  * @dataProvider dataProviderPrint
  *
- * @param array{schema: string, types: array<string>, directives: array<string>}
+ * @param array{schema: string, types: array<string>, directives: array<string>} $expected
  */
  public function testPrint(array $expected, ?Settings $settings, int $level): void {
  // Types
@@ -115,15 +117,15 @@ public static function definition(): string {
  $actual = $printer->print($schema);
 
  self::assertEquals($output, (string) $actual);
- self::assertEqualsCanonicalizing($expected['types'], $actual->getUsedTypes());
- self::assertEqualsCanonicalizing($expected['directives'], $actual->getUsedDirectives());
+ self::assertEqualsCanonicalizing($expected['types'], array_values($actual->getUsedTypes()));
+ self::assertEqualsCanonicalizing($expected['directives'], array_values($actual->getUsedDirectives()));
  }
  // </editor-fold>
 
  // <editor-fold desc="DataProviders">
  // =========================================================================
  /**
- * @return array<string, array{string, Settings, int}>
+ * @return array<string, array<mixed>>
  */
  public function dataProviderPrint(): array {
  return [