dallgoot / yaml

yaml/YamlObject.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     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));
         $privateApi = array_map($getName, $reflectAPI->getMethods(\ReflectionMethod::IS_PRIVATE));
         if (!in_array($funcName, $publicApi) && !in_array($funcName, $privateApi)) {

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";
     }
 }

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 \Countable) {
             $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->push("---");
+        if ($dataType->hasDocStart()) {
+            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/Loader.php

Spacing +7 added lines, -7 removed lines

@@ -19,17 +19,17 @@ 
     /* @var null|string */
     public static $error;
 
-    public const EXCLUDE_DIRECTIVES = 1;//DONT include_directive
-    public const IGNORE_COMMENTS    = 2;//DONT include_comments
-    public const NO_PARSING_EXCEPTIONS = 4;//THROW Exception on parsing Errors
-    public const NO_OBJECT_FOR_DATE = 8;//DONT import date strings as dateTime Object
+    public const EXCLUDE_DIRECTIVES = 1; //DONT include_directive
+    public const IGNORE_COMMENTS    = 2; //DONT include_comments
+    public const NO_PARSING_EXCEPTIONS = 4; //THROW Exception on parsing Errors
+    public const NO_OBJECT_FOR_DATE = 8; //DONT import date strings as dateTime Object
     //privates
     /* @var null|string */
     private $content;
     /* @var null|string */
     private $filePath;
     /* @var integer */
-    private $debug = 0;///TODO: determine levels
+    private $debug = 0; ///TODO: determine levels
     /* @var integer */
     private $options = 0;
     //Exceptions messages
@@ -92,7 +92,7 @@ 
         $previous = $root = new Node();
         $emptyLines = [];
         try { //var_dump($source);
-            $gen = function () use($source) {
+            $gen = function() use($source) {
                 foreach ($source as $key => $value) {
                     yield ++$key => $value;
                 }
@@ -119,7 +119,7 @@ 
                     case 0:
                         if ($n->type & Y::KEY && $n->indent === 0) {
                             $target = $root;
-                        } elseif($n->type & Y::ITEM && $deepest->type & Y::KEY && is_null($deepest->value)) {
+                        } elseif ($n->type & Y::ITEM && $deepest->type & Y::KEY && is_null($deepest->value)) {
                             $target = $deepest;
                         } else {
                             $target = $previous->getParent();

Braces +15 added lines, -5 removed lines

@@ -88,7 +88,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);
+        }
         $previous = $root = new Node();
         $emptyLines = [];
         try { //var_dump($source);
@@ -101,7 +103,9 @@ 
                 $n = new Node($lineString, $lineNb);
                 $deepest = $previous->getDeepestNode();
                 if ($n->type & (Y::LITTERALS|Y::BLANK|Y::COMMENT|Y::TAG) || $deepest->type & Y::PARTIAL) {
-                    if ($this->onSpecialType($n, $previous, $emptyLines, $lineString)) continue;
+                    if ($this->onSpecialType($n, $previous, $emptyLines, $lineString)) {
+                        continue;
+                    }
                 }
                 //Note: 6.6 comments: Note that outside scalar content, a line containing only white space characters is taken to be a comment line.
                     foreach ($emptyLines as $blankNode) {
@@ -135,7 +139,9 @@ 
                             }
                         }
                 }
-                if ($this->onContextType($n, $target, $lineString)) continue;
+                if ($this->onContextType($n, $target, $lineString)) {
+                    continue;
+                }
                 $target->add($n);
                 $previous = $n;
             }
@@ -172,8 +178,12 @@ 
             return true;
         }
         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;
         }
         //comment is fullline : forces 'root' as parent IF NOT inside a LITTERAL

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/multiline_quoted_with_blank.yml');//var_dump($content);
+$content = file_get_contents('./tests/cases/parsing/multiline_quoted_with_blank.yml'); //var_dump($content);
 // $content = file_get_contents('./tests/cases/examples/Example_2_17.yml');//var_dump($content);
 $yaml = Y::parse($content, null, 2);
 // $yaml = Y::parseFile('./references/Example 2.27.yml', null, 1);

yaml/Node.php

Indentation +3 added lines, -3 removed lines

@@ -181,9 +181,9 @@
             return;
         }
         if (in_array($first, ['{', '['])) {
-             $this->onCompact(trim($nodeValue));
-             return;
-         }
+                $this->onCompact(trim($nodeValue));
+                return;
+            }
         if (in_array($first, ['!', '&', '*'])) {
             $this->onNodeAction($nodeValue);
             return;

Braces +15 added lines, -5 removed lines

@@ -68,7 +68,9 @@ 
         if ($this->type === Y::ROOT) {
             return $this;
         }
-        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) {
             if ($cursor->indent === $indent && $cursor->type !== $type) {
@@ -110,13 +112,21 @@ 
         }
         //modify type according to child
         if (is_null($this->value->type)) {
-            if ($child->type & Y::SET_KEY)   $this->value->type = Y::SET;
-            if ($child->type & Y::KEY)       $this->value->type = Y::MAPPING;
-            if ($child->type & Y::ITEM)      $this->value->type = Y::SEQUENCE;
+            if ($child->type & Y::SET_KEY) {
+                $this->value->type = Y::SET;
+            }
+            if ($child->type & Y::KEY) {
+                $this->value->type = Y::MAPPING;
+            }
+            if ($child->type & Y::ITEM) {
+                $this->value->type = Y::SEQUENCE;
+            }
         }
         $this->value->push($child);
 
-        if ($this->type & Y::LITTERALS)  $this->value->type = $this->type;
+        if ($this->type & Y::LITTERALS) {
+            $this->value->type = $this->type;
+        }
     }
 
     /**

Spacing +8 added lines, -8 removed lines

@@ -189,7 +189,7 @@ 
             return;
         }
         // Note : php don't like '?' as an array key -_-'
-        if(in_array($first, ['?', ':'])) {
+        if (in_array($first, ['?', ':'])) {
             $this->type = $first === '?' ? Y::SET_KEY : Y::SET_VALUE;
             if (!empty(trim($v))) {
                 $this->value = new NodeList;
@@ -201,7 +201,7 @@ 
             $this->onHyphen($nodeValue);
             return;
         }
-        $characters = [ '#' =>  [Y::COMMENT, ltrim($v)],
+        $characters = ['#' =>  [Y::COMMENT, ltrim($v)],
                         '%' =>  [Y::DIRECTIVE, ltrim($v)],
                         '>' =>  [Y::LITT_FOLDED, null],
                         '|' =>  [Y::LITT, null]
@@ -254,28 +254,28 @@ 
     private function onCompact($value)
     {
         $this->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) {
             $this->type = Y::JSON;
             return;
         }
         $this->value = new NodeList();
-        if (preg_match(R::MAPPING, $value)){
+        if (preg_match(R::MAPPING, $value)) {
             $this->type = Y::COMPACT_MAPPING;
             $this->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('', $this->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], $this->line);
                 $this->value->push($n);
             }
             return;
         }
-        if (preg_match(R::SEQUENCE, $value)){
+        if (preg_match(R::SEQUENCE, $value)) {
             $this->type = Y::COMPACT_SEQUENCE;
             $this->value->type = Y::COMPACT_SEQUENCE;
-            $count = preg_match_all(R::SEQUENCE_VALUES, trim(substr($value, 1,-1)), $matches);
+            $count = preg_match_all(R::SEQUENCE_VALUES, trim(substr($value, 1, -1)), $matches);
             foreach ($matches['item'] as $key => $item) {
                 $i = new Node('', $this->line);
                 $i->type = Y::ITEM;

yaml/Builder.php

Indentation +6 added lines, -6 removed lines

@@ -174,7 +174,7 @@ 
         } else {
             $tmpString = null;//var_dump("PAS ICI");
             foreach ($node as $key => $child) {
-                 if ($child->type & (Y::SCALAR|Y::QUOTED)) {
+                    if ($child->type & (Y::SCALAR|Y::QUOTED)) {
                     if ($parent) {
                         $parent->setText(self::build($child, $parent));
                     } else {
@@ -214,11 +214,11 @@ 
         }
         if ($type & Y::COMMENT) self::$_root->addComment($node->line, $node->value);
         $typesActions = [Y::DIRECTIVE => 'buildDirective',
-                         Y::ITEM      => 'buildItem',
-                         Y::KEY       => 'buildKey',
-                         Y::SET_KEY   => 'buildSetKey',
-                         Y::SET_VALUE => 'buildSetValue',
-                         Y::TAG       => 'buildTag',
+                            Y::ITEM      => 'buildItem',
+                            Y::KEY       => 'buildKey',
+                            Y::SET_KEY   => 'buildSetKey',
+                            Y::SET_VALUE => 'buildSetValue',
+                            Y::TAG       => 'buildTag',
         ];
         if (isset($typesActions[$type])) {
             return self::{$typesActions[$type]}($node, $parent);

Braces +24 added lines, -8 removed lines

@@ -44,10 +44,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));
@@ -117,7 +121,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);
     }
 
@@ -206,13 +212,17 @@ 
             } else {
                 $tmp = Node2PHP::get($node);
             }
-            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);
         }
         if ($type & (Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) {
             return self::buildNodeList($node->value, $parent);
         }
-        if ($type & Y::COMMENT) self::$_root->addComment($node->line, $node->value);
+        if ($type & Y::COMMENT) {
+            self::$_root->addComment($node->line, $node->value);
+        }
         $typesActions = [Y::DIRECTIVE => 'buildDirective',
                          Y::ITEM      => 'buildItem',
                          Y::KEY       => 'buildKey',
@@ -351,9 +361,15 @@ 
                 $lines[] = $prefix.$val;
             }
         }
-        if ($type & Y::RAW)         return implode('',   $lines);
-        if ($type & Y::LITT)        return implode("\n", $lines);
-        if ($type & Y::LITT_FOLDED) return preg_replace(['/ +(\n)/','/(\n+) +/'], "$1", implode(' ',  $lines));
+        if ($type & Y::RAW) {
+            return implode('',   $lines);
+        }
+        if ($type & Y::LITT) {
+            return implode("\n", $lines);
+        }
+        if ($type & Y::LITT_FOLDED) {
+            return preg_replace(['/ +(\n)/','/(\n+) +/'], "$1", implode(' ',  $lines));
+        }
         return '';
     }
 

Spacing +25 added lines, -25 removed lines

@@ -38,7 +38,7 @@ 
             $q->push($_root->value);
             // return self::buildNodeList($q, new YamlObject);
             self::$_root = new YamlObject;
-            $tmp =  self::buildNodeList($q, self::$_root);
+            $tmp = self::buildNodeList($q, self::$_root);
             // var_dump('alone', $tmp);
             return $tmp;
         }
@@ -87,31 +87,31 @@ 
      *
      * @return mixed    The parent (object|array) or a string representing the NodeList.
      */
-    private static function buildNodeList(NodeList $node, &$parent=null)
+    private static function buildNodeList(NodeList $node, &$parent = null)
     {
         if (is_null($node->type)) {
-            $childTypes  = $node->getTypes();
-            if ($childTypes & (Y::KEY|Y::SET_KEY)) {
-                if ($childTypes & Y::ITEM) {
+            $childTypes = $node->getTypes();
+            if ($childTypes&(Y::KEY|Y::SET_KEY)) {
+                if ($childTypes&Y::ITEM) {
                     // TODO: replace the document index in HERE ----------v
                     throw new \ParseError(sprintf(self::INVALID_DOCUMENT, 0));
                 } else {
                     $node->type = Y::MAPPING;
                 }
             } else {
-                if ($childTypes & Y::ITEM) {
+                if ($childTypes&Y::ITEM) {
                     $node->type = Y::SEQUENCE;
-                } elseif (!($childTypes & Y::COMMENT)) {
+                } elseif (!($childTypes&Y::COMMENT)) {
                     $node->type = Y::LITT_FOLDED;
                 }
             }
         }
         // var_dump('nodetype:'.Y::getName($node->type) );
-        if ($node->type & (Y::RAW | Y::LITTERALS)) {
+        if ($node->type & (Y::RAW|Y::LITTERALS)) {
             return self::buildLitteral($node, $node->type);
         }
         if ($node->type & (Y::COMPACT_MAPPING|Y::MAPPING|Y::SET)) {
-            $out = $parent ?? new \StdClass;//var_dump("PAS LA");
+            $out = $parent ?? new \StdClass; //var_dump("PAS LA");
             foreach ($node as $key => $child) {
                 if ($child->type & (Y::KEY)) {
                     self::buildKey($child, $out);
@@ -123,7 +123,7 @@ 
                 $out = new Compact($out);
             }
         } elseif ($node->type & (Y::COMPACT_SEQUENCE|Y::SEQUENCE)) {
-            $out = $parent ?? [];//var_dump("HERE");
+            $out = $parent ?? []; //var_dump("HERE");
             foreach ($node as $key => $child) {
                 if ($child->type & Y::ITEM) {
                     self::buildItem($child, $out);
@@ -135,7 +135,7 @@ 
                 $out = new Compact($out);
             }
         } else {
-            $tmpString = null;//var_dump("PAS ICI");
+            $tmpString = null; //var_dump("PAS ICI");
             foreach ($node as $key => $child) {
                  if ($child->type & (Y::SCALAR|Y::QUOTED)) {
                     if ($parent) {
@@ -163,7 +163,7 @@ 
     private static function buildNode(Node $node, &$parent)
     {
         extract((array) $node, EXTR_REFS);
-        if ($type & (Y::REF_DEF | Y::REF_CALL)) {
+        if ($type&(Y::REF_DEF|Y::REF_CALL)) {
             if (is_object($value)) {
                 $tmp = self::build($value, $parent) ?? $parent;
             } else {
@@ -172,10 +172,10 @@ 
             if ($type === Y::REF_DEF) self::$_root->addReference($identifier, $tmp);
             return self::$_root->getReference($identifier);
         }
-        if ($type & (Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) {
+        if ($type&(Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) {
             return self::buildNodeList($node->value, $parent);
         }
-        if ($type & Y::COMMENT) self::$_root->addComment($node->line, $node->value);
+        if ($type&Y::COMMENT) self::$_root->addComment($node->line, $node->value);
         $typesActions = [Y::DIRECTIVE => 'buildDirective',
                          Y::ITEM      => 'buildItem',
                          Y::KEY       => 'buildKey',
@@ -198,7 +198,7 @@ 
      * @throws \ParseError if Key has no name(identifier) Note: empty string is allowed
      * @return null
      */
-    private static function buildKey(Node $node, &$parent=null)
+    private static function buildKey(Node $node, &$parent = null)
     {
         extract((array) $node, EXTR_REFS);
         if (is_null($identifier)) {
@@ -216,7 +216,7 @@ 
             }
             if ($value instanceof NodeList) {
                 $childTypes = $value->getTypes();
-                if (is_null($value->type) && $childTypes & Y::SCALAR && !($childTypes & Y::COMMENT)) {
+                if (is_null($value->type) && $childTypes&Y::SCALAR && !($childTypes&Y::COMMENT)) {
                     $result = self::buildLitteral($value, Y::LITT_FOLDED);
                 } else {
                     $result = self::buildNodeList($value);
@@ -245,7 +245,7 @@ 
      */
     private static function buildItem(Node $node, &$parent)
     {
-        extract((array) $node, EXTR_REFS);//var_dump(__METHOD__);
+        extract((array) $node, EXTR_REFS); //var_dump(__METHOD__);
         if (!is_array($parent) && !($parent instanceof \ArrayIterator)) {
             throw new \Exception("parent must be an Iterable not ".(is_object($parent) ? get_class($parent) : gettype($parent)), 1);
         }
@@ -253,7 +253,7 @@ 
         $numKeys = array_filter(array_keys($ref), 'is_int');
         $key = count($numKeys) > 0 ? max($numKeys) + 1 : 0;
         if ($value instanceof Node) {
-            if($value->type & Y::KEY) {
+            if ($value->type & Y::KEY) {
                 self::buildKey($node->value, $parent);
                 return;
             } elseif ($value->type & Y::ITEM) {
@@ -297,13 +297,13 @@ 
                 $lines[] = self::buildLitteral($child->value, $type);
             } else {
                 $prefix = '';
-                if ($type & Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) {
+                if ($type&Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) {
                     $prefix = "\n";
                 }
                 if (!($child->type & (Y::SCALAR|Y::BLANK))) {
                     switch ($child->type) {
-                        case Y::ITEM:    $child->value = '- '.$child->value;break;
-                        case Y::COMMENT: $child->value = '# '.$child->value;break;
+                        case Y::ITEM:    $child->value = '- '.$child->value; break;
+                        case Y::COMMENT: $child->value = '# '.$child->value; break;
                         default: //die(__METHOD__.Y::getName($child->type));
                     }
                 }
@@ -314,9 +314,9 @@ 
                 $lines[] = $prefix.$val;
             }
         }
-        if ($type & Y::RAW)         return implode('',   $lines);
-        if ($type & Y::LITT)        return implode("\n", $lines);
-        if ($type & Y::LITT_FOLDED) return preg_replace(['/ +(\n)/','/(\n+) +/'], "$1", implode(' ',  $lines));
+        if ($type&Y::RAW)         return implode('', $lines);
+        if ($type&Y::LITT)        return implode("\n", $lines);
+        if ($type&Y::LITT_FOLDED) return preg_replace(['/ +(\n)/', '/(\n+) +/'], "$1", implode(' ', $lines));
         return '';
     }
 
@@ -331,7 +331,7 @@ 
     private function buildSetKey(Node $node, &$parent)
     {
         $built = is_object($node->value) ? self::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;

yaml/Node2PHP.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     public static function get(Node $n)
     {
         if (is_null($n->value)) return null;
-        if ($n->type & (Y::REF_CALL | Y::SCALAR)) return self::getScalar($n->value);
+        if ($n->type & (Y::REF_CALL|Y::SCALAR)) return self::getScalar($n->value);
         if ($n->type & Y::JSON) {
             return $n->value;
         }

Braces +18 added lines, -6 removed lines

@@ -23,8 +23,12 @@ 
      */
     public static function get(Node $n)
     {
-        if (is_null($n->value)) return null;
-        if ($n->type & (Y::REF_CALL | Y::SCALAR)) return self::getScalar($n->value);
+        if (is_null($n->value)) {
+            return null;
+        }
+        if ($n->type & (Y::REF_CALL | Y::SCALAR)) {
+            return self::getScalar($n->value);
+        }
         if ($n->type & Y::JSON) {
             return $n->value;
         }
@@ -43,8 +47,12 @@ 
      */
     private static function getScalar(string $v)
     {
-        if (R::isDate($v))   return date_create($v);
-        if (R::isNumber($v)) return self::getNumber($v);
+        if (R::isDate($v)) {
+            return date_create($v);
+        }
+        if (R::isNumber($v)) {
+            return self::getNumber($v);
+        }
         $types = ['yes'   => true,
                     'no'    => false,
                     'true'  => true,
@@ -66,8 +74,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));
+        }
         return is_bool(strpos($v, '.')) ? intval($v) : floatval($v);
     }
 }
\ No newline at end of file

Indentation +1 added lines, -1 removed lines

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