dallgoot / yaml

yaml/Node.php

Spacing +6 added lines, -6 removed lines

@@ -88,7 +88,7 @@ 
             }
             $this->value->push($child);
             //modify type according to child
-            if ($child->type & (Y::COMMENT | Y::KEY)) $this->value->type = Y::MAPPING;
+            if ($child->type & (Y::COMMENT|Y::KEY)) $this->value->type = Y::MAPPING;
             if ($child->type & Y::ITEM)               $this->value->type = Y::SEQUENCE;
             if ($this->type & Y::LITTERALS)  $this->value->type = $this->type;
         }
@@ -146,8 +146,8 @@ 
         if (in_array($first, ['{', '[']))      return $this->onObject($nodeValue);
         if (in_array($first, ['!', '&', '*'])) return $this->onNodeAction($nodeValue);
         // Note : php don't like '?' as an array key -_-
-        if($first === '?') return [Y::SET_KEY, empty($v) ? null : new Node(ltrim($v), $this->line)];
-        $characters = [ '#' =>  [Y::COMMENT, ltrim($v)],
+        if ($first === '?') return [Y::SET_KEY, empty($v) ? null : new Node(ltrim($v), $this->line)];
+        $characters = ['#' =>  [Y::COMMENT, ltrim($v)],
                         "-" =>  $this->onHyphen($nodeValue),
                         '%' =>  [Y::DIRECTIVE, ltrim($v)],
                         ':' =>  [Y::SET_VALUE, empty($v) ? null : new Node(ltrim($v), $this->line)],
@@ -258,8 +258,8 @@ 
     {
         $v = &$this->value;
         if (is_null($v)) return null;
-        if ($this->type & (Y::REF_CALL | Y::SCALAR)) return self::getScalar($v);
-        if ($this->type & (Y::COMPACT_MAPPING | Y::COMPACT_SEQUENCE)) return self::getCompact(substr($v, 1, -1), $this->type);
+        if ($this->type & (Y::REF_CALL|Y::SCALAR)) return self::getScalar($v);
+        if ($this->type & (Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) return self::getCompact(substr($v, 1, -1), $this->type);
         $expected = [Y::JSON   => json_decode($v, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR),
                      Y::QUOTED => substr($v, 1, -1),
                      Y::RAW    => strval($v)];
@@ -312,7 +312,7 @@ 
     {
         $out = new Compact();
         if ($type === Y::COMPACT_SEQUENCE) {
-            $f = function ($e) { return self::getScalar(trim($e));};
+            $f = function($e) { return self::getScalar(trim($e)); };
             //TODO : that's not robust enough, improve it
             foreach (array_map($f, explode(",", $mappingOrSeqString)) as $key => $value) {
                 $out[$key] = $value;

yaml/Builder.php

Spacing +9 added lines, -9 removed lines

@@ -28,7 +28,7 @@ 
 
     private static function buildNodeList(NodeList $node, &$parent)
     {
-        if ($node->type & (Y::RAW | Y::LITTERALS)) {
+        if ($node->type & (Y::RAW|Y::LITTERALS)) {
             return self::buildLitteral($node, $node->type);
         }
         $p = $parent;
@@ -55,7 +55,7 @@ 
     private static function buildNode(Node $node, &$parent)
     {
         extract((array) $node, EXTR_REFS);
-        if ($type & (Y::REF_DEF | Y::REF_CALL)) {
+        if ($type&(Y::REF_DEF|Y::REF_CALL)) {
             if (is_object($value)) {
                 $tmp = self::build($value, $parent) ?? $parent;
             } else {
@@ -151,15 +151,15 @@ 
     {
         self::$_root = new YamlObject();
         $childTypes = $list->getTypes();
-        $isaMapping  = (bool) (Y::KEY | Y::MAPPING) & $childTypes;
+        $isaMapping  = (bool) (Y::KEY|Y::MAPPING)&$childTypes;
         $isaSequence = (bool) Y::ITEM & $childTypes;
         $isaSet      = (bool) Y::SET_VALUE & $childTypes;
         if ($isaMapping && $isaSequence) {
             throw new \ParseError(sprintf(self::INVALID_DOCUMENT, $key));
         } else {
             switch (true) {
-                case $isaSequence: $list->type = Y::SEQUENCE;break;
-                case $isaSet:      $list->type = Y::SET;break;
+                case $isaSequence: $list->type = Y::SEQUENCE; break;
+                case $isaSet:      $list->type = Y::SET; break;
                 default:           $list->type = Y::MAPPING;
             }
         }
@@ -186,15 +186,15 @@ 
                 $lines[] = self::buildLitteral($child->value, $type);
             } else {
                 $prefix = '';
-                if ($type & Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) {
+                if ($type&Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) {
                     $prefix = "\n";
                 }
                 $lines[] = $prefix.$child->value;
             }
         }
-        if ($type & Y::RAW)         return implode('',   $lines);
-        if ($type & Y::LITT)        return implode("\n", $lines);
-        if ($type & Y::LITT_FOLDED) return implode(' ',  $lines);
+        if ($type&Y::RAW)         return implode('', $lines);
+        if ($type&Y::LITT)        return implode("\n", $lines);
+        if ($type&Y::LITT_FOLDED) return implode(' ', $lines);
     }
 
     private function buildSetKey(Node $node, $parent):void