dallgoot / yaml

yaml/Builder.php

Spacing +10 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
         $_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);
                 }
@@ -82,13 +82,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)) {
@@ -97,7 +97,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));
@@ -136,11 +136,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);
@@ -166,7 +166,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;
@@ -180,7 +180,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 +12 added lines, -6 removed lines

@@ -70,7 +70,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);
     }
 
@@ -164,7 +166,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) {
@@ -181,10 +185,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 +4 added lines, -4 removed lines

@@ -31,7 +31,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)) {
@@ -78,7 +78,7 @@ 
         $numKeys = array_filter(array_keys($ref), 'is_int');
         $key = count($numKeys) > 0 ? max($numKeys) + 1 : 0;
         if ($value instanceof Node) {
-            if($value->type & Y::KEY) {
+            if ($value->type & Y::KEY) {
                 self::buildKey($node->value, $parent);
                 return;
             } elseif ($value->type & Y::ITEM) {
@@ -102,7 +102,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;
@@ -118,7 +118,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($node->value);

Braces +6 added lines, -2 removed lines

@@ -17,7 +17,9 @@ 
     public static function buildReference($node, $parent)
     {
         $tmp = is_null($node->value) ? null : Builder::build($node->value, $parent);
-        if ($node->type === Y::REF_DEF) Builder::$_root->addReference($node->identifier, $tmp);
+        if ($node->type === Y::REF_DEF) {
+            Builder::$_root->addReference($node->identifier, $tmp);
+        }
         return Builder::$_root->getReference($node->identifier);
     }
 
@@ -104,7 +106,9 @@ 
         $built = is_object($node->value) ? Builder::build($node->value) : null;
         $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);
+        if (empty($key)) {
+            throw new \Exception("Cant serialize complex key: ".var_export($node->value, true), 1);
+        }
         $parent->{trim($key, '\'" ')} = null;
     }