dallgoot / yaml

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 @@ 
                 $n = new Node($lineString, $lineNb);
                 $deepest = $previous->getDeepestNode();
                 if ($n->type & (Y::LITTERALS|Y::BLANK|Y::COMMENT|Y::TAG) || $deepest->type & Y::PARTIAL) {
-                    if ($this->onSpecialType($n, $previous, $emptyLines, $lineString)) continue;
+                    if ($this->onSpecialType($n, $previous, $emptyLines, $lineString)) {
+                        continue;
+                    }
                 }
                 //Note: 6.6 comments: Note that outside scalar content, a line containing only white space characters is taken to be a comment line.
                 foreach ($emptyLines as $blankNode) {
@@ -134,7 +138,9 @@ 
                             }
                         }
                 }
-                if ($this->onContextType($n, $target, $lineString)) continue;
+                if ($this->onContextType($n, $target, $lineString)) {
+                    continue;
+                }
                 $target->add($n);
                 $previous = $n;
             }
@@ -171,8 +177,12 @@ 
             return true;
         }
         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;
         } elseif ($n->type & Y::COMMENT
                   && !($previous->getParent()->value->type & Y::LITTERALS)

yaml/Node.php

Braces +13 added lines, -5 removed lines

@@ -71,7 +71,9 @@ 
         if ($this->type === Y::ROOT) {
             return $this;
         }
-        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) {
             if ($cursor->indent === $indent && $cursor->type !== $type) {
@@ -103,7 +105,7 @@ 
         if (is_null($current)) {
             $this->value = $child;
             return;
-        }elseif ($current instanceof Node) {
+        } elseif ($current instanceof Node) {
             $this->value = new NodeList();
             if ($current->type & Y::LITTERALS) {
                 $this->value->type = $current->type;
@@ -113,9 +115,15 @@ 
         }
         //modify type according to child
         if (is_null($this->value->type)) {
-            if ($child->type & Y::SET_KEY)   $this->value->type = Y::SET;
-            if ($child->type & Y::KEY)       $this->value->type = Y::MAPPING;
-            if ($child->type & Y::ITEM)      $this->value->type = Y::SEQUENCE;
+            if ($child->type & Y::SET_KEY) {
+                $this->value->type = Y::SET;
+            }
+            if ($child->type & Y::KEY) {
+                $this->value->type = Y::MAPPING;
+            }
+            if ($child->type & Y::ITEM) {
+                $this->value->type = Y::SEQUENCE;
+            }
         }
         $this->value->push($child);
     }

yaml/Builder.php

Braces +30 added lines, -12 removed lines

@@ -40,10 +40,14 @@ 
         }
         $_root->value instanceof NodeList && $_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 = [];
@@ -68,7 +72,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);
     }
 
@@ -131,13 +137,17 @@ 
             } else {
                 $tmp = Node2PHP::get($node);
             }
-            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);
         }
         if ($type & (Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) {
             return self::buildNodeList($node->value, $parent);
         }
-        if ($type & Y::COMMENT) self::$_root->addComment($node->line, $node->value);
+        if ($type & Y::COMMENT) {
+            self::$_root->addComment($node->line, $node->value);
+        }
         $typesActions = [Y::DIRECTIVE => 'buildDirective',
                          Y::ITEM      => 'buildItem',
                          Y::KEY       => 'buildKey',
@@ -250,18 +260,24 @@ 
         }
         $result = '';
         $separator = '';
-        if ($type & Y::LITT)         $separator = "\n";
-        if ($type & Y::LITT_FOLDED)  $separator = ' ';
+        if ($type & Y::LITT) {
+            $separator = "\n";
+        }
+        if ($type & Y::LITT_FOLDED) {
+            $separator = ' ';
+        }
         foreach ($list as $child) {
             if ($child->value instanceof NodeList) {
                 $result .= self::buildLitteral($child->value, $type).$separator;
             } else {
                 $val = $child->type & (Y::SCALAR|Y::BLANK) ? $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;
+                    }
                     continue;
                 }
                 $result .= $val.$separator;
@@ -283,7 +299,9 @@ 
         $built = is_object($node->value) ? self::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/Compact.php

Braces +6 added lines, -2 removed lines

@@ -30,8 +30,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);
+        }
         return $this;//new \Stdclass;
     }
 

yaml/Node2PHP.php

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