dallgoot / yaml

documentation/examples/load_modify_save.php

Spacing +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
 <?php
 namespace Dallgoot\Yaml;
 
-require_once __DIR__ . '/../../dependencies/autoload.php';
+require_once __DIR__.'/../../dependencies/autoload.php';
 
 use Dallgoot;
 
-$fileName = __DIR__ . '/../dummy.yml';
+$fileName = __DIR__.'/../dummy.yml';
 
 $yamlObject = Yaml::parseFile($fileName, $options = null, $debug = null);
 

source/Node.php

Spacing +1 added lines, -1 removed lines

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

Braces +17 added lines, -8 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) {
@@ -171,12 +175,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, $nodeValue],
                             '%' =>  [Y::DIRECTIVE, $nodeValue],
                             '>' =>  [Y::LITT_FOLDED, null],

source/NodeHandlers.php

Spacing +6 added lines, -6 removed lines

@@ -68,28 +68,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(trim($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;

source/Tag.php

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
             case '!omap': $value->type = Y::SEQUENCE;break;
             // assumed to be !str,!binary
             default: $parent = null;
-                     $value->type = Y::RAW;
+                        $value->type = Y::RAW;
         }
         $this->value = Builder::buildNodeList($value, $parent);
         return $this->value;

Spacing +2 added lines, -2 removed lines

@@ -53,8 +53,8 @@
         $value->forceType();
         // $parent = Builder::$_root;
         switch ($this->tagName) {
-            case '!set': $value->type = Y::SET;break;
-            case '!omap': $value->type = Y::SEQUENCE;break;
+            case '!set': $value->type = Y::SET; break;
+            case '!omap': $value->type = Y::SEQUENCE; break;
             // assumed to be !str,!binary
             default: $parent = null;
                      $value->type = Y::RAW;

source/Builder.php

Spacing +12 added lines, -12 removed lines

@@ -98,27 +98,27 @@ 
      *
      * @return mixed    The parent (object|array) or a string representing the NodeList.
      */
-    public static function buildNodeList(NodeList $list, &$parent=null)
+    public static function buildNodeList(NodeList $list, &$parent = null)
     {
         $list->forceType();
-        $action = function ($child, &$parent, &$out) {
+        $action = function($child, &$parent, &$out) {
             self::build($child, $out);
         };
         $list->type = $list->type ?? Y::RAW;
         if ($list->type & (Y::RAW|Y::LITTERALS)) {
-            $tmp = self::buildLitteral($list, $list->type);//var_dump("ICI1",$list, $tmp);
+            $tmp = self::buildLitteral($list, $list->type); //var_dump("ICI1",$list, $tmp);
             return $tmp;
         } elseif ($list->type & (Y::COMPACT_MAPPING|Y::MAPPING|Y::SET)) {//var_dump("ICI2");
             $out = $parent ?? new \StdClass;
         } elseif ($list->type & (Y::COMPACT_SEQUENCE|Y::SEQUENCE)) {//var_dump("ICI3");
             $out = $parent ?? [];
         } else {
-            $out = null;//var_dump("ICI");
-            $action = function ($child, &$parent, &$out) {
+            $out = null; //var_dump("ICI");
+            $action = function($child, &$parent, &$out) {
                 if ($child->type & (Y::SCALAR|Y::QUOTED|Y::DOC_START)) {
                     $out .= Node2PHP::get($child);
                 } else {
-                    self::build($child);//var_dump("HERE");
+                    self::build($child); //var_dump("HERE");
                 }
                 // var_dump("out:".$out);
             };
@@ -152,15 +152,15 @@ 
         ];
         if (isset($actions[$type])) {
             return TB::{$actions[$type]}($node, $parent);
-        } elseif ($type & Y::COMMENT) {
+        } elseif ($type&Y::COMMENT) {
             self::$_root->addComment($line, $value);
         // } elseif ($type & Y::DOC_START) {
         //     if (!is_null($value)) {
         //         return self::build($value->value, $self::$_root);
         //     }
-        } elseif ($type & (Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) {
+        } elseif ($type&(Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) {
             return self::buildNodeList($value, $parent);
-        } elseif ($type & (Y::REF_DEF | Y::REF_CALL)) {
+        } elseif ($type&(Y::REF_DEF|Y::REF_CALL)) {
             return TB::buildReference($node, $parent);
         } elseif ($value instanceof Node) {
             return self::buildNode($value, $parent);
@@ -184,10 +184,10 @@ 
         $result = '';
         $list->rewind();
         $refIndent = $list->count() > 0 ? $list->current()->indent : 0;
-        if($list->count()) {
+        if ($list->count()) {
             //remove trailing blank
             while ($list->top()->type & Y::BLANK) $list->pop();
-            $separator = [ Y::RAW => '', Y::LITT => "\n", Y::LITT_FOLDED => ' '][$type];
+            $separator = [Y::RAW => '', Y::LITT => "\n", Y::LITT_FOLDED => ' '][$type];
             foreach ($list as $child) {
                 if ($child->value instanceof NodeList) {
                     $result .= self::buildLitteral($child->value, $type).$separator;
@@ -214,7 +214,7 @@ 
                 $val = substr($node->raw, $refIndent);
             }
         }
-        if ($type & Y::LITT_FOLDED && ($node->indent > $refIndent || ($node->type & Y::BLANK))) {
+        if ($type&Y::LITT_FOLDED && ($node->indent > $refIndent || ($node->type & Y::BLANK))) {
             if ($result[-1] === $separator)
                 $result[-1] = "\n";
             if ($result[-1] === "\n")

Braces +12 added lines, -6 removed lines

@@ -86,7 +86,9 @@ 
      */
     public 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);
     }
 
@@ -186,7 +188,9 @@ 
         $refIndent = $list->count() > 0 ? $list->current()->indent : 0;
         if($list->count()) {
             //remove trailing blank
-            while ($list->top()->type & Y::BLANK) $list->pop();
+            while ($list->top()->type & Y::BLANK) {
+                $list->pop();
+            }
             $separator = [ Y::RAW => '', Y::LITT => "\n", Y::LITT_FOLDED => ' '][$type];
             foreach ($list as $child) {
                 if ($child->value instanceof NodeList) {
@@ -215,10 +219,12 @@ 
             }
         }
         if ($type & Y::LITT_FOLDED && ($node->indent > $refIndent || ($node->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;
+            }
             return;
         }
         $result .= $val.$separator;

source/Dumper.php

Spacing +7 added lines, -7 removed lines

@@ -52,7 +52,7 @@ 
         } else {
             self::dump($dataType, 0);
         }
-        $out = implode("\n", iterator_to_array(self::$result));//var_dump(iterator_to_array(self::$result));
+        $out = implode("\n", iterator_to_array(self::$result)); //var_dump(iterator_to_array(self::$result));
         self::$result = null;
         return $out;
     }
@@ -119,7 +119,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(rtrim($lineStart), $indent);
                 self::dump($item, $indent + self::INDENT);
@@ -149,14 +149,14 @@ 
         //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 \SplString) {var_dump('splstrin',$obj);return '"'.$obj.'"';}
-        $propList = get_object_vars($obj);//var_dump($propList);
+        $propList = get_object_vars($obj); //var_dump($propList);
         foreach ($propList as $property => $value) {
             if (is_scalar($value) || $value instanceof Compact || $value instanceof \DateTime) {
-                self::add("$property: ".self::dump($value, $indent), $indent);//var_dump('IS SCALAR', $value);
+                self::add("$property: ".self::dump($value, $indent), $indent); //var_dump('IS SCALAR', $value);
             } else {
                 self::add("$property:", $indent);
                 // self::add(self::dump($value, $indent + self::INDENT), $indent + self::INDENT);var_dump('NOT SCALAR');
-                self::dump($value, $indent + self::INDENT);//var_dump('NOT SCALAR');
+                self::dump($value, $indent + self::INDENT); //var_dump('NOT SCALAR');
             }
         }
     }
@@ -166,8 +166,8 @@ 
         $pairs = [];
         if (is_array($subject) || $subject instanceof \ArrayIterator) {
             $max = count($subject);
-            $objectAsArray = is_array($subject) ? $subject : $subject->getArrayCopy();//var_dump(array_keys($objectAsArray), range(0, $max));
-            if(array_keys($objectAsArray) !== range(0, $max-1)) {
+            $objectAsArray = is_array($subject) ? $subject : $subject->getArrayCopy(); //var_dump(array_keys($objectAsArray), range(0, $max));
+            if (array_keys($objectAsArray) !== range(0, $max - 1)) {
                 $pairs = $objectAsArray;
             } else {
                 $valuesList = [];

Braces +18 added lines, -6 removed lines

@@ -42,7 +42,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,8 +78,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
@@ -94,7 +100,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);
@@ -145,9 +153,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);
+        }
         // if ($obj instanceof \SplString) {var_dump('splstrin',$obj);return '"'.$obj.'"';}
         $propList = get_object_vars($obj);//var_dump($propList);
         foreach ($propList as $property => $value) {

source/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 @@ 
      */
     public 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

source/NodeList.php

Spacing +6 added lines, -6 removed lines

@@ -60,22 +60,22 @@
     {
         if (is_null($this->type)) {
             $childTypes = $this->getTypes();
-            if ($childTypes & (Y::KEY|Y::SET_KEY)) {
-                if ($childTypes & Y::ITEM) {
+            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::DOC_START && $this->count() === 1) {var_dump(__METHOD__.' theres a DOCSTART');
+                } elseif ($childTypes&Y::DOC_START && $this->count() === 1) {var_dump(__METHOD__.' theres a DOCSTART');
                     if ($child->value instanceof Node) {
                         $this->type = $child->value->type;
                     } elseif ($child->value instanceof NodeList) {
                         $child->value->forceType();
-                        $this->type =  $child->value->type;
+                        $this->type = $child->value->type;
                     }
-                } elseif (!($childTypes & Y::COMMENT)) {
+                } elseif (!($childTypes&Y::COMMENT)) {
                     $this->type = Y::LITT_FOLDED;
                 } else {
                     $this->type = Y::SCALAR;

source/TypesBuilder.php

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)) {
@@ -99,7 +99,7 @@ 
     public static function buildSetKey(Node $node, &$parent = null)
     {
         $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;
@@ -115,7 +115,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);