Final reafactorings and tests

peldax · peldax · commit e6d022772e58 · 2025-12-23T21:46:39.000+01:00
diff --git a/src/Resolver/Visitor/ResolveSelectionVisitor.php b/src/Resolver/Visitor/ResolveSelectionVisitor.php
@@ -204,7 +204,7 @@ private static function addToResultingSelection(
         }
 
         if ($value instanceof TypeValue) {
-            $resolvedValue = $value->getIntermediateValue();
+            $resolvedValue = $value->intermediateValue;
             $resolvedValue->getType()->accept(new ResolveVisitor($selectionSet, $resolvedValue, $value->getRawValue()));
 
             return;
diff --git a/src/Typesystem/Argument/ArgumentSet.php b/src/Typesystem/Argument/ArgumentSet.php
@@ -32,7 +32,7 @@ public function offsetSet($offset, $value) : void
         $defaultValue = $value->getDefaultValue();
 
         if ($defaultValue instanceof ArgumentValue) {
-            $this->defaults[$value->getName()] = $defaultValue->getValue()->getRawValue();
+            $this->defaults[$value->getName()] = $defaultValue->value->getRawValue();
         }
     }
 
diff --git a/src/Typesystem/Introspection/InputValue.php b/src/Typesystem/Introspection/InputValue.php
@@ -62,7 +62,7 @@ static function (Argument $argument) : TypeContract {
                 Container::String(),
                 static function (Argument $argument) : ?string {
                     return $argument->getDefaultValue() instanceof ArgumentValue
-                        ? $argument->getDefaultValue()->getValue()->accept(new PrintValueVisitor())
+                        ? $argument->getDefaultValue()->value->accept(new PrintValueVisitor())
                         : null;
                 },
             ),
diff --git a/src/Typesystem/ScalarType.php b/src/Typesystem/ScalarType.php
@@ -70,7 +70,7 @@ public function getSpecifiedByUrl() : ?string
     {
         foreach ($this->getDirectiveUsages() as $directive) {
             if ($directive->getDirective() instanceof SpecifiedByDirective) {
-                return $directive->getArgumentValues()->offsetGet('url')->getValue()->getRawValue();
+                return $directive->getArgumentValues()->offsetGet('url')->value->getRawValue();
             }
         }
 
diff --git a/src/Typesystem/Spec/IncludeDirective.php b/src/Typesystem/Spec/IncludeDirective.php
@@ -34,7 +34,7 @@ public function validateFieldUsage(Field $field, ArgumentValueSet $arguments) :
     #[\Override]
     public function resolveFieldBefore(ArgumentValueSet $arguments) : SelectionDirectiveResult
     {
-        return $arguments->offsetGet('if')->getValue()->getRawValue() === true
+        return $arguments->offsetGet('if')->value->getRawValue() === true
             ? SelectionDirectiveResult::NONE
             : SelectionDirectiveResult::SKIP;
     }
diff --git a/src/Typesystem/Spec/OneOfDirective.php b/src/Typesystem/Spec/OneOfDirective.php
@@ -41,7 +41,7 @@ public function resolveInputObject(ArgumentValueSet $arguments, InputValue $inpu
         $currentCount = 0;
 
         foreach ($inputValue as $innerValue) {
-            if ($currentCount >= 1 || $innerValue->getValue() instanceof NullValue) {
+            if ($currentCount >= 1 || $innerValue->value instanceof NullValue) {
                 throw new OneOfDirectiveNotSatisfied();
             }
 
diff --git a/src/Typesystem/Spec/SkipDirective.php b/src/Typesystem/Spec/SkipDirective.php
@@ -34,7 +34,7 @@ public function validateFieldUsage(Field $field, ArgumentValueSet $arguments) :
     #[\Override]
     public function resolveFieldBefore(ArgumentValueSet $arguments) : SelectionDirectiveResult
     {
-        return $arguments->offsetGet('if')->getValue()->getRawValue() === true
+        return $arguments->offsetGet('if')->value->getRawValue() === true
             ? SelectionDirectiveResult::SKIP
             : SelectionDirectiveResult::NONE;
     }
diff --git a/src/Typesystem/Utils/TDeprecatable.php b/src/Typesystem/Utils/TDeprecatable.php
@@ -37,7 +37,7 @@ public function getDeprecationReason() : ?string
     {
         foreach ($this->directiveUsages as $directive) {
             if ($directive->getDirective() instanceof DeprecatedDirective) {
-                $value = $directive->getArgumentValues()->offsetGet('reason')->getValue()->getRawValue();
+                $value = $directive->getArgumentValues()->offsetGet('reason')->value->getRawValue();
 
                 return \is_string($value)
                     ? $value
diff --git a/src/Value/ArgumentValue.php b/src/Value/ArgumentValue.php
@@ -11,29 +11,19 @@
 use Graphpinator\Value\Visitor\ApplyVariablesVisitor;
 use Graphpinator\Value\Visitor\ResolveNonPureDirectivesVisitor;
 
-final class ArgumentValue
+final readonly class ArgumentValue
 {
     public function __construct(
-        private Argument $argument,
-        private InputedValue $value,
-        private bool $hasVariables,
+        public Argument $argument,
+        public InputedValue $value,
+        public bool $hasVariables,
     )
     {
         if (!$this->hasVariables) {
             $this->resolvePureDirectives();
         }
     }
 
-    public function getValue() : InputedValue
-    {
-        return $this->value;
-    }
-
-    public function getArgument() : Argument
-    {
-        return $this->argument;
-    }
-
     public function applyVariables(VariableValueSet $variables) : void
     {
         if ($this->hasVariables) {
diff --git a/src/Value/ArgumentValueSet.php b/src/Value/ArgumentValueSet.php
@@ -22,7 +22,7 @@ public function getValuesForResolver() : array
         $return = [];
 
         foreach ($this as $name => $argumentValue) {
-            $return[$name] = $argumentValue->getValue()->accept(new GetResolverValueVisitor());
+            $return[$name] = $argumentValue->value->accept(new GetResolverValueVisitor());
         }
 
         return $return;
@@ -38,24 +38,24 @@ public function applyVariables(VariableValueSet $variables) : void
     public function isSame(self $compare) : bool
     {
         foreach ($compare as $lhs) {
-            if ($this->offsetExists($lhs->getArgument()->getName())) {
-                if ($lhs->getValue()->accept(new IsValueSameVisitor($this->offsetGet($lhs->getArgument()->getName())->getValue()))) {
+            if ($this->offsetExists($lhs->argument->getName())) {
+                if ($lhs->value->accept(new IsValueSameVisitor($this->offsetGet($lhs->argument->getName())->value))) {
                     continue;
                 }
 
                 return false;
             }
 
-            if ($lhs->getValue()->accept(new IsValueSameVisitor($lhs->getArgument()->getDefaultValue()?->getValue()))) {
+            if ($lhs->value->accept(new IsValueSameVisitor($lhs->argument->getDefaultValue()?->value))) {
                 continue;
             }
 
             return false;
         }
 
         foreach ($this as $lhs) {
-            if ($compare->offsetExists($lhs->getArgument()->getName()) ||
-                $lhs->getValue()->accept(new IsValueSameVisitor($lhs->getArgument()->getDefaultValue()?->getValue()))) {
+            if ($compare->offsetExists($lhs->argument->getName()) ||
+                $lhs->value->accept(new IsValueSameVisitor($lhs->argument->getDefaultValue()?->value))) {
                 continue;
             }
 
@@ -70,6 +70,6 @@ protected function getKey(object $object) : string
     {
         \assert($object instanceof ArgumentValue);
 
-        return $object->getArgument()->getName();
+        return $object->argument->getName();
     }
 }
diff --git a/src/Value/InputValue.php b/src/Value/InputValue.php
@@ -32,7 +32,7 @@ public function getRawValue() : object
         $return = new \stdClass();
 
         foreach ($this as $argumentName => $argumentValue) {
-            $return->{$argumentName} = $argumentValue->getValue()->getRawValue();
+            $return->{$argumentName} = $argumentValue->value->getRawValue();
         }
 
         return $return;
diff --git a/src/Value/TypeIntermediateValue.php b/src/Value/TypeIntermediateValue.php
@@ -8,7 +8,7 @@
 use Graphpinator\Value\Contract\Value;
 use Graphpinator\Value\Exception\InvalidValue;
 
-final class TypeIntermediateValue implements Value
+final readonly class TypeIntermediateValue implements Value
 {
     public function __construct(
         private Type $type,
diff --git a/src/Value/TypeValue.php b/src/Value/TypeValue.php
@@ -8,12 +8,12 @@
 use Graphpinator\Typesystem\Type;
 use Graphpinator\Value\Contract\OutputValue;
 
-final class TypeValue implements OutputValue
+final readonly class TypeValue implements OutputValue
 {
     public function __construct(
-        private Type $type,
-        private \stdClass $value,
-        private TypeIntermediateValue $intermediateValue,
+        public Type $type,
+        public \stdClass $value,
+        public TypeIntermediateValue $intermediateValue,
     )
     {
         foreach ($type->getDirectiveUsages() as $directiveUsage) {
@@ -35,24 +35,9 @@ public function getType() : Type
         return $this->type;
     }
 
-    public function getIntermediateValue() : TypeIntermediateValue
-    {
-        return $this->intermediateValue;
-    }
-
     #[\Override]
     public function jsonSerialize() : \stdClass
     {
         return $this->value;
     }
-
-    public function __get(string $name) : FieldValue
-    {
-        return $this->value->{$name};
-    }
-
-    public function __isset(string $name) : bool
-    {
-        return \property_exists($this->value, $name);
-    }
 }
diff --git a/src/Value/VariableValue.php b/src/Value/VariableValue.php
@@ -18,8 +18,8 @@ final class VariableValue implements InputedValue
     private ?InputedValue $value = null;
 
     public function __construct(
-        private Type $type,
-        private Variable $variable,
+        public readonly Type $type,
+        public readonly Variable $variable,
     )
     {
         $isInputable = $this->type->accept(new IsInputableVisitor());
@@ -42,6 +42,12 @@ public function getRawValue() : mixed
         return $this->value->getRawValue();
     }
 
+    #[\Override]
+    public function getType() : Type
+    {
+        return $this->type;
+    }
+
     public function setVariableValue(VariableValueSet $variables) : void
     {
         $this->value = $variables->get($this->variable->name);
@@ -51,15 +57,4 @@ public function getConcreteValue() : InputedValue
     {
         return $this->value;
     }
-
-    public function getVariable() : Variable
-    {
-        return $this->variable;
-    }
-
-    #[\Override]
-    public function getType() : Type
-    {
-        return $this->type;
-    }
 }
diff --git a/src/Value/Visitor/CreateResolvedValueVisitor.php b/src/Value/Visitor/CreateResolvedValueVisitor.php
@@ -25,7 +25,7 @@
 /**
  * @implements TypeVisitor<Value>
  */
-final class CreateResolvedValueVisitor implements TypeVisitor
+final readonly class CreateResolvedValueVisitor implements TypeVisitor
 {
     public function __construct(
         private mixed $rawValue,
diff --git a/src/Value/Visitor/GetResolverValueVisitor.php b/src/Value/Visitor/GetResolverValueVisitor.php
@@ -60,7 +60,7 @@ public function visitInput(InputValue $inputValue) : object
 
         foreach ($inputValue as $argumentName => $argumentValue) {
             // use separate hydrator?
-            $return->{$argumentName} = $argumentValue->getValue()->accept($this); // @phpstan-ignore property.dynamicName
+            $return->{$argumentName} = $argumentValue->value->accept($this); // @phpstan-ignore property.dynamicName
         }
 
         return $return;
diff --git a/src/Value/Visitor/IsValueSameVisitor.php b/src/Value/Visitor/IsValueSameVisitor.php
@@ -89,7 +89,7 @@ public function visitInput(InputValue $inputValue) : bool
             \assert($argumentValue instanceof ArgumentValue);
 
             if (!\property_exists($secondObject, $argumentName) ||
-                !$argumentValue->getValue()->accept(new self($secondObject->{$argumentName}->getValue()))) {
+                !$argumentValue->value->accept(new self($secondObject->{$argumentName}->value))) {
                 return false;
             }
         }
@@ -101,6 +101,6 @@ public function visitInput(InputValue $inputValue) : bool
     public function visitVariable(VariableValue $variableValue) : bool
     {
         return $this->compare instanceof VariableValue
-            && $this->compare->getVariable()->name === $variableValue->getVariable()->name;
+            && $this->compare->variable->name === $variableValue->variable->name;
     }
 }
diff --git a/src/Value/Visitor/PrintValueVisitor.php b/src/Value/Visitor/PrintValueVisitor.php
@@ -59,7 +59,7 @@ public function visitInput(InputValue $inputValue) : string
         $component = [];
 
         foreach ($inputValue as $argumentName => $argumentValue) {
-            $component[] = $argumentName . ':' . $argumentValue->getValue()->accept($this);
+            $component[] = $argumentName . ':' . $argumentValue->value->accept($this);
         }
 
         return '{' . \implode(',', $component) . '}';
diff --git a/tests/Unit/Typesystem/Visitor/ValidateIntegrityVisitorTest.php b/tests/Unit/Typesystem/Visitor/ValidateIntegrityVisitorTest.php

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ private static function addToResultingSelection(`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`if ($value instanceof TypeValue) {`
`207`		`- $resolvedValue = $value->getIntermediateValue();`
	`207`	`+ $resolvedValue = $value->intermediateValue;`
`208`	`208`	`$resolvedValue->getType()->accept(new ResolveVisitor($selectionSet, $resolvedValue, $value->getRawValue()));`
`209`	`209`
`210`	`210`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function offsetSet($offset, $value) : void`
`32`	`32`	`$defaultValue = $value->getDefaultValue();`
`33`	`33`
`34`	`34`	`if ($defaultValue instanceof ArgumentValue) {`
`35`		`- $this->defaults[$value->getName()] = $defaultValue->getValue()->getRawValue();`
	`35`	`+ $this->defaults[$value->getName()] = $defaultValue->value->getRawValue();`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function getSpecifiedByUrl() : ?string`
`70`	`70`	`{`
`71`	`71`	`foreach ($this->getDirectiveUsages() as $directive) {`
`72`	`72`	`if ($directive->getDirective() instanceof SpecifiedByDirective) {`
`73`		`- return $directive->getArgumentValues()->offsetGet('url')->getValue()->getRawValue();`
	`73`	`+ return $directive->getArgumentValues()->offsetGet('url')->value->getRawValue();`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function validateFieldUsage(Field $field, ArgumentValueSet $arguments) :`
`34`	`34`	`#[\Override]`
`35`	`35`	`public function resolveFieldBefore(ArgumentValueSet $arguments) : SelectionDirectiveResult`
`36`	`36`	`{`
`37`		`- return $arguments->offsetGet('if')->getValue()->getRawValue() === true`
	`37`	`+ return $arguments->offsetGet('if')->value->getRawValue() === true`
`38`	`38`	`? SelectionDirectiveResult::NONE`
`39`	`39`	`: SelectionDirectiveResult::SKIP;`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function resolveInputObject(ArgumentValueSet $arguments, InputValue $inpu`
`41`	`41`	`$currentCount = 0;`
`42`	`42`
`43`	`43`	`foreach ($inputValue as $innerValue) {`
`44`		`- if ($currentCount >= 1 \|\| $innerValue->getValue() instanceof NullValue) {`
	`44`	`+ if ($currentCount >= 1 \|\| $innerValue->value instanceof NullValue) {`
`45`	`45`	`throw new OneOfDirectiveNotSatisfied();`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function getDeprecationReason() : ?string`
`37`	`37`	`{`
`38`	`38`	`foreach ($this->directiveUsages as $directive) {`
`39`	`39`	`if ($directive->getDirective() instanceof DeprecatedDirective) {`
`40`		`- $value = $directive->getArgumentValues()->offsetGet('reason')->getValue()->getRawValue();`
	`40`	`+ $value = $directive->getArgumentValues()->offsetGet('reason')->value->getRawValue();`
`41`	`41`
`42`	`42`	`return \is_string($value)`
`43`	`43`	`? $value`
Original file line number	Diff line number	Diff line change
`@@ -11,29 +11,19 @@`
`11`	`11`	`use Graphpinator\Value\Visitor\ApplyVariablesVisitor;`
`12`	`12`	`use Graphpinator\Value\Visitor\ResolveNonPureDirectivesVisitor;`
`13`	`13`
`14`		`-final class ArgumentValue`
	`14`	`+final readonly class ArgumentValue`
`15`	`15`	`{`
`16`	`16`	`public function __construct(`
`17`		`- private Argument $argument,`
`18`		`- private InputedValue $value,`
`19`		`- private bool $hasVariables,`
	`17`	`+ public Argument $argument,`
	`18`	`+ public InputedValue $value,`
	`19`	`+ public bool $hasVariables,`
`20`	`20`	`)`
`21`	`21`	`{`
`22`	`22`	`if (!$this->hasVariables) {`
`23`	`23`	`$this->resolvePureDirectives();`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- public function getValue() : InputedValue`
`28`		`- {`
`29`		`- return $this->value;`
`30`		`- }`
`31`		`-`
`32`		`- public function getArgument() : Argument`
`33`		`- {`
`34`		`- return $this->argument;`
`35`		`- }`
`36`		`-`
`37`	`27`	`public function applyVariables(VariableValueSet $variables) : void`
`38`	`28`	`{`
`39`	`29`	`if ($this->hasVariables) {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function getValuesForResolver() : array`
`22`	`22`	`$return = [];`
`23`	`23`
`24`	`24`	`foreach ($this as $name => $argumentValue) {`
`25`		`- $return[$name] = $argumentValue->getValue()->accept(new GetResolverValueVisitor());`
	`25`	`+ $return[$name] = $argumentValue->value->accept(new GetResolverValueVisitor());`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`return $return;`
`@@ -38,24 +38,24 @@ public function applyVariables(VariableValueSet $variables) : void`
`38`	`38`	`public function isSame(self $compare) : bool`
`39`	`39`	`{`
`40`	`40`	`foreach ($compare as $lhs) {`
`41`		`- if ($this->offsetExists($lhs->getArgument()->getName())) {`
`42`		`- if ($lhs->getValue()->accept(new IsValueSameVisitor($this->offsetGet($lhs->getArgument()->getName())->getValue()))) {`
	`41`	`+ if ($this->offsetExists($lhs->argument->getName())) {`
	`42`	`+ if ($lhs->value->accept(new IsValueSameVisitor($this->offsetGet($lhs->argument->getName())->value))) {`
`43`	`43`	`continue;`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`return false;`
`47`	`47`	`}`
`48`	`48`
`49`		`- if ($lhs->getValue()->accept(new IsValueSameVisitor($lhs->getArgument()->getDefaultValue()?->getValue()))) {`
	`49`	`+ if ($lhs->value->accept(new IsValueSameVisitor($lhs->argument->getDefaultValue()?->value))) {`
`50`	`50`	`continue;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`return false;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`foreach ($this as $lhs) {`
`57`		`- if ($compare->offsetExists($lhs->getArgument()->getName()) \|\|`
`58`		`- $lhs->getValue()->accept(new IsValueSameVisitor($lhs->getArgument()->getDefaultValue()?->getValue()))) {`
	`57`	`+ if ($compare->offsetExists($lhs->argument->getName()) \|\|`
	`58`	`+ $lhs->value->accept(new IsValueSameVisitor($lhs->argument->getDefaultValue()?->value))) {`
`59`	`59`	`continue;`
`60`	`60`	`}`
`61`	`61`
`@@ -70,6 +70,6 @@ protected function getKey(object $object) : string`
`70`	`70`	`{`
`71`	`71`	`\assert($object instanceof ArgumentValue);`
`72`	`72`
`73`		`- return $object->getArgument()->getName();`
	`73`	`+ return $object->argument->getName();`
`74`	`74`	`}`
`75`	`75`	`}`