dallgoot / yaml

yaml/Compact.php

Braces +6 added lines, -2 removed lines

@@ -25,8 +25,12 @@
     public function jsonSerialize():array
     {
         $prop = get_object_vars($this);
-        if (count($prop) > 0) return $prop;
-        if (count($this) > 0) return iterator_to_array($this);
+        if (count($prop) > 0) {
+            return $prop;
+        }
+        if (count($this) > 0) {
+            return iterator_to_array($this);
+        }
     }
 
     /**

yaml/Node.php

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
         elseif (in_array($first, ['?', ':']))      NodeHandlers::onSetElement($nodeValue, $this);
         elseif (in_array($first, ['!', '&', '*'])) NodeHandlers::onNodeAction($nodeValue, $this);
         else {
-            $characters = [ '#' =>  [Y::COMMENT, $v],
+            $characters = ['#' =>  [Y::COMMENT, $v],
                             '%' =>  [Y::DIRECTIVE, $v],
                             '>' =>  [Y::LITT_FOLDED, null],
                             '|' =>  [Y::LITT, null]

Braces +18 added lines, -9 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) {
@@ -100,7 +104,7 @@ 
         if (is_null($this->value)) {
             $this->value = $child;
             return;
-        }elseif ($this->value instanceof Node) {
+        } elseif ($this->value instanceof Node) {
             if ($this->value->type & Y::LITTERALS) {
                 $type = $this->value->type;
                 $this->value = new NodeList();
@@ -168,12 +172,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, $v],
                             '%' =>  [Y::DIRECTIVE, $v],
                             '>' =>  [Y::LITT_FOLDED, null],

yaml/NodeHandlers.php

Spacing +6 added lines, -6 removed lines

@@ -66,28 +66,28 @@
     public static function onCompact($value, Node $node)
     {
         $node->value = json_decode($value, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
-        if (json_last_error() === JSON_ERROR_NONE){
+        if (json_last_error() === JSON_ERROR_NONE) {
             $node->type = Y::JSON;
             return;
         }
         $node->value = new NodeList();
-        if (preg_match(R::MAPPING, $value)){
+        if (preg_match(R::MAPPING, $value)) {
             $node->type = Y::COMPACT_MAPPING;
             $node->value->type = Y::COMPACT_MAPPING;
-            preg_match_all(R::MAPPING_VALUES, trim(substr($value, 1,-1)), $matches);
+            preg_match_all(R::MAPPING_VALUES, trim(substr($value, 1, -1)), $matches);
             foreach ($matches['k'] as $index => $property) {
                 $n = new Node('', $node->line);
                 $n->type = Y::KEY;
-                $n->identifier = trim($property, '"\' ');//TODO : maybe check for proper quoting first ?
+                $n->identifier = trim($property, '"\' '); //TODO : maybe check for proper quoting first ?
                 $n->value = new Node($matches['v'][$index], $node->line);
                 $node->value->push($n);
             }
             return;
         }
-        if (preg_match(R::SEQUENCE, $value)){
+        if (preg_match(R::SEQUENCE, $value)) {
             $node->type = Y::COMPACT_SEQUENCE;
             $node->value->type = Y::COMPACT_SEQUENCE;
-            preg_match_all(R::SEQUENCE_VALUES, trim(substr($value, 1,-1)), $matches);
+            preg_match_all(R::SEQUENCE_VALUES, trim(substr($value, 1, -1)), $matches);
             foreach ($matches['item'] as $key => $item) {
                 $i = new Node('', $node->line);
                 $i->type = Y::ITEM;

yaml/Builder.php

Spacing +10 added lines, -10 removed lines

@@ -36,7 +36,7 @@ 
         if ($_root->value instanceof NddeList) $_root->value->setIteratorMode(NodeList::IT_MODE_DELETE);
         foreach ($_root->value as $child) {
             if ($child->type & Y::DOC_START) {
-                if(++$totalDocStart > 1){
+                if (++$totalDocStart > 1) {
                     $documents[] = self::buildDocument($buffer, count($documents));
                     $buffer = new NodeList($child);
                 }
@@ -81,13 +81,13 @@ 
      *
      * @return mixed    The parent (object|array) or a string representing the NodeList.
      */
-    public static function buildNodeList(NodeList $node, &$parent=null)
+    public static function buildNodeList(NodeList $node, &$parent = null)
     {
         $node->forceType();
-        if ($node->type & (Y::RAW | Y::LITTERALS)) {
+        if ($node->type & (Y::RAW|Y::LITTERALS)) {
             return self::buildLitteral($node, (int) $node->type);
         }
-        $action = function ($child, &$parent, &$out) {
+        $action = function($child, &$parent, &$out) {
             self::build($child, $out);
         };
         if ($node->type & (Y::COMPACT_MAPPING|Y::MAPPING|Y::SET)) {
@@ -96,7 +96,7 @@ 
             $out = $parent ?? [];
         } else {
             $out = '';
-            $action = function ($child, &$parent, &$out) {
+            $action = function($child, &$parent, &$out) {
                 if ($child->type & (Y::SCALAR|Y::QUOTED)) {
                     if ($parent) {
                         $parent->setText(self::build($child));
@@ -135,11 +135,11 @@ 
         ];
         if (isset($actions[$type])) {
             return TB::{$actions[$type]}($node, $parent);
-        } elseif ($type & Y::COMMENT) {
+        } elseif ($type&Y::COMMENT) {
             self::$_root->addComment($line, $value);
-        } elseif ($type & (Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) {
+        } elseif ($type&(Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) {
             return self::buildNodeList($value, $parent);
-        } elseif ($type & (Y::REF_DEF | Y::REF_CALL)) {
+        } elseif ($type&(Y::REF_DEF|Y::REF_CALL)) {
             return TB::buildReference($node, $parent);
         } elseif ($value instanceof Node) {
             return self::buildNode($value, $parent);
@@ -165,7 +165,7 @@ 
         //remove trailing blank
         while ($list->top()->type & Y::BLANK) $list->pop();
         $result = '';
-        $separator = [ Y::RAW => '', Y::LITT => "\n", Y::LITT_FOLDED => ' '][$type];
+        $separator = [Y::RAW => '', Y::LITT => "\n", Y::LITT_FOLDED => ' '][$type];
         foreach ($list as $child) {
             if ($child->value instanceof NodeList) {
                 $result .= self::buildLitteral($child->value, $type).$separator;
@@ -179,7 +179,7 @@ 
     private static function setLiteralValue(Node $child, string &$result, int $refIndent, string $separator, int $type)
     {
         $val = $child->type & (Y::SCALAR) ? $child->value : substr($child->raw, $refIndent);
-        if ($type & Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) {
+        if ($type&Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) {
             if ($result[-1] === $separator)
                 $result[-1] = "\n";
             if ($result[-1] === "\n")

Braces +15 added lines, -7 removed lines

@@ -33,7 +33,9 @@ 
         $totalDocStart = 0;
         $documents = [];
         $buffer = new NodeList();
-        if ($_root->value instanceof NddeList) $_root->value->setIteratorMode(NodeList::IT_MODE_DELETE);
+        if ($_root->value instanceof NddeList) {
+            $_root->value->setIteratorMode(NodeList::IT_MODE_DELETE);
+        }
         foreach ($_root->value as $child) {
             if ($child->type & Y::DOC_START) {
                 if(++$totalDocStart > 1){
@@ -69,7 +71,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);
     }
 
@@ -163,7 +167,9 @@ 
         $list->rewind();
         $refIndent = $list->current()->indent;
         //remove trailing blank
-        while ($list->top()->type & Y::BLANK) $list->pop();
+        while ($list->top()->type & Y::BLANK) {
+            $list->pop();
+        }
         $result = '';
         $separator = [ Y::RAW => '', Y::LITT => "\n", Y::LITT_FOLDED => ' '][$type];
         foreach ($list as $child) {
@@ -180,10 +186,12 @@ 
     {
         $val = $child->type & (Y::SCALAR) ? $child->value : substr($child->raw, $refIndent);
         if ($type & Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->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;

yaml/TypesBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
      * @throws \ParseError if Key has no name(identifier) Note: empty string is allowed
      * @return null
      */
-    public static function buildKey(Node $node, &$parent=null)
+    public static function buildKey(Node $node, &$parent = null)
     {
         extract((array) $node, EXTR_REFS);
         if (is_null($identifier)) {
@@ -98,7 +98,7 @@ 
     public function buildSetKey(Node $node, &$parent)
     {
         $built = is_object($node->value) ? Builder::build($node->value) : null;
-        $stringKey = is_string($built) && Regex::isProperlyQuoted($built) ? trim($built, '\'" '): $built;
+        $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($node->value, true), 1);
         $parent->{trim($key, '\'" ')} = null;
@@ -114,7 +114,7 @@ 
     {
         $prop = array_keys(get_object_vars($parent));
         $key = end($prop);
-        if ($node->value->type & (Y::ITEM|Y::KEY )) {
+        if ($node->value->type & (Y::ITEM|Y::KEY)) {
             $node->value = new NodeList($node->value);
         }
         $parent->{$key} = Builder::build(/** @scrutinizer ignore-type */ $node->value);