dallgoot / yaml

yaml/Builder.php

Spacing +9 added lines, -9 removed lines

@@ -27,7 +27,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;
@@ -54,7 +54,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 {
@@ -150,15 +150,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;
             }
         }
@@ -185,15 +185,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);
         return '';
     }
 

Braces +29 added lines, -11 removed lines

@@ -21,7 +21,9 @@ 
 
     private 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);
     }
 
@@ -60,7 +62,9 @@ 
             } else {
                 $tmp = $node->getPhpValue();
             }
-            if ($type === Y::REF_DEF) self::$_root->addReference($identifier, $tmp);
+            if ($type === Y::REF_DEF) {
+                self::$_root->addReference($identifier, $tmp);
+            }
             return self::$_root->getReference($identifier);
         }
         $typesActions = [Y::COMMENT   => 'buildComment',
@@ -136,10 +140,14 @@ 
         }
         $_root->value->setIteratorMode(NodeList::IT_MODE_DELETE);
         foreach ($_root->value as $child) {
-            if ($child->type & Y::DOC_START) $totalDocStart++;
+            if ($child->type & Y::DOC_START) {
+                $totalDocStart++;
+            }
             //if 0 or 1 DOC_START = we are still in first document
             $currentDoc = $totalDocStart > 1 ? $totalDocStart - 1 : 0;
-            if (!isset($documents[$currentDoc])) $documents[$currentDoc] = new NodeList();
+            if (!isset($documents[$currentDoc])) {
+                $documents[$currentDoc] = new NodeList();
+            }
             $documents[$currentDoc]->push($child);
         }
         $content = array_map([self::class, 'buildDocument'], $documents, array_keys($documents));
@@ -191,17 +199,24 @@ 
                 $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);
+        }
         return '';
     }
 
     private function buildSetKey(Node $node, $parent):void
     {
         $key = json_encode(self::build($node->value, $parent), 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->{$key} = null;
     }
 
@@ -226,8 +241,11 @@ 
         }
         //TODO: have somewhere a list of common tags and their treatment
         if (in_array($node->identifier, ['!binary', '!str'])) {
-            if ($node->value->value instanceof NodeList) $node->value->value->type = Y::RAW;
-            else $node->value->type = Y::RAW;
+            if ($node->value->value instanceof NodeList) {
+                $node->value->value->type = Y::RAW;
+            } else {
+                $node->value->type = Y::RAW;
+            }
         }
         $val = is_null($node->value) ? null : self::build(/** @scrutinizer ignore-type */ $node->value, $node);
         return new Tag($node->identifier, $val);

yaml/Node.php

Spacing +6 added lines, -6 removed lines

@@ -94,7 +94,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;
         }
@@ -158,8 +158,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)],
@@ -277,8 +277,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)];
@@ -340,7 +340,7 @@ 
         //TODO : this should handle references present inside the string
         $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;