dallgoot / yaml

yaml/Node.php

Indentation +2 added lines, -2 removed lines

@@ -261,8 +261,8 @@
         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)];
+                        Y::QUOTED => substr($v, 1, -1),
+                        Y::RAW    => strval($v)];
         if (isset($expected[$this->type])) {
             return $expected[$this->type];
         }

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;

Braces +57 added lines, -19 removed lines

@@ -59,7 +59,9 @@ 
      */
     public function getParent(int $indent = null):Node
     {
-        if (!is_int($indent)) return $this->parent ?? $this;
+        if (!is_int($indent)) {
+            return $this->parent ?? $this;
+        }
         $cursor = $this;
         while ($cursor instanceof Node && $cursor->indent >= $indent) {
             $cursor = $cursor->parent;
@@ -88,9 +90,15 @@ 
             }
             $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::ITEM)               $this->value->type = Y::SEQUENCE;
-            if ($this->type & Y::LITTERALS)  $this->value->type = $this->type;
+            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;
+            }
         }
     }
 
@@ -143,10 +151,16 @@ 
             $type = R::isProperlyQuoted($nodeValue) ? Y::QUOTED : Y::PARTIAL;
             return [$type, $nodeValue];
         }
-        if (in_array($first, ['{', '[']))      return $this->onObject($nodeValue);
-        if (in_array($first, ['!', '&', '*'])) return $this->onNodeAction($nodeValue);
+        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)];
+        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)],
@@ -198,9 +212,15 @@ 
     private function onObject($value):array
     {
         json_decode($value, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
-        if (json_last_error() === JSON_ERROR_NONE)  return [Y::JSON, $value];
-        if (preg_match(R::MAPPING, $value))         return [Y::COMPACT_MAPPING, $value];
-        if (preg_match(R::SEQUENCE, $value))        return [Y::COMPACT_SEQUENCE, $value];
+        if (json_last_error() === JSON_ERROR_NONE) {
+            return [Y::JSON, $value];
+        }
+        if (preg_match(R::MAPPING, $value)) {
+            return [Y::COMPACT_MAPPING, $value];
+        }
+        if (preg_match(R::SEQUENCE, $value)) {
+            return [Y::COMPACT_SEQUENCE, $value];
+        }
         return [Y::PARTIAL, $value];
     }
 
@@ -215,7 +235,9 @@ 
     {
         if (substr($nodeValue, 0, 3) === '---') {
             $rest = trim(substr($nodeValue, 3));
-            if (empty($rest)) return [Y::DOC_START, null];
+            if (empty($rest)) {
+                return [Y::DOC_START, null];
+            }
             $n = new Node($rest, $this->line);
             $n->indent = $this->indent + 4;
             return [Y::DOC_START, $n->setParent($this)];
@@ -257,9 +279,15 @@ 
     public function getPhpValue()
     {
         $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 (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);
+        }
         $expected = [Y::JSON   => json_decode($v, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR),
                      Y::QUOTED => substr($v, 1, -1),
                      Y::RAW    => strval($v)];
@@ -288,9 +316,15 @@ 
                     '-.inf' => -INF,
                     '.nan'  => NAN
         ];
-        if (isset($types[strtolower($v)])) return $types[strtolower($v)];
-        if (R::isDate($v))   return date_create($v);
-        if (R::isNumber($v)) return self::getNumber($v);
+        if (isset($types[strtolower($v)])) {
+            return $types[strtolower($v)];
+        }
+        if (R::isDate($v)) {
+            return date_create($v);
+        }
+        if (R::isNumber($v)) {
+            return self::getNumber($v);
+        }
         return strval($v);
     }
 
@@ -303,8 +337,12 @@ 
      */
     private static function getNumber(string $v)
     {
-        if (preg_match("/^(0o\d+)$/i", $v))      return intval(base_convert($v, 8, 10));
-        if (preg_match("/^(0x[\da-f]+)$/i", $v)) return intval(base_convert($v, 16, 10));
+        if (preg_match("/^(0o\d+)$/i", $v)) {
+            return intval(base_convert($v, 8, 10));
+        }
+        if (preg_match("/^(0x[\da-f]+)$/i", $v)) {
+            return intval(base_convert($v, 16, 10));
+        }
         return is_bool(strpos($v, '.')) ? intval($v) : floatval($v);
     }
 

yaml/Builder.php

Indentation +6 added lines, -6 removed lines

@@ -65,12 +65,12 @@
             return self::$_root->getReference($identifier);
         }
         $typesActions = [Y::COMMENT   => 'buildComment',
-                         Y::DIRECTIVE => 'buildDirective',
-                         Y::ITEM      => 'buildItem',
-                         Y::KEY       => 'buildKey',
-                         Y::SET_KEY   => 'buildSetKey',
-                         Y::SET_VALUE => 'buildSetValue',
-                         Y::TAG       => 'buildTag',
+                            Y::DIRECTIVE => 'buildDirective',
+                            Y::ITEM      => 'buildItem',
+                            Y::KEY       => 'buildKey',
+                            Y::SET_KEY   => 'buildSetKey',
+                            Y::SET_VALUE => 'buildSetValue',
+                            Y::TAG       => 'buildTag',
         ];
         if (isset($typesActions[$type])) {
             return self::{$typesActions[$type]}($node, $parent);

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

Braces +29 added lines, -11 removed lines

@@ -22,7 +22,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);
     }
 
@@ -61,7 +63,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',
@@ -137,10 +141,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));
@@ -192,16 +200,23 @@ 
                 $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
     {
         $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/Loader.php

Braces +18 added lines, -6 removed lines

@@ -87,7 +87,9 @@ 
     {
         $source = $this->content ?? preg_split("/([^\n\r]+)/um", $strContent, 0, PREG_SPLIT_DELIM_CAPTURE);
         //TODO : be more permissive on $strContent values
-        if (!is_array($source) || !count($source)) throw new \Exception(self::EXCEPTION_LINE_SPLIT);
+        if (!is_array($source) || !count($source)) {
+            throw new \Exception(self::EXCEPTION_LINE_SPLIT);
+        }
         $previous = $root = new Node();
         $emptyLines = [];
         try {
@@ -99,7 +101,9 @@ 
             foreach ($gen() as $lineNb => $lineString) {
                 $n = new Node($lineString, $lineNb);
                 if ($n->type & (Y::LITTERALS|Y::BLANK)) {
-                    if ($this->onSpecialType($n, $previous, $emptyLines)) continue;
+                    if ($this->onSpecialType($n, $previous, $emptyLines)) {
+                        continue;
+                    }
                 } else {
                     foreach ($emptyLines as $blankNode) {
                         $blankNode->getParent()->add($blankNode);
@@ -113,11 +117,15 @@ 
                         break;
                     default: $target = $previous->type & Y::SCALAR ? $previous->getParent() : $previous;
                 }
-                if ($this->onContextType($n, $target, $lineString)) continue;
+                if ($this->onContextType($n, $target, $lineString)) {
+                    continue;
+                }
                 $target->add($n);
                 $previous = $n;
             }
-            if ($this->debug === 2) echo "\033[33mParsed Structure\033[0m\n",var_export($root, true);
+            if ($this->debug === 2) {
+                echo "\033[33mParsed Structure\033[0m\n",var_export($root, true);
+            }
             $out = Builder::buildContent($root, $this->debug);
             return $out;
         } catch (\Error|\Exception|\ParseError $e) {
@@ -137,8 +145,12 @@ 
     {
         $deepest = $previous->getDeepestNode();
         if ($n->type & Y::BLANK) {
-            if ($previous->type & Y::SCALAR) $emptyLines[] = $n->setParent($previous->getParent());
-            if ($deepest->type & Y::LITTERALS) $emptyLines[] = $n->setParent($deepest);
+            if ($previous->type & Y::SCALAR) {
+                $emptyLines[] = $n->setParent($previous->getParent());
+            }
+            if ($deepest->type & Y::LITTERALS) {
+                $emptyLines[] = $n->setParent($deepest);
+            }
             return true;
         }
         return false;