dallgoot / yaml

yaml/Regex.php

Braces +3 added lines, -2 removed lines

@@ -40,8 +40,9 @@
         $matchCanonical = preg_match($canonical, $v);
         $matchSpaced    = preg_match($spaced, $v);
         $matchIso       = preg_match($iso8601, $v);
-        if (is_bool($matchDate) || is_bool($matchCanonical) || is_bool($matchSpaced) || is_bool($matchIso))
-          throw new \Exception("Regex date error");
+        if (is_bool($matchDate) || is_bool($matchCanonical) || is_bool($matchSpaced) || is_bool($matchIso)) {
+                  throw new \Exception("Regex date error");
+        }
 
         return $matchDate || $matchCanonical || $matchSpaced || $matchIso;
     }

yaml/YamlObject.php

Braces +6 added lines, -2 removed lines

@@ -40,8 +40,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;
     }
 }

yaml/Node.php

Braces +45 added lines, -15 removed lines

@@ -55,7 +55,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;
@@ -146,8 +148,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);
@@ -199,9 +205,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];
     }
 
@@ -216,7 +228,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)];
@@ -259,9 +273,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);
@@ -290,9 +310,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);
     }
 
@@ -305,8 +331,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/Compact.php

Braces +6 added lines, -2 removed lines

@@ -27,8 +27,12 @@
     public function jsonSerialize()
     {
         $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);
+        }
     }
 
     public static function wrap($arrayOrObject)

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 = 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;
         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((float) $dataType)) return $dataType > 0 ? '.inf' : '-.inf';
-                case 'double': if (is_nan((float) $dataType)) return '.nan';
+                case 'float': if (is_infinite((float) $dataType)) {
+                    return $dataType > 0 ? '.inf' : '-.inf';
+                }
+                case 'double': if (is_nan((float) $dataType)) {
+                    return '.nan';
+                }
                 default:
                     return $dataType;
             }

yaml/Loader.php

Braces +15 added lines, -5 removed lines

@@ -84,9 +84,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;
@@ -115,7 +119,9 @@ 
                         case -1: $previous->getParent($n->indent)->add($n);break;
                         case 0:  $previous->getParent()->add($n);break;
                         default:
-                            if ($this->onDeepestType($n, $previous, $lineString)) continue 2;
+                            if ($this->onDeepestType($n, $previous, $lineString)) {
+                                continue 2;
+                            }
                             $previous->add($n);
                     }
                     $previous = $n;
@@ -155,8 +161,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

@@ -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);
     }
 
@@ -74,12 +76,15 @@ 
                     $tmp = $node->getPhpValue();
                 }
                 // $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:
@@ -98,8 +103,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);
@@ -168,10 +176,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));