dallgoot / yaml

yaml/Dumper.php

Indentation +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
             switch (gettype($dataType)) {
                 case 'boolean': return $dataType ? 'true' : 'false';
                 case 'float': if (is_infinite($dataType)) return $dataType > 0 ? '.inf' : '-.inf';
-                              return sprintf('%.2F', $dataType);
+                                return sprintf('%.2F', $dataType);
                 case 'double': if (is_nan((float) $dataType)) return '.nan';
                 default:
                     return $dataType;

Spacing +3 added lines, -3 removed lines

@@ -116,7 +116,7 @@ 
         foreach ($array as $key => $item) {
             $lineStart = current($refKeys) === $key ? "- " : "- $key: ";
             if (is_scalar($item)) {
-                self::add($lineStart.self::dump($item,0), $indent);
+                self::add($lineStart.self::dump($item, 0), $indent);
             } else {
                 self::add($lineStart, $indent);
                 self::dump($item, $indent + self::INDENT);
@@ -163,10 +163,10 @@ 
         if (is_array($subject) || $subject instanceof \ArrayIterator) {
             $max = count($subject);
             $objectAsArray = is_array($subject) ? $subject : $subject->getArrayCopy();
-            if(array_keys($objectAsArray) !== range(0, $max)) {
+            if (array_keys($objectAsArray) !== range(0, $max)) {
                 $pairs = $objectAsArray;
             } else {
-                $valuesList = array_map(self::dump, $objectAsArray, array_fill( 0 , $max , $indent ));
+                $valuesList = array_map(self::dump, $objectAsArray, array_fill(0, $max, $indent));
                 return '['.implode(', ', $valuesList).']';
             }
         } else {

Braces +18 added lines, -6 removed lines

@@ -40,7 +40,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;
         if ($dataType instanceof YamlObject) {
@@ -76,9 +78,13 @@ 
         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 'float': if (is_infinite($dataType)) {
+                    return $dataType > 0 ? '.inf' : '-.inf';
+                }
                               return sprintf('%.2F', $dataType);
-                case 'double': if (is_nan((float) $dataType)) return '.nan';
+                case 'double': if (is_nan((float) $dataType)) {
+                    return '.nan';
+                }
                 default:
                     return $dataType;
             }
@@ -91,7 +97,9 @@ 
 
     private static function dumpYamlObject(YamlObject $dataType)
     {
-        if ($dataType->hasDocStart() && self::$result instanceof DLL) self::$result->push("---");
+        if ($dataType->hasDocStart() && self::$result instanceof DLL) {
+            self::$result->push("---");
+        }
         // self::dump($dataType, 0);
         if (count($dataType) > 0) {
             self::dumpSequence($dataType->getArrayCopy(), 0);
@@ -142,9 +150,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('Y-m-d');
+        if ($obj instanceof \DateTime) {
+            return $obj->format('Y-m-d');
+        }
         // if ($obj instanceof \SplString) {var_dump('splstrin',$obj);return '"'.$obj.'"';}
         $propList = get_object_vars($obj);
         foreach ($propList as $property => $value) {

yaml/Compact.php

Braces +6 added lines, -2 removed lines

@@ -25,8 +25,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);
+        }
     }
 
     /**

yaml/YamlObject.php

Braces +6 added lines, -2 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -43,9 +43,9 @@
     public function __call($funcName, $arguments)
     {
         $reflectAPI = new \ReflectionClass(get_class($this->__yaml__object__api));
-        $getName = function ($o) { return $o->name; };
+        $getName = function($o) { return $o->name; };
         $publicApi  = array_map($getName, $reflectAPI->getMethods(\ReflectionMethod::IS_PUBLIC));
-        if (!in_array($funcName, $publicApi) ) {
+        if (!in_array($funcName, $publicApi)) {
             throw new \BadMethodCallException(sprintf(self::UNDEFINED_METHOD, $funcName, implode(",", $publicApi)), 1);
         }
         return call_user_func_array([$this->__yaml__object__api, $funcName], $arguments);

yaml/NodeList.php

Spacing +5 added lines, -5 removed lines

@@ -45,16 +45,16 @@
     public function forceType()
     {
         if (is_null($this->type)) {
-            $childTypes  = $this->getTypes();
-            if ($childTypes & (Y::KEY|Y::SET_KEY)) {
-                if ($childTypes & Y::ITEM) {
+            $childTypes = $this->getTypes();
+            if ($childTypes&(Y::KEY|Y::SET_KEY)) {
+                if ($childTypes&Y::ITEM) {
                     throw new \ParseError(self::class.": Error conflicting types found");
                 }
                 $this->type = Y::MAPPING;
             } else {
-                if ($childTypes & Y::ITEM) {
+                if ($childTypes&Y::ITEM) {
                     $this->type = Y::SEQUENCE;
-                } elseif (!($childTypes & Y::COMMENT)) {
+                } elseif (!($childTypes&Y::COMMENT)) {
                     $this->type = Y::LITT_FOLDED;
                 }
             }

yaml/Node2PHP.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
         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)];
+                        Y::RAW    => strval((string) $n->value)];
         return $expected[$n->type] ?? null;
     }
 

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

example.php

Spacing +2 added lines, -2 removed lines

@@ -6,13 +6,13 @@
 /**
  * Display some use cases for Yaml library
  */
-const JSON_OPTIONS = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_LINE_TERMINATORS | JSON_UNESCAPED_UNICODE | JSON_PRESERVE_ZERO_FRACTION | JSON_PARTIAL_OUTPUT_ON_ERROR;
+const JSON_OPTIONS = JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_LINE_TERMINATORS|JSON_UNESCAPED_UNICODE|JSON_PRESERVE_ZERO_FRACTION|JSON_PARTIAL_OUTPUT_ON_ERROR;
 
 /* USE CASE 1
 * load and parse if file exists
 */
 ini_set("auto_detect_line_endings", 1);
-$content = file_get_contents('./tests/cases/parsing/multidoc_sequence.yml');//var_dump($content);
+$content = file_get_contents('./tests/cases/parsing/multidoc_sequence.yml'); //var_dump($content);
 // $content = file_get_contents('./tests/cases/examples/Example_2_17.yml');//var_dump($content);
 $yaml = Y::parse($content, null, 3);
 // $yaml = Y::parseFile('./references/Example 2.27.yml', null, 1);

yaml/TypesBuilder.php

Braces +6 added lines, -2 removed lines

@@ -17,7 +17,9 @@ 
     public static function buildReference($node, $parent)
     {
         $tmp = is_null($node->value) ? null : Builder::build($node->value, $parent);
-        if ($node->type === Y::REF_DEF) Builder::$_root->addReference($node->identifier, $tmp);
+        if ($node->type === Y::REF_DEF) {
+            Builder::$_root->addReference($node->identifier, $tmp);
+        }
         return Builder::$_root->getReference($node->identifier);
     }
 
@@ -104,7 +106,9 @@ 
         $built = is_object($node->value) ? Builder::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;
     }
 

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
      * @throws \ParseError if Key has no name(identifier) Note: empty string is allowed
      * @return null
      */
-    public static function buildKey(Node $node, &$parent=null)
+    public static function buildKey(Node $node, &$parent = null)
     {
         extract((array) $node, EXTR_REFS);
         if (is_null($identifier)) {
@@ -98,7 +98,7 @@ 
     public function buildSetKey(Node $node, &$parent)
     {
         $built = is_object($node->value) ? Builder::build($node->value) : null;
-        $stringKey = is_string($built) && Regex::isProperlyQuoted($built) ? trim($built, '\'" '): $built;
+        $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);
         $parent->{trim($key, '\'" ')} = null;
@@ -114,7 +114,7 @@ 
     {
         $prop = array_keys(get_object_vars($parent));
         $key = end($prop);
-        if ($node->value->type & (Y::ITEM|Y::KEY )) {
+        if ($node->value->type & (Y::ITEM|Y::KEY)) {
             $node->value = new NodeList($node->value);
         }
         $parent->{$key} = Builder::build(/** @scrutinizer ignore-type */ $node->value);

yaml/Node.php

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
         elseif (in_array($first, ['?', ':']))      NodeHandlers::onSetElement($nodeValue, $this);
         elseif (in_array($first, ['!', '&', '*'])) NodeHandlers::onNodeAction($nodeValue, $this);
         else {
-            $characters = [ '#' =>  [Y::COMMENT, $v],
+            $characters = ['#' =>  [Y::COMMENT, $v],
                             '%' =>  [Y::DIRECTIVE, $v],
                             '>' =>  [Y::LITT_FOLDED, null],
                             '|' =>  [Y::LITT, null]

Braces +18 added lines, -9 removed lines

@@ -68,8 +68,12 @@ 
      */
     public function getParent(int $indent = null, $type = 0):Node
     {
-        if ($this->type === Y::ROOT) return $this;
-        if (!is_int($indent)) return $this->parent ?? $this;
+        if ($this->type === Y::ROOT) {
+            return $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) {
@@ -100,7 +104,7 @@ 
         if (is_null($this->value)) {
             $this->value = $child;
             return;
-        }elseif ($this->value instanceof Node) {
+        } elseif ($this->value instanceof Node) {
             if ($this->value->type & Y::LITTERALS) {
                 $type = $this->value->type;
                 $this->value = new NodeList();
@@ -168,12 +172,17 @@ 
     {
         $v = ltrim(substr($nodeValue, 1));
         $first = $nodeValue[0];
-        if ($first === "-")                        NodeHandlers::onHyphen($nodeValue, $this);
-        elseif (in_array($first, ['"', "'"]))      NodeHandlers::onQuoted($nodeValue, $this);
-        elseif (in_array($first, ['{', '[']))      NodeHandlers::onCompact($nodeValue, $this);
-        elseif (in_array($first, ['?', ':']))      NodeHandlers::onSetElement($nodeValue, $this);
-        elseif (in_array($first, ['!', '&', '*'])) NodeHandlers::onNodeAction($nodeValue, $this);
-        else {
+        if ($first === "-") {
+            NodeHandlers::onHyphen($nodeValue, $this);
+        } elseif (in_array($first, ['"', "'"])) {
+            NodeHandlers::onQuoted($nodeValue, $this);
+        } elseif (in_array($first, ['{', '['])) {
+            NodeHandlers::onCompact($nodeValue, $this);
+        } elseif (in_array($first, ['?', ':'])) {
+            NodeHandlers::onSetElement($nodeValue, $this);
+        } elseif (in_array($first, ['!', '&', '*'])) {
+            NodeHandlers::onNodeAction($nodeValue, $this);
+        } else {
             $characters = [ '#' =>  [Y::COMMENT, $v],
                             '%' =>  [Y::DIRECTIVE, $v],
                             '>' =>  [Y::LITT_FOLDED, null],

yaml/NodeHandlers.php

Spacing +6 added lines, -6 removed lines

@@ -66,28 +66,28 @@
     public static function onCompact($value, Node $node)
     {
         $node->value = json_decode($value, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
-        if (json_last_error() === JSON_ERROR_NONE){
+        if (json_last_error() === JSON_ERROR_NONE) {
             $node->type = Y::JSON;
             return;
         }
         $node->value = new NodeList();
-        if (preg_match(R::MAPPING, $value)){
+        if (preg_match(R::MAPPING, $value)) {
             $node->type = Y::COMPACT_MAPPING;
             $node->value->type = Y::COMPACT_MAPPING;
-            preg_match_all(R::MAPPING_VALUES, trim(substr($value, 1,-1)), $matches);
+            preg_match_all(R::MAPPING_VALUES, trim(substr($value, 1, -1)), $matches);
             foreach ($matches['k'] as $index => $property) {
                 $n = new Node('', $node->line);
                 $n->type = Y::KEY;
-                $n->identifier = trim($property, '"\' ');//TODO : maybe check for proper quoting first ?
+                $n->identifier = trim($property, '"\' '); //TODO : maybe check for proper quoting first ?
                 $n->value = new Node($matches['v'][$index], $node->line);
                 $node->value->push($n);
             }
             return;
         }
-        if (preg_match(R::SEQUENCE, $value)){
+        if (preg_match(R::SEQUENCE, $value)) {
             $node->type = Y::COMPACT_SEQUENCE;
             $node->value->type = Y::COMPACT_SEQUENCE;
-            preg_match_all(R::SEQUENCE_VALUES, trim(substr($value, 1,-1)), $matches);
+            preg_match_all(R::SEQUENCE_VALUES, trim(substr($value, 1, -1)), $matches);
             foreach ($matches['item'] as $key => $item) {
                 $i = new Node('', $node->line);
                 $i->type = Y::ITEM;