dallgoot / yaml

yaml/Builder.php

Spacing +13 added lines, -13 removed lines

@@ -43,7 +43,7 @@ 
      */
     private static function buildNodeList(NodeList $node, &$parent)
     {
-        if ($node->type & (Y::RAW | Y::LITTERALS)) {
+        if ($node->type & (Y::RAW|Y::LITTERALS)) {
             return self::buildLitteral($node, $node->type);
         }
         $p = $parent;
@@ -51,7 +51,7 @@ 
             case Y::MAPPING: // fall through
             // case Y::SET_KEY: // fall through
             case Y::SET:      $p = new \StdClass; var_dump('in set'); break;
-            case Y::SEQUENCE: $p = [];break;
+            case Y::SEQUENCE: $p = []; break;
             // case Y::KEY: $p = $parent;break;
         }
         $out = null;
@@ -79,7 +79,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 {
@@ -200,15 +200,15 @@ 
     {
         self::$_root = new YamlObject();
         $childTypes = $list->getTypes();
-        $isaMapping  = (bool) (Y::KEY | Y::MAPPING) & $childTypes;
+        $isaMapping  = (bool) (Y::KEY|Y::MAPPING)&$childTypes;
         $isaSequence = (bool) Y::ITEM & $childTypes;
         $isaSet      = (bool) Y::SET_VALUE & $childTypes;
         if ($isaMapping && $isaSequence) {
             throw new \ParseError(sprintf(self::INVALID_DOCUMENT, $key));
         } else {
             switch (true) {
-                case $isaSequence: $list->type = Y::SEQUENCE;break;
-                case $isaSet:      $list->type = Y::SET;break;
+                case $isaSequence: $list->type = Y::SEQUENCE; break;
+                case $isaSet:      $list->type = Y::SET; break;
                 default:           $list->type = Y::MAPPING;
             }
         }
@@ -243,22 +243,22 @@ 
                 $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(Y::getName($child->type));
                     }
                 }
                 $lines[] = $prefix.$child->value;
             }
         }
-        if ($type & Y::RAW)         return implode('',   $lines);
-        if ($type & Y::LITT)        return implode("\n", $lines);
-        if ($type & Y::LITT_FOLDED) return implode(' ',  $lines);
+        if ($type&Y::RAW)         return implode('', $lines);
+        if ($type&Y::LITT)        return implode("\n", $lines);
+        if ($type&Y::LITT_FOLDED) return implode(' ', $lines);
         return '';
     }
 
@@ -273,7 +273,7 @@ 
     private function buildSetKey(Node $node, &$parent)
     {
         $built = self::build($node->value, $parent);
-        $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/Loader.php

Spacing +7 added lines, -7 removed lines

@@ -18,17 +18,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
@@ -90,7 +90,7 @@ 
         $previous = $root = new Node();
         $emptyLines = [];
         try {
-            $gen = function () use($source) {
+            $gen = function() use($source) {
                 foreach ($source as $key => $value) {
                     yield ++$key => $value;
                 }
@@ -109,7 +109,7 @@ 
                         break;
                     case 0:  $target = $previous->getParent();
                         break;
-                    default: $target = $previous->type & Y::ITEM && $n->type != Y::SET_VALUE? $previous->getDeepestNode()->getParent($n->indent) : $previous;
+                    default: $target = $previous->type & Y::ITEM && $n->type != Y::SET_VALUE ? $previous->getDeepestNode()->getParent($n->indent) : $previous;
                 }
                 if ($this->onContextType($n, $target, $lineString)) continue;
                 $target->add($n);

yaml/Node.php

Spacing +6 added lines, -6 removed lines

@@ -86,7 +86,7 @@ 
      */
     public function add(Node $child)
     {
-        if($this->type & (Y::SCALAR|Y::QUOTED)) {
+        if ($this->type & (Y::SCALAR|Y::QUOTED)) {
             $this->getParent()->add($child);
             return;
         }
@@ -171,8 +171,8 @@ 
         if (in_array($first, ['{', '[']))      return $this->onObject($nodeValue);
         if (in_array($first, ['!', '&', '*'])) return $this->onNodeAction($nodeValue);
         // Note : php don't like '?' as an array key -_-
-        if($first === '?') return [Y::SET_KEY, empty(trim($v)) ? null : new Node(ltrim($v), $this->line)];
-        $characters = [ '#' =>  [Y::COMMENT, ltrim($v)],
+        if ($first === '?') return [Y::SET_KEY, empty(trim($v)) ? null : new Node(ltrim($v), $this->line)];
+        $characters = ['#' =>  [Y::COMMENT, ltrim($v)],
                         "-" =>  $this->onHyphen($nodeValue),
                         '%' =>  [Y::DIRECTIVE, ltrim($v)],
                         ':' =>  [Y::SET_VALUE, empty(trim($v)) ? null : new Node(ltrim($v), $this->line)],
@@ -291,8 +291,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);
         $expected = [Y::JSON   => json_decode($v, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR),
                      Y::QUOTED => substr($v, 1, -1),
                      Y::RAW    => strval($v)];
@@ -354,7 +354,7 @@ 
         //TODO : this should handle references present inside the string
         $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;

example.php

Spacing +2 added lines, -2 removed lines

@@ -6,14 +6,14 @@
 /**
  * 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);
 // $yaml = Y::parseFile('./tests/cases/parsing/blockChompingWithInsideBlank.yml', null, 0); //->parse();
-$content = file_get_contents('./tests/cases/parsing/complex_mapping_in_item.yml');//var_dump($content);
+$content = file_get_contents('./tests/cases/parsing/complex_mapping_in_item.yml'); //var_dump($content);
 $yaml = Y::parse($content, null, 2); //->parse();
 // $yaml = Y::parseFile('./references/Example 2.27.yml', null, 1);
 var_dump($yaml);