dallgoot / yaml

yaml/Loader.php

Braces +18 added lines, -6 removed lines

@@ -74,9 +74,13 @@ 
     public function parse($strContent = null)
     {
         $source = $this->content;
-        if (is_null($source)) $source = preg_split("/([^\n\r]+)/um", $strContent, 0, PREG_SPLIT_DELIM_CAPTURE);
+        if (is_null($source)) {
+            $source = preg_split("/([^\n\r]+)/um", $strContent, 0, PREG_SPLIT_DELIM_CAPTURE);
+        }
         //TODO : be more permissive on $strContent values
-        if (!is_array($source)) throw new \Exception(self::EXCEPTION_LINE_SPLIT);
+        if (!is_array($source)) {
+            throw new \Exception(self::EXCEPTION_LINE_SPLIT);
+        }
         $previous = $root = new Node();
         $emptyLines = [];
         $specialTypes = Y\LITTERALS | Y\BLANK;
@@ -93,7 +97,9 @@ 
                     $deepest->parse($deepest->value.' '.ltrim($lineString));
                 } else {
                     if ($n->type & $specialTypes) {
-                        if ($this->onSpecialType($n, $parent, $previous, $emptyLines)) continue;
+                        if ($this->onSpecialType($n, $parent, $previous, $emptyLines)) {
+                            continue;
+                        }
                     }
                     foreach ($emptyLines as $key => $node) {
                         $node->getParent()->add($node);
@@ -104,7 +110,9 @@ 
                     } elseif ($n->indent === $previous->indent) {
                         $parent = $previous->getParent();
                     } elseif ($n->indent > $previous->indent) {
-                        if ($this->onDeepestType($n, $parent, $previous, $lineString)) continue;
+                        if ($this->onDeepestType($n, $parent, $previous, $lineString)) {
+                            continue;
+                        }
                     }
                     $parent->add($n);
                     $previous = $n;
@@ -139,8 +147,12 @@ 
             }
         }
         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;

yaml/Builder.php

Braces +20 added lines, -8 removed lines

@@ -19,7 +19,9 @@ 
 
     private static function build(object $node, &$parent = null)
     {
-        if ($node instanceof DLL) return self::buildDLL($node, $parent);
+        if ($node instanceof DLL) {
+            return self::buildDLL($node, $parent);
+        }
         return self::buildNode($node, $parent);
     }
 
@@ -61,12 +63,15 @@ 
             case Y\REF_DEF: //fall through
             case Y\REF_CALL://TODO: self::build returns what ?
                 $tmp = is_object($value) ? self::build($value, $parent) : $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);
             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:
@@ -85,8 +90,11 @@ 
                     $parent->addTag($identifier);return;
                 } else {
                     if (in_array($identifier, ['!binary', '!str'])) {
-                        if ($value->value instanceof DLL) $value->value->type = Y\RAW;
-                        else $value->type = Y\RAW;
+                        if ($value->value instanceof DLL) {
+                            $value->value->type = Y\RAW;
+                        } else {
+                            $value->type = Y\RAW;
+                        }
                     }
                     $val = is_null($value) ? null : self::build($value, $node);
                     return new Tag($identifier, $val);
@@ -151,10 +159,14 @@ 
         }
         $_root->value->setIteratorMode(DLL::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 DLL();
+            if (!isset($documents[$currentDoc])) {
+                $documents[$currentDoc] = new DLL();
+            }
             $documents[$currentDoc]->push($child);
         }
         $_debug >= 2 && var_dump($documents);//var_dump($documents);die("documents");

yaml/Dumper.php

Braces +12 added lines, -4 removed lines

@@ -21,7 +21,9 @@ 
 
     public function __construct(int $options = null)
     {
-        if (is_int($options)) self::$options = $options;
+        if (is_int($options)) {
+            self::$options = $options;
+        }
     }
 
     /**
@@ -36,7 +38,9 @@ 
      */
     public static function toString($dataType, int $options):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;
         self::$result->setIteratorMode(DLL::IT_MODE_FIFO | DLL::IT_MODE_DELETE);
@@ -74,8 +78,12 @@ 
         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 'double': if (is_nan($dataType)) return '.nan';
+                case 'float': if (is_infinite($dataType)) {
+                    return $dataType > 0 ? '.inf' : '-.inf';
+                }
+                case 'double': if (is_nan($dataType)) {
+                    return '.nan';
+                }
                 default:
                     return $dataType;
             }

yaml/Node.php

Braces +42 added lines, -14 removed lines

@@ -56,7 +56,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;
@@ -76,7 +78,9 @@ 
     {
         $child->setParent($this);
         $current = $this->value;
-        if ($this->type & Y\LITTERALS) $child->type = Y\SCALAR;
+        if ($this->type & Y\LITTERALS) {
+            $child->type = Y\SCALAR;
+        }
         if (is_null($current)) {
             $this->value = $child;
             return;
@@ -147,8 +151,12 @@ 
             $type = R::isProperlyQuoted($nodeValue) ? Y\QUOTED : Y\PARTIAL;
             return [$type, $nodeValue];
         }
-        if (in_array($nodeValue[0], ['{', '[']))      return $this->onObject($nodeValue);
-        if (in_array($nodeValue[0], ['!', '&', '*'])) return $this->onNodeAction($nodeValue);
+        if (in_array($nodeValue[0], ['{', '['])) {
+            return $this->onObject($nodeValue);
+        }
+        if (in_array($nodeValue[0], ['!', '&', '*'])) {
+            return $this->onNodeAction($nodeValue);
+        }
         switch ($nodeValue[0]) {
             case '#': return [Y\COMMENT, ltrim($v)];
             case "-": return $this->onHyphen($nodeValue);
@@ -200,9 +208,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\MAPPING_SHORT, $value];
-        if (preg_match(R::SEQUENCE, $value))        return [Y\SEQUENCE_SHORT, $value];
+        if (json_last_error() === JSON_ERROR_NONE) {
+            return [Y\JSON, $value];
+        }
+        if (preg_match(R::MAPPING, $value)) {
+            return [Y\MAPPING_SHORT, $value];
+        }
+        if (preg_match(R::SEQUENCE, $value)) {
+            return [Y\SEQUENCE_SHORT, $value];
+        }
         return [Y\PARTIAL, $value];
     }
 
@@ -217,7 +231,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)];
@@ -260,7 +276,9 @@ 
     public function getPhpValue()
     {
         $v = $this->value;
-        if (is_null($v)) return null;
+        if (is_null($v)) {
+            return null;
+        }
         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);
@@ -296,9 +314,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);
     }
 
@@ -311,8 +335,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):