dallgoot / yaml

yaml/Builder.php

Doc Comments -1 removed lines

@@ -238,7 +238,6 @@
     /**
      * Builds a litteral (folded or not) or any NodeList that has YAML::RAW type (like a multiline value)
      *
-     * @param      NodeList  $children  The children
      * @param      integer   $type      The type
      *
      * @return     string    The litteral.

Spacing +16 added lines, -16 removed lines

@@ -37,7 +37,7 @@ 
             $q = new NodeList;
             $q->push($_root->value);
             self::$_root = new YamlObject;
-            $tmp =  self::buildNodeList($q, self::$_root);
+            $tmp = self::buildNodeList($q, self::$_root);
             return $tmp;
         }
         $_root->value instanceof NodeList && $_root->value->setIteratorMode(NodeList::IT_MODE_DELETE);
@@ -82,13 +82,13 @@ 
      *
      * @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)
     {
         $node->forceType();
-        if ($node->type & (Y::RAW | Y::LITTERALS)) {
+        if ($node->type & (Y::RAW|Y::LITTERALS)) {
             return self::buildLitteral($node, (int) $node->type);
         }
-        $action = function ($child, &$parent, &$out) {
+        $action = function($child, &$parent, &$out) {
             self::build($child, $out);
         };
         if ($node->type & (Y::COMPACT_MAPPING|Y::MAPPING|Y::SET)) {
@@ -97,7 +97,7 @@ 
             $out = $parent ?? [];
         } else {
             $out = '';
-            $action = function ($child, &$parent, &$out) {
+            $action = function($child, &$parent, &$out) {
                 if ($child->type & (Y::SCALAR|Y::QUOTED)) {
                     if ($parent) {
                         $parent->setText(self::build($child));
@@ -127,7 +127,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 {
@@ -136,10 +136,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',
@@ -162,7 +162,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)) {
@@ -180,7 +180,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);
@@ -209,7 +209,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);
         }
@@ -217,7 +217,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) {
@@ -254,14 +254,14 @@ 
         }
         $result = '';
         $separator = '';
-        if ($type & Y::LITT)         $separator = "\n";
-        if ($type & Y::LITT_FOLDED)  $separator = ' ';
+        if ($type&Y::LITT)         $separator = "\n";
+        if ($type&Y::LITT_FOLDED)  $separator = ' ';
         foreach ($list as $child) {
             if ($child->value instanceof NodeList) {
                 $result .= self::buildLitteral($child->value, $type).$separator;
             } else {
                 $val = $child->type & (Y::SCALAR|Y::BLANK) ? $child->value : substr($child->raw, $refIndent);
-                if ($type & Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) {
+                if ($type&Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) {
                     if ($result[-1] === $separator)
                         $result[-1] = "\n";
                     if ($result[-1] === "\n")
@@ -285,7 +285,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;

Braces +27 added lines, -11 removed lines

@@ -42,10 +42,14 @@ 
         }
         $_root->value instanceof NodeList && $_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 = [];
@@ -70,7 +74,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);
     }
 
@@ -133,13 +139,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',
@@ -254,18 +264,24 @@ 
         }
         $result = '';
         $separator = '';
-        if ($type & Y::LITT)         $separator = "\n";
-        if ($type & Y::LITT_FOLDED)  $separator = ' ';
+        if ($type & Y::LITT) {
+            $separator = "\n";
+        }
+        if ($type & Y::LITT_FOLDED) {
+            $separator = ' ';
+        }
         foreach ($list as $child) {
             if ($child->value instanceof NodeList) {
                 $result .= self::buildLitteral($child->value, $type).$separator;
             } else {
                 $val = $child->type & (Y::SCALAR|Y::BLANK) ? $child->value : substr($child->raw, $refIndent);
                 if ($type & Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->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;
+                    }
                     continue;
                 }
                 $result .= $val.$separator;

yaml/Node.php

Doc Comments +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
      * Create the Node object and parses $nodeString IF not null (else assume a root type Node)
      *
      * @param string|null $nodeString The node string
-     * @param int|null    $line       The line
+     * @param integer    $line       The line
      */
     public function __construct($nodeString = null, $line = 0)
     {
@@ -221,7 +221,7 @@ 
      * Process when a "key: value" syntax is found in the parsed string
      * Note : key is match 1, value is match 2 as per regex from R::KEY
      *
-     * @param array $matches The matches provided by 'preg_match' function in Node::parse
+     * @param string[] $matches The matches provided by 'preg_match' function in Node::parse
      */
     private function onKey(array $matches)
     {

yaml/NodeList.php

Spacing +5 added lines, -5 removed lines

@@ -40,18 +40,18 @@
     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) {
                     // TODO: replace the document index in HERE ----------v
                     throw new \ParseError(self::class.": Error conflicting types found");
                 } else {
                     $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;
                 }
             }