dallgoot / yaml

yaml/Builder.php

Braces +20 added lines, -8 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);
     }
 
@@ -62,7 +64,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);
         }
         switch ($type) {
@@ -72,8 +76,9 @@ 
             case Y::KEY:  self::buildKey($node, $parent); return;
             case Y::SET_KEY:
                 $key = json_encode(self::build($value, $parent), JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
-                if (empty($key))
-                    throw new \Exception("Cant serialize complex key: ".var_export($value, true), 1);
+                if (empty($key)) {
+                                    throw new \Exception("Cant serialize complex key: ".var_export($value, true), 1);
+                }
                 $parent->{$key} = null;
                 return;
             case Y::SET_VALUE:
@@ -92,8 +97,11 @@ 
                     $parent->addTag($identifier); return;
                 } else {//TODO: have somewhere a list of common tags and their treatment
                     if (in_array($identifier, ['!binary', '!str'])) {
-                        if ($value->value instanceof NodeList) $value->value->type = Y::RAW;
-                        else $value->type = Y::RAW;
+                        if ($value->value instanceof NodeList) {
+                            $value->value->type = Y::RAW;
+                        } else {
+                            $value->type = Y::RAW;
+                        }
                     }
                     $val = is_null($value) ? null : self::build(/** @scrutinizer ignore-type */ $value, $node);
                     return new Tag($identifier, $val);
@@ -162,10 +170,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));

yaml/Node.php

Braces +45 added lines, -15 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;
@@ -150,8 +152,12 @@ 
             $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);
+        }
         switch ($first) {
             case '#': return [Y::COMMENT, ltrim($v)];
             case "-": return $this->onHyphen($nodeValue);
@@ -203,9 +209,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];
     }
 
@@ -220,7 +232,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)];
@@ -262,9 +276,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);
+        }
         switch ($this->type) {
             case Y::JSON:   return json_decode($v, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR);
             case Y::QUOTED: return substr($v, 1, -1);
@@ -293,9 +313,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);
     }
 
@@ -308,8 +334,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));
+        }
         // TODO: remove these if not needed
         // if preg_match("/^([\d.]+e[-+]\d{1,2})$/", $v)://fall through
         // if preg_match("/^([-+]?(?:\d+|\d*.\d+))$/", $v):

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