Improve builder logic

Author: Kirill Nesmeyanov

src/Exception/Definition/Shape/ShapeFieldsNotSupportedException.php

@@ -10,7 +10,7 @@ class ShapeFieldsNotSupportedException extends ShapeFieldsException
 {
     public static function becauseShapeFieldsNotSupported(
         TypeStatement $type,
-        ?\Throwable $previous = null
+        ?\Throwable $previous = null,
     ): self {
         $template = 'Type "{{type}}" does not support shape fields';
 

src/Exception/Definition/Template/Hint/TemplateArgumentHintsNotSupportedException.php

@@ -15,7 +15,7 @@ class TemplateArgumentHintsNotSupportedException extends TemplateArgumentHintExc
     public static function becauseTemplateArgumentHintsNotSupported(
         TemplateArgumentNode $argument,
         TypeStatement $type,
-        ?\Throwable $previous = null
+        ?\Throwable $previous = null,
     ): self {
         $template = 'Template argument #{{index}} ({{argument}}) of "{{type}}" does not support any hints, '
             . 'but "{{hint}}" were passed';

src/Exception/Definition/Template/MissingTemplateArgumentsException.php

@@ -19,7 +19,7 @@ public static function becauseTemplateArgumentsRangeRequired(
         int $minSupportedArgumentsCount,
         int $maxSupportedArgumentsCount,
         NamedTypeNode $type,
-        ?\Throwable $previous = null
+        ?\Throwable $previous = null,
     ): self {
         $template = 'Type "{{type}}" expects at least %s template argument(s), '
             . 'but {{passedArgumentsCount}} were passed';

src/Exception/Definition/Template/TemplateArgumentsCountException.php

@@ -23,7 +23,7 @@ public function __construct(
         NamedTypeNode $type,
         string $template,
         int $code = 0,
-        ?\Throwable $previous = null
+        ?\Throwable $previous = null,
     ) {
         parent::__construct(
             type: $type,

src/Exception/Definition/Template/TemplateArgumentsNotSupportedException.php

@@ -13,7 +13,7 @@ class TemplateArgumentsNotSupportedException extends TemplateArgumentsCountExcep
 {
     public static function becauseTemplateArgumentsNotSupported(
         NamedTypeNode $type,
-        ?\Throwable $previous = null
+        ?\Throwable $previous = null,
     ): self {
         $template = 'Type "{{type}}" does not support template arguments, '
             . 'but {{passedArgumentsCount}} were passed';

src/Platform/Builder/Builder.php

@@ -26,7 +26,7 @@ abstract class Builder implements TypeBuilderInterface
      *
      * @throws TemplateArgumentsNotSupportedException
      */
-    protected function expectNoTemplateArguments(NamedTypeNode $stmt): void
+    protected static function expectNoTemplateArguments(NamedTypeNode $stmt): void
     {
         if ($stmt->arguments === null) {
             return;
@@ -42,7 +42,7 @@ protected function expectNoTemplateArguments(NamedTypeNode $stmt): void
      *
      * @throws ShapeFieldsNotSupportedException
      */
-    protected function expectNoShapeFields(NamedTypeNode $stmt): void
+    protected static function expectNoShapeFields(NamedTypeNode $stmt): void
     {
         if ($stmt->fields === null) {
             return;
@@ -59,10 +59,10 @@ protected function expectNoShapeFields(NamedTypeNode $stmt): void
      * @throws MissingTemplateArgumentsException
      * @throws TooManyTemplateArgumentsException
      */
-    protected function expectTemplateArgumentsCount(NamedTypeNode $stmt, int $count): void
+    protected static function expectTemplateArgumentsCount(NamedTypeNode $stmt, int $count): void
     {
-        $this->expectTemplateArgumentsLessOrEqualThan($stmt, $count, $count);
-        $this->expectTemplateArgumentsGreaterOrEqualThan($stmt, $count, $count);
+        static::expectTemplateArgumentsLessOrEqualThan($stmt, $count, $count);
+        static::expectTemplateArgumentsGreaterOrEqualThan($stmt, $count, $count);
     }
 
     /**
@@ -73,9 +73,9 @@ protected function expectTemplateArgumentsCount(NamedTypeNode $stmt, int $count)
      *
      * @throws TooManyTemplateArgumentsException
      */
-    protected function expectTemplateArgumentsLessThan(NamedTypeNode $stmt, int $max, int $min = 0): void
+    protected static function expectTemplateArgumentsLessThan(NamedTypeNode $stmt, int $max, int $min = 0): void
     {
-        $this->expectTemplateArgumentsLessOrEqualThan($stmt, $max + 1, $min);
+        static::expectTemplateArgumentsLessOrEqualThan($stmt, $max + 1, $min);
     }
 
     /**
@@ -86,7 +86,7 @@ protected function expectTemplateArgumentsLessThan(NamedTypeNode $stmt, int $max
      *
      * @throws TooManyTemplateArgumentsException
      */
-    protected function expectTemplateArgumentsLessOrEqualThan(NamedTypeNode $stmt, int $max, int $min = 0): void
+    protected static function expectTemplateArgumentsLessOrEqualThan(NamedTypeNode $stmt, int $max, int $min = 0): void
     {
         if ($stmt->arguments === null || $stmt->arguments->count() <= $max) {
             return;
@@ -107,9 +107,9 @@ protected function expectTemplateArgumentsLessOrEqualThan(NamedTypeNode $stmt, i
      *
      * @throws MissingTemplateArgumentsException
      */
-    protected function expectTemplateArgumentsGreaterThan(NamedTypeNode $stmt, int $min, ?int $max = null): void
+    protected static function expectTemplateArgumentsGreaterThan(NamedTypeNode $stmt, int $min, ?int $max = null): void
     {
-        $this->expectTemplateArgumentsGreaterOrEqualThan($stmt, $min + 1, $max);
+        static::expectTemplateArgumentsGreaterOrEqualThan($stmt, $min + 1, $max);
     }
 
     /**
@@ -120,7 +120,7 @@ protected function expectTemplateArgumentsGreaterThan(NamedTypeNode $stmt, int $
      *
      * @throws MissingTemplateArgumentsException
      */
-    protected function expectTemplateArgumentsGreaterOrEqualThan(NamedTypeNode $stmt, int $min, ?int $max = null): void
+    protected static function expectTemplateArgumentsGreaterOrEqualThan(NamedTypeNode $stmt, int $min, ?int $max = null): void
     {
         $actualArgumentsCount = $stmt->arguments?->count() ?? 0;
 
@@ -140,7 +140,7 @@ protected function expectTemplateArgumentsGreaterOrEqualThan(NamedTypeNode $stmt
      *
      * @throws TemplateArgumentHintsNotSupportedException
      */
-    protected function expectNoTemplateArgumentHint(TypeStatement $stmt, TemplateArgumentNode $argument): void
+    protected static function expectNoTemplateArgumentHint(TypeStatement $stmt, TemplateArgumentNode $argument): void
     {
         if ($argument->hint === null) {
             return;