upgrading to lighthouse v5.1

Corollarium · Jan 26, 2021 · fe3e3c5 · fe3e3c5
1 parent 1cea6ea
commit fe3e3c5
Show file tree

Hide file tree

Showing 72 changed files with 675 additions and 1,367 deletions.
diff --git a/Modelarium/BaseGenerator.php b/Modelarium/BaseGenerator.php
@@ -106,7 +106,7 @@ public function getDirectiveClass(
     /**
      * Process all directives from list with directive classes.
      *
-     * @param \GraphQL\Language\AST\NodeList $directives The directive list
+     * @param \GraphQL\Language\AST\NodeList<\GraphQL\Language\AST\DirectiveNode> $directives
      * @param string $generatorType The generatorType, like 'Seed' or 'Model'
      * @return void
      * @throws SkipGenerationException
@@ -134,7 +134,7 @@ protected function processTypeDirectives(
      * Process all directives from list with directive classes.
      *
      * @param \GraphQL\Type\Definition\FieldDefinition $field
-     * @param \GraphQL\Language\AST\NodeList $directives The directive list
+     * @param \GraphQL\Language\AST\NodeList<\GraphQL\Language\AST\DirectiveNode> $directives
      * @param string $generatorType The generatorType, like 'Seed' or 'Model'
      * @return void
      * @throws SkipGenerationException

diff --git a/Modelarium/FormulariumUtils.php b/Modelarium/FormulariumUtils.php
@@ -19,6 +19,14 @@
 
 class FormulariumUtils
 {
+    /**
+     * Undocumented function
+     *
+     * @param string $fieldName
+     * @param string $datatypeName
+     * @param NodeList<DirectiveNode> $directives
+     * @return Field
+     */
     public static function getFieldFromDirectives(
         string $fieldName,
         string $datatypeName,

diff --git a/Modelarium/Frontend/FrontendGenerator.php b/Modelarium/Frontend/FrontendGenerator.php
@@ -314,7 +314,7 @@ protected function getFilters(): array
                     if ($type instanceof ListOfType) {
                         $isArray = true;
                         $type = $type->getWrappedType();
-                        if ($type instanceof NonNull) { /** @phpstan-ignore-line */
+                        if ($type instanceof NonNull) {
                             // TODO phpstan $isInternalRequired = true;
                             $isInternalRequiredString = '!';
                             $type = $type->getWrappedType();

diff --git a/Modelarium/Laravel/Directives/BelongsToDirective.php b/Modelarium/Laravel/Directives/BelongsToDirective.php
@@ -44,7 +44,7 @@ public static function processMigrationRelationshipDirective(
         $lowerName = mb_strtolower($generator->getInflector()->singularize($field->name));
         $fieldName = $lowerName . '_id';
 
-        list($type, $isRequired) = Parser::getUnwrappedType($field->type);
+        list($type, $isRequired) = Parser::getUnwrappedType($field->getType());
         $typeName = $type->name;
         $tableName = MigrationGenerator::toTableName($typeName);
 

diff --git a/Modelarium/Laravel/Directives/CanDirective.php b/Modelarium/Laravel/Directives/CanDirective.php
@@ -25,7 +25,7 @@ public static function processPolicyFieldDirective(
         $injected = false;
         $args = false;
 
-        list($type, $isRequired) = Parser::getUnwrappedType($field->type);
+        list($type, $isRequired) = Parser::getUnwrappedType($field->getType());
 
         /**
          * @var DirectiveNode $directive
@@ -36,7 +36,7 @@ public static function processPolicyFieldDirective(
             switch ($arg->name->value) {
                 case 'ability':
                     // @phpstan-ignore-next-line
-                    $ability = $arg->value->value;
+                    $ability = (string)$arg->value->value;
                 break;
                 case 'find':
                     // @phpstan-ignore-next-line

diff --git a/Modelarium/Laravel/Directives/HasManyDirective.php b/Modelarium/Laravel/Directives/HasManyDirective.php
@@ -35,7 +35,7 @@ public static function processModelRelationshipDirective(
         \GraphQL\Language\AST\DirectiveNode $directive,
         \Formularium\Datatype $datatype = null
     ): ?\Formularium\Datatype {
-        list($type, $isRequired) = Parser::getUnwrappedType($field->type);
+        list($type, $isRequired) = Parser::getUnwrappedType($field->getType());
 
         $sourceTypeName = $generator->getLowerName();
         $targetTypeName = $type->name;

diff --git a/Modelarium/Laravel/Directives/HasOneDirective.php b/Modelarium/Laravel/Directives/HasOneDirective.php
@@ -35,7 +35,7 @@ public static function processModelRelationshipDirective(
         \GraphQL\Language\AST\DirectiveNode $directive,
         \Formularium\Datatype $datatype = null
     ): ?\Formularium\Datatype {
-        list($type, $isRequired) = Parser::getUnwrappedType($field->type);
+        list($type, $isRequired) = Parser::getUnwrappedType($field->getType());
 
         $sourceTypeName = $generator->getLowerName();
         $targetTypeName = $type->name;

diff --git a/Modelarium/Laravel/Directives/ModelAccessorDirective.php b/Modelarium/Laravel/Directives/ModelAccessorDirective.php
@@ -24,7 +24,7 @@ public static function processModelFieldDirective(
     ): void {
         $studly = Str::studly($field->name);
         // TODO: return type, converted to PHP
-        // list($type, $isRequired) = Parser::getUnwrappedType($field->type);
+        // list($type, $isRequired) = Parser::getUnwrappedType($field->getType());
         // $typeName = $type->name;
 
         $generator->class->addMethod("get{$studly}Attribute")
@@ -39,7 +39,7 @@ public static function processModelRelationshipDirective(
         \Formularium\Datatype $datatype = null
     ): ?\Formularium\Datatype {
         $studly = Str::studly($field->name);
-        list($type, $isRequired) = Parser::getUnwrappedType($field->type);
+        list($type, $isRequired) = Parser::getUnwrappedType($field->getType());
 
         $generator->class->addMethod("get{$studly}Attribute")
             ->setPublic()

diff --git a/Modelarium/Laravel/Directives/ModelExtendsDirective.php b/Modelarium/Laravel/Directives/ModelExtendsDirective.php
@@ -21,7 +21,7 @@ public static function processModelTypeDirective(
 
             switch ($arg->name->value) {
                 case 'class':
-                    $generator->parentClassName = $value;
+                    $generator->parentClassName = (string)$value;
                 break;
             }
         }

diff --git a/Modelarium/Laravel/Directives/MorphManyDirective.php b/Modelarium/Laravel/Directives/MorphManyDirective.php
@@ -38,7 +38,7 @@ public static function processModelRelationshipDirective(
         \Formularium\Datatype $datatype = null
     ): ?\Formularium\Datatype {
         $name = $directive->name->value;
-        list($type, $isRequired) = Parser::getUnwrappedType($field->type);
+        list($type, $isRequired) = Parser::getUnwrappedType($field->getType());
         $typeName = $type->name;
 
         $lowerName = mb_strtolower($generator->getInflector()->singularize($field->name));

diff --git a/Modelarium/Laravel/Directives/MorphOneDirective.php b/Modelarium/Laravel/Directives/MorphOneDirective.php
@@ -38,7 +38,7 @@ public static function processModelRelationshipDirective(
         \Formularium\Datatype $datatype = null
     ): ?\Formularium\Datatype {
         $name = $directive->name->value;
-        list($type, $isRequired) = Parser::getUnwrappedType($field->type);
+        list($type, $isRequired) = Parser::getUnwrappedType($field->getType());
         $typeName = $type->name;
 
         $lowerName = mb_strtolower($generator->getInflector()->singularize($field->name));

diff --git a/Modelarium/Laravel/Directives/MorphToDirective.php b/Modelarium/Laravel/Directives/MorphToDirective.php
@@ -46,7 +46,7 @@ public static function processMigrationRelationshipDirective(
         MigrationCodeFragment $codeFragment
     ): void {
         $lowerName = mb_strtolower($generator->getInflector()->singularize($field->name));
-        list($type, $isRequired) = Parser::getUnwrappedType($field->type);
+        list($type, $isRequired) = Parser::getUnwrappedType($field->getType());
         $relation = Parser::getDirectiveArgumentByName($directive, 'relation', $lowerName);
         $codeFragment->appendBase('->unsignedBigInteger("' . $relation . '_id")');
         $codeFragment->appendExtraLine(
@@ -68,7 +68,7 @@ public static function processModelFieldDirective(
         \Formularium\Field $fieldFormularium,
         \GraphQL\Language\AST\DirectiveNode $directive
     ): void {
-        list($type, $isRequired) = Parser::getUnwrappedType($field->type);
+        list($type, $isRequired) = Parser::getUnwrappedType($field->getType());
         $typeName = $type->name;
 
         if (!($type instanceof UnionType)) {

diff --git a/Modelarium/Laravel/Directives/MorphToManyDirective.php b/Modelarium/Laravel/Directives/MorphToManyDirective.php
@@ -38,7 +38,7 @@ public static function processModelRelationshipDirective(
         \Formularium\Datatype $datatype = null
     ): ?\Formularium\Datatype {
         $name = $directive->name->value;
-        list($type, $isRequired) = Parser::getUnwrappedType($field->type);
+        list($type, $isRequired) = Parser::getUnwrappedType($field->getType());
         $typeName = $type->name;
 
         $lowerName = mb_strtolower($generator->getInflector()->singularize($field->name));

diff --git a/Modelarium/Laravel/Directives/MorphedByManyDirective.php b/Modelarium/Laravel/Directives/MorphedByManyDirective.php
@@ -69,7 +69,7 @@ public static function processModelRelationshipDirective(
         \Formularium\Datatype $datatype = null
     ): ?\Formularium\Datatype {
         $name = $directive->name->value;
-        list($type, $isRequired) = Parser::getUnwrappedType($field->type);
+        list($type, $isRequired) = Parser::getUnwrappedType($field->getType());
         $typeName = $type->name;
 
         $lowerName = mb_strtolower($generator->getInflector()->singularize($field->name));