dallgoot / yaml

sources/NodeFactory.php

Braces +19 added lines, -11 removed lines

@@ -22,10 +22,13 @@ 
     final public static function get($nodeString = null, $line = 0):NodeGeneric
     {
         $trimmed = ltrim($nodeString);
-        if ($trimmed === '')                                return new Nodes\Blank($nodeString, $line);
-        elseif (substr($trimmed, 0, 3) === '...')           return new Nodes\DocEnd($nodeString, $line);
-        elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) return new Nodes\Key($nodeString, $line, $matches);
-        else {
+        if ($trimmed === '') {
+            return new Nodes\Blank($nodeString, $line);
+        } elseif (substr($trimmed, 0, 3) === '...') {
+            return new Nodes\DocEnd($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) {
+            return new Nodes\Key($nodeString, $line, $matches);
+        } else {
             $first = $trimmed[0];
             $stringGroups = ["-" ,'>|' ,'"\'',"#%" ,"{[" ,":?" ,'*&!'];
             $methodGroups = ['Hyphen','Literal','Quoted','Special','Compact','SetElement','NodeAction'];
@@ -96,10 +99,13 @@ 
     final private static function onCompact(string $first, string $nodeString, int $line):NodeGeneric
     {
         json_decode($nodeString, false, 512, self::JSON_OPTIONS);
-        if (json_last_error() === \JSON_ERROR_NONE)             return new Nodes\JSON($nodeString, $line);
-        elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString)))  return new Nodes\CompactMapping($nodeString, $line);
-        elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) return new Nodes\CompactSequence($nodeString, $line);
-        else {
+        if (json_last_error() === \JSON_ERROR_NONE) {
+            return new Nodes\JSON($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString))) {
+            return new Nodes\CompactMapping($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) {
+            return new Nodes\CompactSequence($nodeString, $line);
+        } else {
             return new Nodes\Partial($nodeString, $line);
         }
     }
@@ -114,9 +120,11 @@ 
      */
     final private static function onHyphen(string $first, string $nodeString, int $line):NodeGeneric
     {
-        if (substr($nodeString, 0, 3) === '---')              return new Nodes\DocStart($nodeString, $line);
-        elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString)))  return new Nodes\Item($nodeString, $line);
-        else {
+        if (substr($nodeString, 0, 3) === '---') {
+            return new Nodes\DocStart($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString))) {
+            return new Nodes\Item($nodeString, $line);
+        } else {
             return new Nodes\Scalar($nodeString, $line);
         }
     }

sources/DumperHandlers.php

Braces +21 added lines, -7 removed lines

@@ -25,7 +25,9 @@ 
 
     public function __construct(int $options = null)
     {
-        if (is_int($options)) $this->options = $options;
+        if (is_int($options)) {
+            $this->options = $options;
+        }
     }
 
 
@@ -45,8 +47,12 @@ 
 
     public function dumpScalar($dataType, $indent):string
     {
-        if ($dataType === \INF) return '.inf';
-        if ($dataType === -\INF) return '-.inf';
+        if ($dataType === \INF) {
+            return '.inf';
+        }
+        if ($dataType === -\INF) {
+            return '-.inf';
+        }
         $precision = "%.".$this->floatPrecision."F";
         switch (gettype($dataType)) {
             case 'boolean': return $dataType ? 'true' : 'false';
@@ -73,11 +79,19 @@ 
                 }
             }
         } elseif (is_object($compound)) {
-            if ($compound instanceof YamlObject) return $this->dumpYamlObject($compound);
-            if ($compound instanceof Tagged)     return $this->dumpTagged($compound, $indent);
-            if ($compound instanceof Compact)    return $this->dumpCompact($compound, $indent);
+            if ($compound instanceof YamlObject) {
+                return $this->dumpYamlObject($compound);
+            }
+            if ($compound instanceof Tagged) {
+                return $this->dumpTagged($compound, $indent);
+            }
+            if ($compound instanceof Compact) {
+                return $this->dumpCompact($compound, $indent);
+            }
             //TODO:  consider dumping datetime as date strings according to a format provided by user
-            if ($compound instanceof \DateTime)  return $compound->format(self::DATE_FORMAT);
+            if ($compound instanceof \DateTime) {
+                return $compound->format(self::DATE_FORMAT);
+            }
             $iterator = new \ArrayIterator($compound);
         }
         return $this->iteratorToString($iterator, $mask, $indent);

sources/NodeList.php

Braces +11 added lines, -5 removed lines

@@ -50,7 +50,9 @@ 
         $tmp->rewind();
         $fqn = __NAMESPACE__."\\Nodes\\$nodeType";
         foreach ($tmp as $child) {
-            if ($child instanceof $fqn) return true;
+            if ($child instanceof $fqn) {
+                return true;
+            }
         }
         return false;
     }
@@ -64,7 +66,9 @@ 
                 && !($child instanceof Directive)
                 && !($child instanceof Blank)
                 && !($child instanceof Docstart
-                && is_null($child->value)) ) return true;
+                && is_null($child->value)) ) {
+                return true;
+            }
         }
         return false;
     }
@@ -72,9 +76,11 @@ 
     public function push($node)
     {
         $type = null;
-        if     ($node instanceof Item )    $type = self::SEQUENCE;
-        elseif ($node instanceof Key)      $type = self::MAPPING;
-        elseif ($node instanceof SetKey
+        if     ($node instanceof Item ) {
+            $type = self::SEQUENCE;
+        } elseif ($node instanceof Key) {
+            $type = self::MAPPING;
+        } elseif ($node instanceof SetKey
              || $node instanceof SetValue) {
             $type = self::SET;
         } elseif ($node instanceof Scalar ){

sources/Dumper.php

Braces +3 added lines, -1 removed lines

@@ -44,7 +44,9 @@
      */
     public static function toString($dataType, int $options = null):string
     {
-        if (empty($dataType)) throw new \Exception(self::class.": No content to convert to Yaml");
+        if (empty($dataType)) {
+            throw new \Exception(self::class.": No content to convert to Yaml");
+        }
         self::$options = is_int($options) ? $options : self::OPTIONS;
         $dumpHandler = new DumperHandlers($options);
         if (is_scalar($dataType)) {

sources/nodes/abstract/Literals.php

Braces +3 added lines, -1 removed lines

@@ -32,7 +32,9 @@
 
     public function add(NodeGeneric $child):NodeGeneric
     {
-        if (is_null($this->value)) $this->value = new NodeList();
+        if (is_null($this->value)) {
+            $this->value = new NodeList();
+        }
         $candidate = $child;
         if (!$child->isOneOf( ['Scalar', 'Blank', 'Comment', 'Quoted'])) {
             $candidate = new Scalar((string) $child->raw, $child->line);

sources/nodes/abstract/NodeGeneric.php

Braces +18 added lines, -6 removed lines

@@ -226,7 +226,9 @@ 
     {
         foreach ($comparison as $className) {
             $fqn = __NAMESPACE__."\\$className";
-            if ($this instanceof $fqn) return true;
+            if ($this instanceof $fqn) {
+                return true;
+            }
         }
         return false;
     }
@@ -240,13 +242,23 @@ 
     {
         $props = [];
         $props['line->indent'] = "$this->line -> $this->indent";
-        if ($this->identifier) $props['identifier'] = "($this->identifier)";
-        if ($this->anchor)     $props['anchor']     = "($this->anchor)";
-        if ($this->tag)        $props['tag']        = "($this->tag)";
-        if ($this->value)      $props['value']      = $this->value;
+        if ($this->identifier) {
+            $props['identifier'] = "($this->identifier)";
+        }
+        if ($this->anchor) {
+            $props['anchor']     = "($this->anchor)";
+        }
+        if ($this->tag) {
+            $props['tag']        = "($this->tag)";
+        }
+        if ($this->value) {
+            $props['value']      = $this->value;
+        }
         // $props['value'] = $this->value;
         $props['raw']   = $this->raw;
-        if (!$this->_parent)  $props['parent'] = 'NO PARENT!!!';
+        if (!$this->_parent) {
+            $props['parent'] = 'NO PARENT!!!';
+        }
         return $props;
     }
 }

sources/nodes/SetKey.php

Braces +3 added lines, -1 removed lines

@@ -34,7 +34,9 @@
         $built = is_null($this->value) ? null : $this->value->build();
         $stringKey = is_string($built) && Regex::isProperlyQuoted($built) ? trim($built, '\'" '): $built;
         $key = json_encode($stringKey, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
-        if (empty($key)) throw new \Exception("Cant serialize complex key: ".var_export($this->value, true));
+        if (empty($key)) {
+            throw new \Exception("Cant serialize complex key: ".var_export($this->value, true));
+        }
         $parent->{trim($key, '\'" ')} = null;
         return null;
     }