dallgoot / yaml

sources/NodeFactory.php

Braces +24 added lines, -14 removed lines

@@ -92,10 +92,13 @@ 
     final private static function onCompact(string $nodeString, int $line):Node
     {
         $json = json_decode($nodeString, false, 512, self::JSON_OPTIONS);
-        if (json_last_error() === \JSON_ERROR_NONE)       return new NodeJSON($nodeString, $line, $json);
-        elseif (preg_match(Regex::MAPPING, $nodeString))  return new NodeCompactMapping($nodeString, $line);
-        elseif (preg_match(Regex::SEQUENCE, $nodeString)) return new NodeCompactSequence($nodeString, $line);
-        else {
+        if (json_last_error() === \JSON_ERROR_NONE) {
+            return new NodeJSON($nodeString, $line, $json);
+        } elseif (preg_match(Regex::MAPPING, $nodeString)) {
+            return new NodeCompactMapping($nodeString, $line);
+        } elseif (preg_match(Regex::SEQUENCE, $nodeString)) {
+            return new NodeCompactSequence($nodeString, $line);
+        } else {
             return new NodePartial($nodeString, $line);
         }
     }
@@ -110,9 +113,11 @@ 
      */
     final private static function onHyphen(string $nodeString, int $line):Node
     {
-        if (substr($nodeString, 0, 3) === '---')       return new NodeDocStart($nodeString, $line);
-        elseif (preg_match(Regex::ITEM, $nodeString))  return new NodeItem($nodeString, $line);
-        else {
+        if (substr($nodeString, 0, 3) === '---') {
+            return new NodeDocStart($nodeString, $line);
+        } elseif (preg_match(Regex::ITEM, $nodeString)) {
+            return new NodeItem($nodeString, $line);
+        } else {
             return new NodeScalar($nodeString, $line);
         }
     }
@@ -126,10 +131,13 @@ 
      */
     final private static function onNodeAction(string $nodeString, int $line):Node
     {
-        if ($nodeString[0] === '!')     return new NodeTag($nodeString, $line);
-        elseif ($nodeString[0] === '&') return new NodeRefDef($nodeString, $line);
-        elseif ($nodeString[0] === '*') return new NodeRefCall($nodeString, $line);
-        else {
+        if ($nodeString[0] === '!') {
+            return new NodeTag($nodeString, $line);
+        } elseif ($nodeString[0] === '&') {
+            return new NodeRefDef($nodeString, $line);
+        } elseif ($nodeString[0] === '*') {
+            return new NodeRefCall($nodeString, $line);
+        } else {
             throw new \ParseError("Not a action node !! $nodeString[0]");
         }
     }
@@ -137,9 +145,11 @@ 
 
     final private static function onLiteral(string $nodeString, int $line):Node
     {
-        if ($nodeString[0] === '>')      return new NodeLitFolded($nodeString, $line);
-        elseif ($nodeString[0] === '|')  return new NodeLit($nodeString, $line);
-        else {
+        if ($nodeString[0] === '>') {
+            return new NodeLitFolded($nodeString, $line);
+        } elseif ($nodeString[0] === '|') {
+            return new NodeLit($nodeString, $line);
+        } else {
             throw new \ParseError("Not a literal node !! $nodeString[0]");
         }
     }

sources/Tag.php

Braces +6 added lines, -2 removed lines

@@ -45,7 +45,9 @@ 
         }
         $this->tagName = $tagName;
         $this->raw = $raw;
-        if (empty(self::$registeredHandlers)) $this->registerLegacyTags();
+        if (empty(self::$registeredHandlers)) {
+            $this->registerLegacyTags();
+        }
     }
 
     /**
@@ -143,7 +145,9 @@ 
     private final static function strHandler(object $node, object &$parent = null)
     {
         if ($node instanceof Node) {
-            if ($node instanceof NodeKey) $node->build($parent);
+            if ($node instanceof NodeKey) {
+                $node->build($parent);
+            }
             return ltrim($node->raw);
         // } elseif ($node instanceof NodeList) {
         //     return Builder::buildLitteral($node);

sources/Dumper.php

Braces +18 added lines, -6 removed lines

@@ -41,7 +41,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");
+        if (is_null($dataType)) {
+            throw new \Exception(self::class.": No content to convert to Yaml");
+        }
         self::$options = is_int($options) ? $options : self::OPTIONS;
         self::$result = new DLL;
         if ($dataType instanceof YamlObject) {
@@ -83,8 +85,12 @@ 
     private static function dump($dataType, int $indent)
     {
         if (is_scalar($dataType)) {
-            if ($dataType === INF) return '.inf';
-            if ($dataType === -INF) return '-.inf';
+            if ($dataType === INF) {
+                return '.inf';
+            }
+            if ($dataType === -INF) {
+                return '-.inf';
+            }
             switch (gettype($dataType)) {
                 case 'boolean': return $dataType ? 'true' : 'false';
                 case 'float': //fall through
@@ -106,7 +112,9 @@ 
      */
     private static function dumpYamlObject(YamlObject $obj)
     {
-        if ($obj->hasDocStart() && self::$result instanceof DLL) self::$result->push("---");
+        if ($obj->hasDocStart() && self::$result instanceof DLL) {
+            self::$result->push("---");
+        }
         // self::dump($obj, 0);
         if (count($obj) > 0) {
             self::dumpArray($obj->getArrayCopy(), 0);
@@ -182,9 +190,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(self::DATE_FORMAT);
+        if ($obj instanceof \DateTime) {
+            return $obj->format(self::DATE_FORMAT);
+        }
         $propList = get_object_vars($obj);
         foreach ($propList as $property => $value) {
             if (is_scalar($value) || $value instanceof Compact || $value instanceof \DateTime) {

sources/nodetypes/NodeSetKey.php

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
         $built = is_object($this->value) ? $this->value->build($parent) : 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($this->value, true));
+        if (empty($key)) {
+            throw new \Exception("Cant serialize complex key: ".var_export($this->value, true));
+        }
         $parent->{trim($key, '\'" ')} = null;
     }
 

sources/nodetypes/NodeBlank.php

Braces +6 added lines, -2 removed lines

@@ -21,8 +21,12 @@
         // } else {
             // $this->specialProcess($previous, $emptyLines);
         // }
-               if ($previous instanceof NodeScalar)   $emptyLines[] = $this->setParent($previous->getParent());
-        if ($deepest instanceof NodeLiterals) $emptyLines[] = $this->setParent($deepest);
+               if ($previous instanceof NodeScalar) {
+                   $emptyLines[] = $this->setParent($previous->getParent());
+               }
+        if ($deepest instanceof NodeLiterals) {
+            $emptyLines[] = $this->setParent($deepest);
+        }
         return true;
     }
 

sources/nodetypes/NodeActions.php

Braces +3 added lines, -1 removed lines

@@ -28,7 +28,9 @@
     public static function buildReference($node, $parent)
     {
         $tmp = is_null($node->value) ? null : $node->value->build($parent);
-        if ($node instanceof NodeRefDef) Builder::$_root->addReference($node->identifier, $tmp);
+        if ($node instanceof NodeRefDef) {
+            Builder::$_root->addReference($node->identifier, $tmp);
+        }
         return Builder::$_root->getReference($node->identifier);
     }
 }
\ No newline at end of file

sources/Node.php

Braces +27 added lines, -11 removed lines

@@ -68,7 +68,9 @@ 
      */
     public function getParent(int $indent = null, $type = 0):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
@@ -212,11 +214,15 @@ 
 
     public function getValue(&$parent = null)
     {
-        if (is_null($this->value))                return null;
-        elseif (is_string($this->value))          return $this->getScalar($this->value);
-        elseif ($this->value instanceof Node)     return $this->value->getValue($parent);
-        elseif ($this->value instanceof NodeList) return Builder::buildNodeList($this->value, $parent);
-        else {
+        if (is_null($this->value)) {
+            return null;
+        } elseif (is_string($this->value)) {
+            return $this->getScalar($this->value);
+        } elseif ($this->value instanceof Node) {
+            return $this->value->getValue($parent);
+        } elseif ($this->value instanceof NodeList) {
+            return Builder::buildNodeList($this->value, $parent);
+        } else {
             throw new \ParseError("Error trying to getValue of ".gettype($this->value));
         }
     }
@@ -231,8 +237,12 @@ 
      */
     public static function getScalar(string $v)
     {
-        if (Regex::isDate($v))   return self::$dateAsString ? $v : date_create($v);
-        if (Regex::isNumber($v)) return self::getNumber($v);
+        if (Regex::isDate($v)) {
+            return self::$dateAsString ? $v : date_create($v);
+        }
+        if (Regex::isNumber($v)) {
+            return self::getNumber($v);
+        }
         $types = ['yes'   => true,
                     'no'    => false,
                     'true'  => true,
@@ -255,8 +265,12 @@ 
      */
     private static function getNumber(string $v)
     {
-        if (preg_match(Regex::OCTAL_NUM, $v)) return intval(base_convert($v, 8, 10));
-        if (preg_match(Regex::HEX_NUM, $v))   return intval(base_convert($v, 16, 10));
+        if (preg_match(Regex::OCTAL_NUM, $v)) {
+            return intval(base_convert($v, 8, 10));
+        }
+        if (preg_match(Regex::HEX_NUM, $v)) {
+            return intval(base_convert($v, 16, 10));
+        }
         return is_bool(strpos($v, '.')) ? intval($v) : floatval($v);
     }
 
@@ -288,7 +302,9 @@ 
                 'value' => $this->value,
                 'raw'   => $this->raw,
             ];
-        if ($this->identifier) $props['identifier'] = "($this->identifier)";
+        if ($this->identifier) {
+            $props['identifier'] = "($this->identifier)";
+        }
         return $props;
     }
 }

sources/NodeList.php

Braces +6 added lines, -2 removed lines

@@ -28,7 +28,9 @@ 
         $tmp = clone $this;
         $tmp->rewind();
         foreach ($tmp as $child) {
-            if (is_a($child, $nodeType)) return true;
+            if (is_a($child, $nodeType)) {
+                return true;
+            }
         }
         return false;
     }
@@ -40,7 +42,9 @@ 
         foreach ($tmp as $child) {
             if (!($child instanceof NodeComment)
                 && !($child instanceof NodeDirective)
-                && !($child instanceof NodeDocstart && is_null($child->value)) ) return true;
+                && !($child instanceof NodeDocstart && is_null($child->value)) ) {
+                return true;
+            }
         }
         return false;
     }

sources/Loader.php

Braces +13 added lines, -4 removed lines

@@ -91,7 +91,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;
@@ -119,7 +121,9 @@ 
             foreach ($sourceIterator as $lineNb => $lineString) {
                 $currentLine = $lineNb;
                 $node = NodeFactory::get($lineString, $lineNb);
-                if ($node->needsSpecialProcess($previous, $emptyLines)) continue;
+                if ($node->needsSpecialProcess($previous, $emptyLines)) {
+                    continue;
+                }
                 $this->attachBlankLines($emptyLines, $previous);
                 $emptyLines = [];
                 switch ($node->indent <=> $previous->indent) {
@@ -129,11 +133,16 @@ 
                         break;
                     default: $target = $node->getTargetOnMoreIndent($previous);
                 }
-                if ($node->skipOnContext($target)) continue;//var_dump(get_class($target));
+                if ($node->skipOnContext($target)) {
+                    continue;
+                }
+                //var_dump(get_class($target));
                 $target->add($node);
                 $previous = $node;
             }
-            if ($this->debug === 2) print_r($root);
+            if ($this->debug === 2) {
+                print_r($root);
+            }
             return Builder::buildContent($root, $this->debug);
         } catch (\Error|\Exception|\ParseError $e) {
             $file = $this->filePath ? realpath($this->filePath) : '#YAML STRING#';