dallgoot / yaml

yaml/Loader.php

Spacing +7 added lines, -7 removed lines

@@ -17,17 +17,17 @@ 
     //public
     public $errors = [];
 
-    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
@@ -112,8 +112,8 @@ 
                     }
                     $emptyLines = [];
                     switch ($n->indent <=> $previous->indent) {
-                        case -1: $previous->getParent($n->indent)->add($n);break;
-                        case 0:  $previous->getParent()->add($n);break;
+                        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;
                             $previous->add($n);

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

Spacing +7 added lines, -7 removed lines

@@ -29,7 +29,7 @@ 
     private static function buildNodeList(NodeList $node, &$parent)
     {
         $type = &$node->type;
-        if ($type & (Y\RAW | Y\LITTERALS)) {
+        if ($type&(Y\RAW|Y\LITTERALS)) {
             return self::litteral($node, $type);
         }
         $p = $parent;
@@ -182,15 +182,15 @@ 
     {
         self::$_root = new YamlObject();
         $childTypes = $list->getTypes();
-        $isMapping  = (Y\KEY | Y\MAPPING) & $childTypes;
+        $isMapping  = (Y\KEY|Y\MAPPING)&$childTypes;
         $isSequence = Y\ITEM & $childTypes;
         $isSet      = Y\SET_VALUE & $childTypes;
         if ($isMapping && $isSequence) {
             throw new \ParseError(sprintf(self::INVALID_DOCUMENT, $key));
         } else {
             switch (true) {
-                case $isSequence: $list->type = Y\SEQUENCE;break;
-                case $isSet:      $list->type = Y\SET;break;
+                case $isSequence: $list->type = Y\SEQUENCE; break;
+                case $isSet:      $list->type = Y\SET; break;
                 default:          $list->type = Y\MAPPING;
             }
         }
@@ -212,10 +212,10 @@ 
         $children->rewind();
         $refIndent = $children->current()->indent;
         $separator = $type === Y\RAW ? '' : "\n";
-        $action = function ($c) { return $c->value; };
-        if ($type & Y\LITT_FOLDED) {
+        $action = function($c) { return $c->value; };
+        if ($type&Y\LITT_FOLDED) {
             $separator = ' ';
-            $action = function ($c) use ($refIndent) {
+            $action = function($c) use ($refIndent) {
                 return $c->indent > $refIndent || ($c->type & Y\BLANK) ? "\n".$c->value : $c->value;
             };
         }

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));

yaml/Node.php

Spacing +10 added lines, -10 removed lines

@@ -94,8 +94,8 @@ 
             //modify type according to child
             switch ($child->type) {
                 case Y\COMMENT: //fall through
-                case Y\KEY:     $this->value->type = Y\MAPPING;break;
-                case Y\ITEM:    $this->value->type = Y\SEQUENCE;break;
+                case Y\KEY:     $this->value->type = Y\MAPPING; break;
+                case Y\ITEM:    $this->value->type = Y\SEQUENCE; break;
             }
             $this->type & Y\LITTERALS && $this->value->type = $this->type;
         }
@@ -119,7 +119,7 @@ 
      */
     public function parse(string $nodeString):Node
     {
-        $nodeValue = preg_replace("/^\t+/m", " ", $nodeString);//permissive to tabs but replacement
+        $nodeValue = preg_replace("/^\t+/m", " ", $nodeString); //permissive to tabs but replacement
         $this->indent = strspn($nodeValue, ' ');
         $nodeValue = ltrim($nodeValue);
         if ($nodeValue === '') {
@@ -156,7 +156,7 @@ 
             case '#': return [Y\COMMENT, ltrim($v)];
             case "-": return $this->onHyphen($nodeValue);
             case '%': return [Y\DIRECTIVE, ltrim($v)];
-            case '?': return [Y\SET_KEY,   empty($v) ? null : new Node(ltrim($v), $this->line)];
+            case '?': return [Y\SET_KEY, empty($v) ? null : new Node(ltrim($v), $this->line)];
             case ':': return [Y\SET_VALUE, empty($v) ? null : new Node(ltrim($v), $this->line)];
             case '>': return [Y\LITT_FOLDED, null];
             case '|': return [Y\LITT, null];
@@ -181,8 +181,8 @@ 
             if (!is_bool($hasComment)) {
                 $tmpNode = new Node(trim(substr($value, 0, $hasComment)), $this->line);
                 if ($tmpNode->type !== Y\PARTIAL) {
-                    $comment = new Node(trim(substr($value, $hasComment+1)), $this->line);
-                    $comment->identifier = true;//to specify it is NOT a fullline comment
+                    $comment = new Node(trim(substr($value, $hasComment + 1)), $this->line);
+                    $comment->identifier = true; //to specify it is NOT a fullline comment
                     $this->add($comment);
                     $n = $tmpNode;
                 }
@@ -250,7 +250,7 @@ 
         $type = ['!' => Y\TAG, '&' => Y\REF_DEF, '*' => Y\REF_CALL][$nodeValue[0]];
         $pos = strpos($v, ' ');
         $this->identifier = is_bool($pos) ? $v : strstr($v, ' ', true);
-        $n = is_bool($pos) ? null : (new Node(trim(substr($nodeValue, $pos+1)), $this->line))->setParent($this);
+        $n = is_bool($pos) ? null : (new Node(trim(substr($nodeValue, $pos + 1)), $this->line))->setParent($this);
         return [$type, $n];
     }
 
@@ -264,8 +264,8 @@ 
     {
         $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 ($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);
@@ -321,7 +321,7 @@ 
     {
         $out = new Compact();
         if ($type === Y\COMPACT_SEQUENCE) {
-            $f = function ($e) { return self::getScalar(trim($e));};
+            $f = function($e) { return self::getScalar(trim($e)); };
             //TODO : that's not robust enough, improve it
             foreach (array_map($f, explode(",", $mappingOrSeqString)) as $key => $value) {
                 $out[$key] = $value;

yaml/NodeList.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 class NodeList extends \SplDoublyLinkedList
 {
     /* @var null|int */
-    public $type = null;//Y\LITT_FOLDED;
+    public $type = null; //Y\LITT_FOLDED;
 
     public function __construct()
     {