dallgoot / yaml

yaml/Dumper.php

Indentation +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
             switch (gettype($dataType)) {
                 case 'boolean': return $dataType ? 'true' : 'false';
                 case 'float': if (is_infinite($dataType)) return $dataType > 0 ? '.inf' : '-.inf';
-                              return sprintf('%.2F', $dataType);
+                                return sprintf('%.2F', $dataType);
                 case 'double': if (is_nan((float) $dataType)) return '.nan';
                 default:
                     return $dataType;

Braces +18 added lines, -6 removed lines

@@ -40,7 +40,9 @@ 
      */
     public static function toString($dataType, int $options = null):string
     {
-        if (is_null($dataType)) throw new \Exception(self::class.": No content to convert to Yaml", 1);
+        if (is_null($dataType)) {
+            throw new \Exception(self::class.": No content to convert to Yaml", 1);
+        }
         self::$options = is_int($options) ? $options : self::OPTIONS;
         self::$result = new DLL;
         if ($dataType instanceof YamlObject) {
@@ -76,9 +78,13 @@ 
         if (is_scalar($dataType)) {
             switch (gettype($dataType)) {
                 case 'boolean': return $dataType ? 'true' : 'false';
-                case 'float': if (is_infinite($dataType)) return $dataType > 0 ? '.inf' : '-.inf';
+                case 'float': if (is_infinite($dataType)) {
+                    return $dataType > 0 ? '.inf' : '-.inf';
+                }
                               return sprintf('%.2F', $dataType);
-                case 'double': if (is_nan((float) $dataType)) return '.nan';
+                case 'double': if (is_nan((float) $dataType)) {
+                    return '.nan';
+                }
                 default:
                     return $dataType;
             }
@@ -91,7 +97,9 @@ 
 
     private static function dumpYamlObject(YamlObject $dataType)
     {
-        if ($dataType->hasDocStart() && self::$result instanceof DLL) self::$result->push("---");
+        if ($dataType->hasDocStart() && self::$result instanceof DLL) {
+            self::$result->push("---");
+        }
         // self::dump($dataType, 0);
         if (count($dataType) > 0) {
             self::dumpSequence($dataType->getArrayCopy(), 0);
@@ -142,9 +150,13 @@ 
                 self::add(self::dump($obj->value, $indent + self::INDENT), $indent + self::INDENT);
             }
         }
-        if ($obj instanceof Compact) return self::dumpCompact($obj, $indent);
+        if ($obj instanceof Compact) {
+            return self::dumpCompact($obj, $indent);
+        }
         //TODO:  consider dumping datetime as date strings according to a format provided by user or default
-        if ($obj instanceof \DateTime) return $obj->format('Y-m-d');
+        if ($obj instanceof \DateTime) {
+            return $obj->format('Y-m-d');
+        }
         // if ($obj instanceof \SplString) {var_dump('splstrin',$obj);return '"'.$obj.'"';}
         $propList = get_object_vars($obj);
         foreach ($propList as $property => $value) {

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/YamlObject.php

Braces +6 added lines, -2 removed lines

@@ -52,8 +52,12 @@
     {
         $prop = get_object_vars($this);
         unset($prop["__yaml__object__api"]);
-        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);
+        }
         return $this->__yaml__object__api->value ?? "Empty YamlObject";
     }
 }

yaml/Node2PHP.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
         if ($n->type & (Y::REF_CALL|Y::SCALAR)) return self::getScalar((string) $n->value);
         if ($n->type & Y::JSON) return $n->value;
         $expected = [Y::QUOTED => trim((string) $n->value, "\"'"),
-                     Y::RAW    => strval((string) $n->value)];
+                        Y::RAW    => strval((string) $n->value)];
         return $expected[$n->type] ?? null;
     }
 

Braces +21 added lines, -7 removed lines

@@ -23,9 +23,15 @@ 
      */
     public static function get(Node $n)
     {
-        if (is_null($n->value)) return null;
-        if ($n->type & (Y::REF_CALL|Y::SCALAR)) return self::getScalar((string) $n->value);
-        if ($n->type & Y::JSON) return $n->value;
+        if (is_null($n->value)) {
+            return null;
+        }
+        if ($n->type & (Y::REF_CALL|Y::SCALAR)) {
+            return self::getScalar((string) $n->value);
+        }
+        if ($n->type & Y::JSON) {
+            return $n->value;
+        }
         $expected = [Y::QUOTED => trim((string) $n->value, "\"'"),
                      Y::RAW    => strval((string) $n->value)];
         return $expected[$n->type] ?? null;
@@ -41,8 +47,12 @@ 
      */
     private static function getScalar(string $v)
     {
-        if (R::isDate($v))   return self::$dateAsString ? $v : date_create($v);
-        if (R::isNumber($v)) return self::getNumber($v);
+        if (R::isDate($v)) {
+            return self::$dateAsString ? $v : date_create($v);
+        }
+        if (R::isNumber($v)) {
+            return self::getNumber($v);
+        }
         $types = ['yes'   => true,
                     'no'    => false,
                     'true'  => true,
@@ -64,8 +74,12 @@ 
      */
     private static function getNumber(string $v)
     {
-        if (preg_match(R::OCTAL_NUM, $v)) return intval(base_convert($v, 8, 10));
-        if (preg_match(R::HEX_NUM, $v))   return intval(base_convert($v, 16, 10));
+        if (preg_match(R::OCTAL_NUM, $v)) {
+            return intval(base_convert($v, 8, 10));
+        }
+        if (preg_match(R::HEX_NUM, $v)) {
+            return intval(base_convert($v, 16, 10));
+        }
         return is_bool(strpos($v, '.')) ? intval($v) : floatval($v);
     }
 }
\ No newline at end of file

yaml/TypesBuilder.php

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;
     }
 

yaml/Node.php

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/Builder.php

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/Loader.php

Braces +15 added lines, -5 removed lines

@@ -77,7 +77,9 @@ 
     {
         $source = $this->content ?? preg_split("/\n/m", preg_replace('/(\r\n|\r)/', "\n", $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);
+        }
         return function () use($source) {
             foreach ($source as $key => $value) {
                 yield ++$key => $value;
@@ -105,7 +107,9 @@ 
         try {
             foreach ($sourceIterator() as $lineNb => $lineString) {
                 $n = new Node($lineString, $lineNb);
-                if ($this->onSpecialType($n, $previous, $emptyLines, $lineString)) continue;
+                if ($this->onSpecialType($n, $previous, $emptyLines, $lineString)) {
+                    continue;
+                }
                 $this->attachBlankLines($emptyLines, $previous);
                 $emptyLines = [];
                 $target = $previous;
@@ -117,7 +121,9 @@ 
                     default:
                         $this->onMoreIndent($previous, $target);
                 }
-                if ($this->onContextType($n, $target, $lineString)) continue;
+                if ($this->onContextType($n, $target, $lineString)) {
+                    continue;
+                }
                 $target->add($n);
                 $previous = $n;
             }
@@ -200,8 +206,12 @@ 
 
     private function onSpecialBlank(array &$emptyLines, Node $n, Node $previous, Node $deepest)
     {
-        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);
+        }
     }
 
     private function onContextType(Node &$n, Node &$previous, $lineString):bool