dallgoot / yaml

example.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__.'/vendor/autoload.php';
 
 use \Dallgoot\Yaml as Y;
 
@@ -10,7 +10,7 @@ 
 /* USE CASE 1
 * load and parse if file exists
 */
-$yaml = Y::parseFile('./tests/cases/examples/Example_2_18.yml', null, 2);//->parse();
+$yaml = Y::parseFile('./tests/cases/examples/Example_2_18.yml', null, 2); //->parse();
 // $yaml = Y::parseFile('./references/Example 2.27.yml', null, 1);
 var_dump($yaml);
 exit(0);

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;
 
     /**
      * NodeList constructor

yaml/Yaml.php

Spacing +4 added lines, -4 removed lines

@@ -21,14 +21,14 @@
     const ITEM             = 128;
     const JSON             = 256;
     const KEY              = 512;
-    const LITT             = 1024;//litteral
-    const LITT_FOLDED      = 2048;//litteral
+    const LITT             = 1024; //litteral
+    const LITT_FOLDED      = 2048; //litteral
     const MAPPING          = 4096;
     const PARTIAL          = 8192;
     const QUOTED           = 16384;
     const RAW              = 32768;
-    const REF_CALL         = 65536;//reference
-    const REF_DEF          = 131072;//reference
+    const REF_CALL         = 65536; //reference
+    const REF_DEF          = 131072; //reference
     const ROOT             = 262144;
     const SCALAR           = 524288;
     const SEQUENCE         = 1048576;

yaml/Regex.php

Indentation +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         $matchSpaced    = preg_match($spaced, $v);
         $matchIso       = preg_match($iso8601, $v);
         if (is_bool($matchDate) || is_bool($matchCanonical) || is_bool($matchSpaced) || is_bool($matchIso))
-          throw new \Exception("Regex date error");
+            throw new \Exception("Regex date error");
 
         return $matchDate || $matchCanonical || $matchSpaced || $matchIso;
     }

yaml/Builder.php

Spacing +8 added lines, -8 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;
@@ -56,7 +56,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 {
@@ -176,15 +176,15 @@ 
     {
         self::$_root = new YamlObject();
         $childTypes = $list->getTypes();
-        $isMapping  = (bool) (Y::KEY | Y::MAPPING) & $childTypes;
+        $isMapping  = (bool) (Y::KEY|Y::MAPPING)&$childTypes;
         $isSequence = (bool) Y::ITEM & $childTypes;
         $isSet      = (bool) 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;
             }
         }
@@ -206,11 +206,11 @@ 
         $children->rewind();
         $refIndent = $children->current()->indent;
         $separator = $type === Y::RAW ? '' : "\n";
-        $action = function ($c) { return (string) $c->value; };
+        $action = function($c) { return (string) $c->value; };
         //TODO: use iterator_to_array for LITT & RAW
-        if ($type & Y::LITT_FOLDED) {
+        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);
     }
 
@@ -62,7 +64,9 @@ 
             } else {
                 $tmp = $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);
         }
         switch ($type) {
@@ -72,8 +76,9 @@ 
             case Y::KEY:  self::buildKey($node, $parent); return;
             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:
@@ -92,8 +97,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);
@@ -162,10 +170,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];
     }
 
@@ -263,8 +263,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);
@@ -320,7 +320,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;

Braces +45 added lines, -15 removed lines

@@ -59,7 +59,9 @@ 
      */
     public function getParent(int $indent = null):Node
     {
-        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) {
             $cursor = $cursor->parent;
@@ -150,8 +152,12 @@ 
             $type = R::isProperlyQuoted($nodeValue) ? Y::QUOTED : Y::PARTIAL;
             return [$type, $nodeValue];
         }
-        if (in_array($first, ['{', '[']))      return $this->onObject($nodeValue);
-        if (in_array($first, ['!', '&', '*'])) return $this->onNodeAction($nodeValue);
+        if (in_array($first, ['{', '['])) {
+            return $this->onObject($nodeValue);
+        }
+        if (in_array($first, ['!', '&', '*'])) {
+            return $this->onNodeAction($nodeValue);
+        }
         switch ($first) {
             case '#': return [Y::COMMENT, ltrim($v)];
             case "-": return $this->onHyphen($nodeValue);
@@ -203,9 +209,15 @@ 
     private function onObject($value):array
     {
         json_decode($value, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
-        if (json_last_error() === JSON_ERROR_NONE)  return [Y::JSON, $value];
-        if (preg_match(R::MAPPING, $value))         return [Y::COMPACT_MAPPING, $value];
-        if (preg_match(R::SEQUENCE, $value))        return [Y::COMPACT_SEQUENCE, $value];
+        if (json_last_error() === JSON_ERROR_NONE) {
+            return [Y::JSON, $value];
+        }
+        if (preg_match(R::MAPPING, $value)) {
+            return [Y::COMPACT_MAPPING, $value];
+        }
+        if (preg_match(R::SEQUENCE, $value)) {
+            return [Y::COMPACT_SEQUENCE, $value];
+        }
         return [Y::PARTIAL, $value];
     }
 
@@ -220,7 +232,9 @@ 
     {
         if (substr($nodeValue, 0, 3) === '---') {
             $rest = trim(substr($nodeValue, 3));
-            if (empty($rest)) return [Y::DOC_START, null];
+            if (empty($rest)) {
+                return [Y::DOC_START, null];
+            }
             $n = new Node($rest, $this->line);
             $n->indent = $this->indent + 4;
             return [Y::DOC_START, $n->setParent($this)];
@@ -262,9 +276,15 @@ 
     public function getPhpValue()
     {
         $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 (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);
+        }
         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);
@@ -293,9 +313,15 @@ 
                   '-.inf' => -INF,
                   '.nan'  => NAN
         ];
-        if (isset($types[strtolower($v)])) return $types[strtolower($v)];
-        if (R::isDate($v))   return date_create($v);
-        if (R::isNumber($v)) return self::getNumber($v);
+        if (isset($types[strtolower($v)])) {
+            return $types[strtolower($v)];
+        }
+        if (R::isDate($v)) {
+            return date_create($v);
+        }
+        if (R::isNumber($v)) {
+            return self::getNumber($v);
+        }
         return strval($v);
     }
 
@@ -308,8 +334,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));
+        }
         // TODO: remove these if not needed
         // if preg_match("/^([\d.]+e[-+]\d{1,2})$/", $v)://fall through
         // if preg_match("/^([-+]?(?:\d+|\d*.\d+))$/", $v):

yaml/Loader.php

Spacing +7 added lines, -7 removed lines

@@ -19,17 +19,17 @@ 
     /* @var null|string */
     public $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
@@ -117,7 +117,7 @@ 
                 $target->add($n);
                 $previous = $n;
             }
-            if ($this->debug === 2) echo "\033[33mParsed Structure\033[0m\n",var_export($root, true);
+            if ($this->debug === 2) echo "\033[33mParsed Structure\033[0m\n", var_export($root, true);
             $out = Builder::buildContent($root, $this->debug);
             return $out;
         } catch (\Error|\Exception|\ParseError $e) {
@@ -155,7 +155,7 @@ 
             $deepest->parse($deepest->value.' '.ltrim($lineString));
             return true;
         }
-        if(($previous->type & Y::LITTERALS) || (($deepest->type & Y::LITTERALS) && is_null($deepest->value))) {
+        if (($previous->type & Y::LITTERALS) || (($deepest->type & Y::LITTERALS) && is_null($deepest->value))) {
             $n->type = Y::SCALAR;
             $n->identifier = null;
             $n->value = trim($lineString);

Braces +18 added lines, -6 removed lines

@@ -87,7 +87,9 @@ 
     {
         $source = $this->content ?? preg_split("/([^\n\r]+)/um", $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 {
@@ -99,7 +101,9 @@ 
             foreach ($gen() as $lineNb => $lineString) {
                 $n = new Node($lineString, $lineNb);
                 if ($n->type & (Y::LITTERALS|Y::BLANK)) {
-                    if ($this->onSpecialType($n, $previous, $emptyLines)) continue;
+                    if ($this->onSpecialType($n, $previous, $emptyLines)) {
+                        continue;
+                    }
                 } else {
                     foreach ($emptyLines as $blankNode) {
                         $blankNode->getParent()->add($blankNode);
@@ -113,11 +117,15 @@ 
                         break;
                     default: $target = $previous;
                 }
-                if ($this->onContextType($n, $target, $lineString)) continue;
+                if ($this->onContextType($n, $target, $lineString)) {
+                    continue;
+                }
                 $target->add($n);
                 $previous = $n;
             }
-            if ($this->debug === 2) echo "\033[33mParsed Structure\033[0m\n",var_export($root, true);
+            if ($this->debug === 2) {
+                echo "\033[33mParsed Structure\033[0m\n",var_export($root, true);
+            }
             $out = Builder::buildContent($root, $this->debug);
             return $out;
         } catch (\Error|\Exception|\ParseError $e) {
@@ -137,8 +145,12 @@ 
     {
         $deepest = $previous->getDeepestNode();
         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/Dumper.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         // foreach (self::$result as $value) {
         //     $out .= $value."\n";
         // }
-        $out = implode("\n", iterator_to_array(self::$result));//TODO: replace by iterator_to_array and implode ???
+        $out = implode("\n", iterator_to_array(self::$result)); //TODO: replace by iterator_to_array and implode ???
         self::$result = null;
         return $out;
     }