naming updates

Author: romalytvynenko

src/Infer/Services/ReferenceTypeResolver.php

@@ -119,8 +119,8 @@ private function finalizeType(Type $type, Type $originalType): Type
         $attributes = $type->attributes();
 
         $traverser = new TypeTraverser([
-            new UnionNormalizingTypeVisitor,
             new KeyedArrayUnpackingTypeVisitor,
+            new UnionNormalizingTypeVisitor,
             new LateTypeResolvingTypeVisitor,
         ]);
 

src/Support/Generator/TypeTransformer.php

@@ -226,11 +226,11 @@ public function transform(Type $type): OpenApiType
                 $openApiType = count($uniqueItems) === 1 ? $uniqueItems[0] : (new AnyOf)->setItems($uniqueItems);
             }
         } elseif ($type instanceof LiteralStringType) {
-            $openApiType = (new StringType)->constant($type->value);
+            $openApiType = (new StringType)->const($type->value);
         } elseif ($type instanceof LiteralIntegerType) {
-            $openApiType = (new IntegerType)->constant($type->value);
+            $openApiType = (new IntegerType)->const($type->value);
         } elseif ($type instanceof LiteralFloatType) {
-            $openApiType = (new NumberType)->constant($type->value);
+            $openApiType = (new NumberType)->const($type->value);
         } elseif ($type instanceof \Dedoc\Scramble\Support\Type\StringType) {
             $openApiType = new StringType;
         } elseif ($type instanceof \Dedoc\Scramble\Support\Type\FloatType) {

src/Support/Generator/Types/Type.php

@@ -33,7 +33,7 @@ abstract class Type
     public array $enum = [];
 
     /** @var scalar|null */
-    public $constant = null;
+    public $const = null;
 
     public bool $nullable = false;
 
@@ -94,7 +94,6 @@ public function contentEncoding(string $encoding): self
     public function addProperties(Type $fromType): self
     {
         $this->attributes = $fromType->attributes;
-
         $this->format = $fromType->format;
         $this->description = $fromType->description;
         $this->contentMediaType = $fromType->contentMediaType;
@@ -103,6 +102,7 @@ public function addProperties(Type $fromType): self
         $this->default = $fromType->default;
         $this->examples = $fromType->examples;
         $this->enum = $fromType->enum;
+        $this->const = $fromType->const;
         $this->nullable = $fromType->nullable;
         $this->deprecated = $fromType->deprecated;
         $this->pattern = $fromType->pattern;
@@ -122,7 +122,7 @@ public function toArray()
                 'deprecated' => $this->deprecated,
                 'pattern' => $this->pattern,
                 'enum' => count($this->enum) ? $this->enum : null,
-                'const' => ! is_null($this->constant) ? $this->constant : null,
+                'const' => ! is_null($this->const) ? $this->const : null,
             ]),
             $this->example instanceof MissingValue ? [] : ['example' => $this->example],
             $this->default instanceof MissingValue ? [] : ['default' => $this->default],
@@ -157,12 +157,12 @@ public function enum(array $enum): self
     }
 
     /**
-     * @param  scalar  $constant
+     * @param  scalar  $const
      * @return $this
      */
-    public function constant($constant): self
+    public function const($const): self
     {
-        $this->constant = $constant;
+        $this->const = $const;
 
         return $this;
     }