Get rid of complex conditions in visitor.php (#137)

* Get rid of 1 if in visitor.php

* Remove another if from visitor.php

* Minus 1 if in visitor.php

Author: szepeviktor

visitor.php

@@ -176,56 +176,59 @@ public function format(int $level = 1): array
             return [];
         }
 
-        if (count($this->children) > 0) {
-            $childStrings = [];
+        if (count($this->children) === 0) {
+            $strings[] = sprintf(
+                '%s%s%s: %s,',
+                $padding,
+                $this->name,
+                ($this->optional) ? '?' : '',
+                $this->type
+            );
 
-            foreach ($this->children as $child) {
-                $childStrings = array_merge($childStrings, $child->format($level + 1));
-            }
+            return $strings;
+        }
 
-            if (count($childStrings) === 0) {
-                return [];
-            }
+        $childStrings = [];
 
-            if ($this->isArrayShape()) {
-                if ($this->name !== null) {
-                    $strings[] = sprintf(
-                        '%s%s%s: %s{',
-                        $padding,
-                        $this->name,
-                        ($this->optional) ? '?' : '',
-                        $this->type
-                    );
-                }
-            } else {
-                $strings[] = sprintf(
-                    '%s%s%s: array<int|string, %s{',
-                    $padding,
-                    $this->name,
-                    ($this->optional) ? '?' : '',
-                    $this->type
-                );
-            }
+        foreach ($this->children as $child) {
+            $childStrings = array_merge($childStrings, $child->format($level + 1));
+        }
 
-            $strings = array_merge($strings, $childStrings);
+        if (count($childStrings) === 0) {
+            return [];
+        }
 
-            if ($this->isArrayShape()) {
-                if ($this->name !== null) {
-                    $strings[] = "$padding},";
-                }
-            } else {
-                $strings[] = "$padding}>,";
+        if ($this->isArrayShape()) {
+            if ($this->name === null) {
+                $strings = array_merge($strings, $childStrings);
+
+                return $strings;
             }
-        } else {
+
             $strings[] = sprintf(
-                '%s%s%s: %s,',
+                '%s%s%s: %s{',
                 $padding,
                 $this->name,
                 ($this->optional) ? '?' : '',
                 $this->type
             );
+            $strings = array_merge($strings, $childStrings);
+            $strings[] = sprintf('%s},', $padding);
+
+            return $strings;
         }
 
+        // Not an array with a shape
+        $strings[] = sprintf(
+            '%s%s%s: array<int|string, %s{',
+            $padding,
+            $this->name,
+            ($this->optional) ? '?' : '',
+            $this->type
+        );
+        $strings = array_merge($strings, $childStrings);
+        $strings[] = sprintf('%s}>,', $padding);
+
         return $strings;
     }
 }