dallgoot / yaml

sources/nodes/NodeSetKey.php

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
         $built = is_null($this->value) ? null : $this->value->build();
         $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/types/YamlObject.php

Braces +6 added lines, -2 removed lines

@@ -74,8 +74,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 ?? "_Empty YamlObject_";
     }
 }

sources/NodeFactory.php

Braces +19 added lines, -11 removed lines

@@ -16,10 +16,13 @@ 
     final public static function get($nodeString = null, $line = 0):Node
     {
         $trimmed = ltrim($nodeString);
-        if ($trimmed === '')                                return new NodeBlank($nodeString, $line);
-        elseif (substr($trimmed, 0, 3) === '...')           return new NodeDocEnd($nodeString, $line);
-        elseif (preg_match(Regex::KEY, $trimmed, $matches)) return new NodeKey($nodeString, $line, $matches);
-        else {
+        if ($trimmed === '') {
+            return new NodeBlank($nodeString, $line);
+        } elseif (substr($trimmed, 0, 3) === '...') {
+            return new NodeDocEnd($nodeString, $line);
+        } elseif (preg_match(Regex::KEY, $trimmed, $matches)) {
+            return new NodeKey($nodeString, $line, $matches);
+        } else {
             $first = $trimmed[0];
             $stringGroups = ["-" ,'>|' ,'"\'',"#%" ,"{[" ,":?" ,'*&!'];
             $methodGroups = ['Hyphen','Literal','Quoted','Special','Compact','SetElement','NodeAction'];
@@ -90,10 +93,13 @@ 
     final private static function onCompact(string $first, string $nodeString, int $line):Node
     {
         json_decode($nodeString, false, 512, self::JSON_OPTIONS);
-        if (json_last_error() === \JSON_ERROR_NONE)             return new NodeJSON($nodeString, $line);
-        elseif (preg_match(Regex::MAPPING, trim($nodeString)))  return new NodeCompactMapping($nodeString, $line);
-        elseif (preg_match(Regex::SEQUENCE, trim($nodeString))) return new NodeCompactSequence($nodeString, $line);
-        else {
+        if (json_last_error() === \JSON_ERROR_NONE) {
+            return new NodeJSON($nodeString, $line);
+        } elseif (preg_match(Regex::MAPPING, trim($nodeString))) {
+            return new NodeCompactMapping($nodeString, $line);
+        } elseif (preg_match(Regex::SEQUENCE, trim($nodeString))) {
+            return new NodeCompactSequence($nodeString, $line);
+        } else {
             return new NodePartial($nodeString, $line);
         }
     }
@@ -108,9 +114,11 @@ 
      */
     final private static function onHyphen(string $first, string $nodeString, int $line):Node
     {
-        if (substr($nodeString, 0, 3) === '---')              return new NodeDocStart($nodeString, $line);
-        elseif (preg_match(Regex::ITEM, ltrim($nodeString)))  return new NodeItem($nodeString, $line);
-        else {
+        if (substr($nodeString, 0, 3) === '---') {
+            return new NodeDocStart($nodeString, $line);
+        } elseif (preg_match(Regex::ITEM, ltrim($nodeString))) {
+            return new NodeItem($nodeString, $line);
+        } else {
             return new NodeScalar($nodeString, $line);
         }
     }

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);
@@ -181,9 +189,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/Node.php

Braces +15 added lines, -5 removed lines

@@ -210,13 +210,23 @@
     {
         $props = [];
         $props['line->indent'] = "$this->line -> $this->indent";
-        if ($this->identifier) $props['identifier'] = "($this->identifier)";
-        if ($this->anchor)     $props['anchor']     = "($this->anchor)";
-        if ($this->tag)        $props['tag']        = "($this->tag)";
-        if ($this->value)      $props['value']      = $this->value;
+        if ($this->identifier) {
+            $props['identifier'] = "($this->identifier)";
+        }
+        if ($this->anchor) {
+            $props['anchor']     = "($this->anchor)";
+        }
+        if ($this->tag) {
+            $props['tag']        = "($this->tag)";
+        }
+        if ($this->value) {
+            $props['value']      = $this->value;
+        }
         // $props['value'] = $this->value;
         $props['raw']   = $this->raw;
-        if (!$this->_parent)  $props['parent'] = 'NO PARENT!!!';
+        if (!$this->_parent) {
+            $props['parent'] = 'NO PARENT!!!';
+        }
         return $props;
     }
 }

sources/Loader.php

Braces +9 added lines, -3 removed lines

@@ -93,7 +93,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);
+        }
         foreach ($source as $key => $value) {
             yield ++$key => $value;
         }
@@ -116,8 +118,12 @@ 
         try {
             foreach ($generator as $lineNb => $lineString) {
                 $node = NodeFactory::get($lineString, $lineNb);
-                if ($this->_debug === 1) echo get_class($node)."\n";
-                if ($this->needsSpecialProcess($node, $previous)) continue;
+                if ($this->_debug === 1) {
+                    echo get_class($node)."\n";
+                }
+                if ($this->needsSpecialProcess($node, $previous)) {
+                    continue;
+                }
                 $this->attachBlankLines($previous);
                 switch ($node->indent <=> $previous->indent) {
                     case -1: $target = $previous->getTargetOnLessIndent($node);

sources/nodes/NodeLiterals.php

Braces +3 added lines, -1 removed lines

@@ -25,7 +25,9 @@
 
     public function add(Node $child):Node
     {
-        if (is_null($this->value)) $this->value = new NodeList();
+        if (is_null($this->value)) {
+            $this->value = new NodeList();
+        }
         $candidate = $child;
         if (!Yaml::isOneOf($child, ['NodeScalar', 'NodeBlank', 'NodeComment', 'NodeQuoted'])) {
             $candidate = new NodeScalar((string) $child->raw, $child->line);

sources/Yaml.php

Braces +3 added lines, -1 removed lines

@@ -107,7 +107,9 @@
     {
         foreach ($comparison as $className) {
             $fqn = __NAMESPACE__."\\Yaml\\$className";
-            if ($subject instanceof $fqn) return true;
+            if ($subject instanceof $fqn) {
+                return true;
+            }
         }
         return false;
     }

sources/NodeList.php

Braces +11 added lines, -5 removed lines

@@ -37,7 +37,9 @@ 
         $tmp->rewind();
         $fqn = __NAMESPACE__."\\$nodeType";
         foreach ($tmp as $child) {
-            if ($child instanceof $fqn) return true;
+            if ($child instanceof $fqn) {
+                return true;
+            }
         }
         return false;
     }
@@ -51,7 +53,9 @@ 
                 && !($child instanceof NodeDirective)
                 && !($child instanceof NodeBlank)
                 && !($child instanceof NodeDocstart
-                && is_null($child->value)) ) return true;
+                && is_null($child->value)) ) {
+                return true;
+            }
         }
         return false;
     }
@@ -59,9 +63,11 @@ 
     public function push($node)
     {
         $type = null;
-        if     ($node instanceof NodeItem )    $type = self::SEQUENCE;
-        elseif ($node instanceof NodeKey)      $type = self::MAPPING;
-        elseif ($node instanceof NodeSetKey
+        if     ($node instanceof NodeItem ) {
+            $type = self::SEQUENCE;
+        } elseif ($node instanceof NodeKey) {
+            $type = self::MAPPING;
+        } elseif ($node instanceof NodeSetKey
              || $node instanceof NodeSetValue) {
             $type = self::SET;
         } elseif ($node instanceof NodeScalar ){