dallgoot / yaml

source/Node.php

Braces +17 added lines, -8 removed lines

@@ -68,8 +68,12 @@ 
      */
     public function getParent(int $indent = null, $type = 0):Node
     {
-        if ($this->type === Y::ROOT) return $this;
-        if (!is_int($indent)) return $this->parent ?? $this;
+        if ($this->type === Y::ROOT) {
+            return $this;
+        }
+        if (!is_int($indent)) {
+            return $this->parent ?? $this;
+        }
         $cursor = $this;
         while ($cursor instanceof Node && $cursor->indent >= $indent) {
             if ($cursor->indent === $indent && $cursor->type !== $type) {
@@ -171,12 +175,17 @@ 
     {
         $v = ltrim(substr($nodeValue, 1));
         $first = $nodeValue[0];
-        if ($first === "-")                        NodeHandlers::onHyphen($nodeValue, $this);
-        elseif (in_array($first, ['"', "'"]))      NodeHandlers::onQuoted($nodeValue, $this);
-        elseif (in_array($first, ['{', '[']))      NodeHandlers::onCompact($nodeValue, $this);
-        elseif (in_array($first, ['?', ':']))      NodeHandlers::onSetElement($nodeValue, $this);
-        elseif (in_array($first, ['!', '&', '*'])) NodeHandlers::onNodeAction($nodeValue, $this);
-        else {
+        if ($first === "-") {
+            NodeHandlers::onHyphen($nodeValue, $this);
+        } elseif (in_array($first, ['"', "'"])) {
+            NodeHandlers::onQuoted($nodeValue, $this);
+        } elseif (in_array($first, ['{', '['])) {
+            NodeHandlers::onCompact($nodeValue, $this);
+        } elseif (in_array($first, ['?', ':'])) {
+            NodeHandlers::onSetElement($nodeValue, $this);
+        } elseif (in_array($first, ['!', '&', '*'])) {
+            NodeHandlers::onNodeAction($nodeValue, $this);
+        } else {
             $characters = [ '#' =>  [Y::COMMENT, $nodeValue],
                             '%' =>  [Y::DIRECTIVE, $nodeValue],
                             '>' =>  [Y::LITT_FOLDED, null],

source/Tag.php

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
             case '!omap': $value->type = Y::SEQUENCE;break;
             // assumed to be !str,!binary
             default: $parent = null;
-                     $value->type = Y::RAW;
+                        $value->type = Y::RAW;
         }
         $this->value = Builder::buildNodeList($value, $parent);
         return $this->value;

source/Builder.php

Braces +12 added lines, -6 removed lines

@@ -86,7 +86,9 @@ 
      */
     public static function build(object $node, &$parent = null)
     {
-        if ($node instanceof NodeList) return self::buildNodeList($node, $parent);
+        if ($node instanceof NodeList) {
+            return self::buildNodeList($node, $parent);
+        }
         return self::buildNode($node, $parent);
     }
 
@@ -186,7 +188,9 @@ 
         $refIndent = $list->count() > 0 ? $list->current()->indent : 0;
         if($list->count()) {
             //remove trailing blank
-            while ($list->top()->type & Y::BLANK) $list->pop();
+            while ($list->top()->type & Y::BLANK) {
+                $list->pop();
+            }
             $separator = [ Y::RAW => '', Y::LITT => "\n", Y::LITT_FOLDED => ' '][$type];
             foreach ($list as $child) {
                 if ($child->value instanceof NodeList) {
@@ -215,10 +219,12 @@ 
             }
         }
         if ($type & Y::LITT_FOLDED && ($node->indent > $refIndent || ($node->type & Y::BLANK))) {
-            if ($result[-1] === $separator)
-                $result[-1] = "\n";
-            if ($result[-1] === "\n")
-                $result .= $val;
+            if ($result[-1] === $separator) {
+                            $result[-1] = "\n";
+            }
+            if ($result[-1] === "\n") {
+                            $result .= $val;
+            }
             return;
         }
         $result .= $val.$separator;

source/Dumper.php

Braces +18 added lines, -6 removed lines

@@ -42,7 +42,9 @@ 
      */
     public static function toString($dataType, int $options = null):string
     {
-        if (is_null($dataType)) throw new \Exception(self::class.": No content to convert to Yaml", 1);
+        if (is_null($dataType)) {
+            throw new \Exception(self::class.": No content to convert to Yaml", 1);
+        }
         self::$options = is_int($options) ? $options : self::OPTIONS;
         self::$result = new DLL;
         if ($dataType instanceof YamlObject) {
@@ -76,8 +78,12 @@ 
     private static function dump($dataType, int $indent)
     {
         if (is_scalar($dataType)) {
-            if ($dataType === INF) return '.inf';
-            if ($dataType === -INF) return '-.inf';
+            if ($dataType === INF) {
+                return '.inf';
+            }
+            if ($dataType === -INF) {
+                return '-.inf';
+            }
             switch (gettype($dataType)) {
                 case 'boolean': return $dataType ? 'true' : 'false';
                 case 'float': //fall through
@@ -94,7 +100,9 @@ 
 
     private static function dumpYamlObject(YamlObject $obj)
     {
-        if ($obj->hasDocStart() && self::$result instanceof DLL) self::$result->push("---");
+        if ($obj->hasDocStart() && self::$result instanceof DLL) {
+            self::$result->push("---");
+        }
         // self::dump($obj, 0);
         if (count($obj) > 0) {
             self::dumpArray($obj->getArrayCopy(), 0);
@@ -145,9 +153,13 @@ 
                 self::add(self::dump($obj->value, $indent + self::INDENT), $indent + self::INDENT);
             }
         }
-        if ($obj instanceof Compact) return self::dumpCompact($obj, $indent);
+        if ($obj instanceof Compact) {
+            return self::dumpCompact($obj, $indent);
+        }
         //TODO:  consider dumping datetime as date strings according to a format provided by user or default
-        if ($obj instanceof \DateTime) return $obj->format(self::DATE_FORMAT);
+        if ($obj instanceof \DateTime) {
+            return $obj->format(self::DATE_FORMAT);
+        }
         // if ($obj instanceof \SplString) {var_dump('splstrin',$obj);return '"'.$obj.'"';}
         $propList = get_object_vars($obj);//var_dump($propList);
         foreach ($propList as $property => $value) {

source/Node2PHP.php

Braces +21 added lines, -7 removed lines

@@ -23,9 +23,15 @@ 
      */
     public static function get(Node $n)
     {
-        if (is_null($n->value)) return null;
-        if ($n->type & (Y::REF_CALL|Y::SCALAR)) return self::getScalar((string) $n->value);
-        if ($n->type & Y::JSON) return $n->value;
+        if (is_null($n->value)) {
+            return null;
+        }
+        if ($n->type & (Y::REF_CALL|Y::SCALAR)) {
+            return self::getScalar((string) $n->value);
+        }
+        if ($n->type & Y::JSON) {
+            return $n->value;
+        }
         $expected = [Y::QUOTED => trim((string) $n->value, "\"'"),
                      Y::RAW    => strval((string) $n->value)];
         return $expected[$n->type] ?? null;
@@ -41,8 +47,12 @@ 
      */
     public static function getScalar(string $v)
     {
-        if (R::isDate($v))   return self::$dateAsString ? $v : date_create($v);
-        if (R::isNumber($v)) return self::getNumber($v);
+        if (R::isDate($v)) {
+            return self::$dateAsString ? $v : date_create($v);
+        }
+        if (R::isNumber($v)) {
+            return self::getNumber($v);
+        }
         $types = ['yes'   => true,
                     'no'    => false,
                     'true'  => true,
@@ -64,8 +74,12 @@ 
      */
     private static function getNumber(string $v)
     {
-        if (preg_match(R::OCTAL_NUM, $v)) return intval(base_convert($v, 8, 10));
-        if (preg_match(R::HEX_NUM, $v))   return intval(base_convert($v, 16, 10));
+        if (preg_match(R::OCTAL_NUM, $v)) {
+            return intval(base_convert($v, 8, 10));
+        }
+        if (preg_match(R::HEX_NUM, $v)) {
+            return intval(base_convert($v, 16, 10));
+        }
         return is_bool(strpos($v, '.')) ? intval($v) : floatval($v);
     }
 }
\ No newline at end of file