dallgoot / yaml

yaml/Tag.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
         if (is_null($tagName)) {
             throw new \Exception(self::class.": a tag MUST have a name", 1);
         }
-        $this->tagName  = $tagName;
+        $this->tagName = $tagName;
         $this->value = $value;
     }
 

yaml/Regex.php

Indentation +5 added lines, -5 removed lines

@@ -14,10 +14,10 @@ 
     const AN = "[\w ]+";
     const NUM = "-?[\d.e]+";
     const SIMPLE = "(?P<sv>".self::NULL."|".
-                                  self::FALSE."|".
-                                  self::TRUE."|".
-                                  self::AN."|".
-                                  self::NUM.")";
+                                    self::FALSE."|".
+                                    self::TRUE."|".
+                                    self::AN."|".
+                                    self::NUM.")";
     private const seqForMap = "(?P<seq>\[(?:(?:(?P>sv)|(?P>seq)|(?P>map)),?\s*)+\])";
     private const mapForSeq = "(?P<map>{\s*(?:".self::AN."\s*:\s*(?:(?P>sv)|(?P>seq)|(?P>map)),?\s*)+})";
 
@@ -41,7 +41,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;
     }

Spacing +4 added lines, -4 removed lines

@@ -32,10 +32,10 @@
     {
         $d         = "\\d{4}([-\\/])\\d{2}\\1\\d{2}";
         $h         = "\\d{2}(:)\\d{2}\\2\\d{2}";
-        $date      =  "/^$d$/";// 2002-12-14, 2002/12/14
-        $canonical =  "/^$d(?:t| )$h\\.\\dz?$/im";// 2001-12-15T02:59:43.1Z
-        $spaced    =  "/^$d(?:t| )$h\\.\\d{2} [-+]\\d$/im";// 2001-12-14 21:59:43.10 -5
-        $iso8601   =  "/^$d(?:t| )$h\\.\\d{2}[-+]\\d{2}\\2\\d{2}/im";// 2001-12-14t21:59:43.10-05:00
+        $date      = "/^$d$/"; // 2002-12-14, 2002/12/14
+        $canonical = "/^$d(?:t| )$h\\.\\dz?$/im"; // 2001-12-15T02:59:43.1Z
+        $spaced    = "/^$d(?:t| )$h\\.\\d{2} [-+]\\d$/im"; // 2001-12-14 21:59:43.10 -5
+        $iso8601   = "/^$d(?:t| )$h\\.\\d{2}[-+]\\d{2}\\2\\d{2}/im"; // 2001-12-14t21:59:43.10-05:00
         $matchDate      = preg_match($date, $v);
         $matchCanonical = preg_match($canonical, $v);
         $matchSpaced    = preg_match($spaced, $v);

Braces +3 added lines, -2 removed lines

@@ -40,8 +40,9 @@
         $matchCanonical = preg_match($canonical, $v);
         $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");
+        if (is_bool($matchDate) || is_bool($matchCanonical) || is_bool($matchSpaced) || is_bool($matchIso)) {
+                  throw new \Exception("Regex date error");
+        }
 
         return $matchDate || $matchCanonical || $matchSpaced || $matchIso;
     }

yaml/YamlObject.php

Indentation +9 added lines, -9 removed lines

@@ -2,15 +2,15 @@
 namespace Dallgoot\Yaml;
 
 /**
-  *  The returned object representing a YAML file content
-  *
-  * @method void addReference(string $name, $value)
-  * @method mixed getReference(string $name)
-  * @method array getAllReferences()
-  * @method void addComment($index, $value)
-  * @method string|array getComment($lineNumber)
-  * @method void setText(string $value)
-  * @method void addTag(string $value)
+ *  The returned object representing a YAML file content
+ *
+ * @method void addReference(string $name, $value)
+ * @method mixed getReference(string $name)
+ * @method array getAllReferences()
+ * @method void addComment($index, $value)
+ * @method string|array getComment($lineNumber)
+ * @method void setText(string $value)
+ * @method void addTag(string $value)
  */
 class YamlObject extends \ArrayIterator implements \JsonSerializable
 {

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 
     public function __construct()
     {
-        parent::__construct([], 1);//1 = Array indices can be accessed as properties in read/write.
+        parent::__construct([], 1); //1 = Array indices can be accessed as properties in read/write.
         $this->__yaml__object__api = new API();
     }
 
@@ -28,7 +28,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

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

yaml/Dumper.php

Spacing +4 added lines, -4 removed lines

@@ -39,7 +39,7 @@ 
         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;
-        self::$result->setIteratorMode(DLL::IT_MODE_FIFO | DLL::IT_MODE_DELETE);
+        self::$result->setIteratorMode(DLL::IT_MODE_FIFO|DLL::IT_MODE_DELETE);
         if ($dataType instanceof YamlObject) {
             self::dumpYamlObject($dataType);
         } elseif (is_array($dataType) && $dataType[0] instanceof YamlObject) {
@@ -108,9 +108,9 @@ 
         foreach ($array as $key => $item) {
             $lineStart = current($refKeys) === $key ? "- " : "- $key: ";
             if (is_scalar($item)) {
-                self::add($lineStart.$item, $indent );
+                self::add($lineStart.$item, $indent);
             } else {
-                self::add($lineStart, $indent );
+                self::add($lineStart, $indent);
                 self::dump($item, $indent + self::INDENT);
             }
             next($refKeys);
@@ -129,7 +129,7 @@ 
         if ($object instanceof Tag) {
             if (is_scalar($object->value)) {
                 return "!".$object->tagName.' '.$object->value;
-            } else{
+            } else {
                 yield "!".$object->tagName;
                 self::dump($object->value, $indent + self::INDENT);
             }

Braces +12 added lines, -4 removed lines

@@ -21,7 +21,9 @@ 
 
     public function __construct(int $options = null)
     {
-        if (is_int($options)) self::$options = $options;
+        if (is_int($options)) {
+            self::$options = $options;
+        }
     }
 
     /**
@@ -36,7 +38,9 @@ 
      */
     public static function toString($dataType, int $options):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;
         self::$result->setIteratorMode(DLL::IT_MODE_FIFO | DLL::IT_MODE_DELETE);
@@ -74,8 +78,12 @@ 
         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 'double': if (is_nan($dataType)) return '.nan';
+                case 'float': if (is_infinite($dataType)) {
+                    return $dataType > 0 ? '.inf' : '-.inf';
+                }
+                case 'double': if (is_nan($dataType)) {
+                    return '.nan';
+                }
                 default:
                     return $dataType;
             }

yaml/Node.php

Indentation +7 added lines, -7 removed lines

@@ -288,13 +288,13 @@
     private static function getScalar(string $v)
     {
         $types = ['yes'   => true,
-                  'no'    => false,
-                  'true'  => true,
-                  'false' => false,
-                  'null'  => null,
-                  '.inf'  => INF,
-                  '-.inf' => -INF,
-                  '.nan'  => NAN
+                    'no'    => false,
+                    'true'  => true,
+                    'false' => false,
+                    'null'  => null,
+                    '.inf'  => INF,
+                    '-.inf' => -INF,
+                    '.nan'  => NAN
         ];
         if (isset($types[strtolower($v)])) return $types[strtolower($v)];
         if (R::isDate($v))   return date_create($v);

Spacing +9 added lines, -9 removed lines

@@ -89,8 +89,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;
                 // case Y\COMMENT: $this->value->type = Y\RAW;break;
             }
         }
@@ -115,7 +115,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 === '') {
@@ -152,7 +152,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];
@@ -177,7 +177,7 @@ 
             if (!is_bool($hasComment)) {
                 $tmpNode = new Node(trim(substr($keyValue, 0, $hasComment)), $this->line);
                 if ($tmpNode->type !== Y\PARTIAL) {
-                    $comment = new Node(trim(substr($keyValue, $hasComment+1)), $this->line);
+                    $comment = new Node(trim(substr($keyValue, $hasComment + 1)), $this->line);
                     //TODO: modify "identifier" to specify if fullline comment or not
                     $this->add($comment);
                     $n = $tmpNode;
@@ -246,7 +246,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];
     }
 
@@ -260,8 +260,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);
@@ -317,7 +317,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

@@ -55,7 +55,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;
@@ -146,8 +148,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);
@@ -199,9 +205,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];
     }
 
@@ -216,7 +228,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)];
@@ -259,9 +273,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);
@@ -290,9 +310,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);
     }
 
@@ -305,8 +331,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):

example.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__.'/vendor/autoload.php';
 
 use \Dallgoot\Yaml as Y;
 

yaml/NodeList.php

Spacing +1 added lines, -1 removed lines

@@ -15,6 +15,6 @@
 
     public function __debugInfo():array
     {
-        return ['type' => Y::getName($this->type) , "dllist" => $this->dllist];
+        return ['type' => Y::getName($this->type), "dllist" => $this->dllist];
     }
 }
\ No newline at end of file

yaml/Loader.php

Spacing +17 added lines, -17 removed lines

@@ -10,15 +10,15 @@ 
     //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
-    private $content;/* @var null|string */
-    private $filePath;/* @var null|string */
-    private $debug = 0;//TODO: determine levels
-    private $options = 0;/* @var int */
+    private $content; /* @var null|string */
+    private $filePath; /* @var null|string */
+    private $debug = 0; //TODO: determine levels
+    private $options = 0; /* @var int */
     //Exceptions messages
     private const INVALID_VALUE        = self::class.": at line %d";
     private const EXCEPTION_NO_FILE    = self::class.": file '%s' does not exists (or path is incorrect?)";
@@ -27,8 +27,8 @@ 
 
     public function __construct($absolutePath = null, $options = null, $debug = 0)
     {
-        $this->debug   = is_int($debug)   ? min($debug, 3) : 1;
-        $this->options = is_int($options) ? $options       : $this->options;
+        $this->debug   = is_int($debug) ? min($debug, 3) : 1;
+        $this->options = is_int($options) ? $options : $this->options;
         if (is_string($absolutePath)) {
             $this->load($absolutePath);
         }
@@ -79,10 +79,10 @@ 
         if (!is_array($source)) throw new \Exception(self::EXCEPTION_LINE_SPLIT);
         $previous = $root = new Node();
         $emptyLines = [];
-        $specialTypes = Y\LITTERALS | Y\BLANK;
+        $specialTypes = Y\LITTERALS|Y\BLANK;
         try {
             foreach ($source as $lineNb => $lineString) {
-                $n = new Node($lineString, $lineNb + 1);//TODO: useful???-> $this->debug && var_dump($n);
+                $n = new Node($lineString, $lineNb + 1); //TODO: useful???-> $this->debug && var_dump($n);
                 $deepest = $previous->getDeepestNode();
                 if ($deepest->type & Y\PARTIAL) {
                     //TODO:verify this edge case
@@ -101,8 +101,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);
@@ -114,11 +114,11 @@ 
                 var_dump("\033[33mParsed Structure\033[0m\n", $root);
                 die("Debug of root structure requested (remove debug level to suppress these)");
             }
-            $out = Builder::buildContent($root, $this->debug);//var_dump($out);exit();
+            $out = Builder::buildContent($root, $this->debug); //var_dump($out);exit();
             return $out;
         } catch (\Error|\Exception|\ParseError $e) {
             $file = basename($this->filePath);
-            $message = basename($e->getFile())."@".$e->getLine().":".$e->getMessage()." in '$file' @".($lineNb+1)."\n";
+            $message = basename($e->getFile())."@".$e->getLine().":".$e->getMessage()." in '$file' @".($lineNb + 1)."\n";
             if ($e instanceof \ParseError && ($this->options & self::NO_PARSING_EXCEPTIONS)) {
                 trigger_error($message, E_USER_WARNING);
                 $this->errors[] = $message;
@@ -158,7 +158,7 @@ 
         // // if ($previous->type & Y\ITEM && $n->type & Y\KEY) {
         // //     $previous
         // // }
-        if ($deepest->type & (Y\BLANK | Y\SCALAR) ) {//|| ($previous->type & (Y\ITEM | Y\SET_KEY))) {
+        if ($deepest->type & (Y\BLANK|Y\SCALAR)) {//|| ($previous->type & (Y\ITEM | Y\SET_KEY))) {
                 $previous = $deepest->getParent();
         //     // if ($n->type === Y\SCALAR && ($deepest->getParent()->type & Y\LITTERALS)) {
         //     //     // $deepest->type = Y\SCALAR;

Braces +15 added lines, -5 removed lines

@@ -74,9 +74,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;
@@ -104,7 +108,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;
@@ -139,8 +145,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 +17 added lines, -17 removed lines

@@ -25,14 +25,14 @@ 
     private static function buildNodeList(NodeList $node, &$parent)
     {
         $type = property_exists($node, "type") ? $node->type : null;
-        if ($type & (Y\RAW | Y\LITTERALS)) {
+        if ($type&(Y\RAW|Y\LITTERALS)) {
             return self::litteral($node, $type);
         }
         $p = $parent;
         switch ($type) {
             case Y\MAPPING: //fall through
-            case Y\SET:      $p = new \StdClass;break;
-            case Y\SEQUENCE: $p = [];break;
+            case Y\SET:      $p = new \StdClass; break;
+            case Y\SEQUENCE: $p = []; break;
             // case Y\KEY: $p = $parent;break;
         }
         $out = null;
@@ -53,10 +53,10 @@ 
     {
         list($line, $type, $value, $identifier) = [$node->line, $node->type, $node->value, $node->identifier];
         switch ($type) {
-            case Y\COMMENT: self::$_root->addComment($line, $value);return;
-            case Y\DIRECTIVE: return;//TODO
-            case Y\ITEM: self::buildItem($value, $parent);return;
-            case Y\KEY:  self::buildKey($node, $parent);return;
+            case Y\COMMENT: self::$_root->addComment($line, $value); return;
+            case Y\DIRECTIVE: return; //TODO
+            case Y\ITEM: self::buildItem($value, $parent); return;
+            case Y\KEY:  self::buildKey($node, $parent); return;
             case Y\REF_DEF: //fall through
             case Y\REF_CALL://TODO: self::build returns what ?
                 $tmp = is_object($value) ? self::build($value, $parent) : $node->getPhpValue();
@@ -71,8 +71,8 @@ 
             case Y\SET_VALUE:
                 $prop = array_keys(get_object_vars($parent));
                 $key = end($prop);
-                if (property_exists($value, "type") && ($value->type & (Y\ITEM | Y\MAPPING))) {
-                    $p = $value->type === Y\ITEM  ? [] : new \StdClass;
+                if (property_exists($value, "type") && ($value->type & (Y\ITEM|Y\MAPPING))) {
+                    $p = $value->type === Y\ITEM ? [] : new \StdClass;
                     self::build($value, $p);
                 } else {
                     $p = self::build($value, $parent->{$key});
@@ -81,7 +81,7 @@ 
                 return;
             case Y\TAG:
                 if ($parent === self::$_root) {
-                    $parent->addTag($identifier);return;
+                    $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;
@@ -109,7 +109,7 @@ 
         if (is_null($identifier)) {
             throw new \ParseError(sprintf(self::ERROR_NO_KEYNAME, $node->line));
         } else {
-            if ($value instanceof Node && ($value->type & (Y\KEY | Y\ITEM))) {
+            if ($value instanceof Node && ($value->type & (Y\KEY|Y\ITEM))) {
                 $parent->{$identifier} = $value->type & Y\KEY ? new \StdClass : [];
                 self::build($value, $parent->{$identifier});
             } elseif (is_object($value)) {
@@ -122,7 +122,7 @@ 
 
     private static function buildItem($value, &$parent):void
     {
-        if(!is_array($parent) && !($parent instanceof \ArrayIterator)) {
+        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);
         }
         if ($value instanceof Node && $value->type === Y\KEY) {
@@ -175,8 +175,8 @@ 
             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;
                 case $isMapping://fall through
                 default:          $list->type = Y\MAPPING;
             }
@@ -200,10 +200,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

@@ -18,7 +18,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);
     }
 
@@ -60,12 +62,15 @@ 
             case Y\REF_DEF: //fall through
             case Y\REF_CALL://TODO: self::build returns what ?
                 $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:
@@ -84,8 +89,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($value, $node);
                     return new Tag($identifier, $val);
@@ -153,10 +161,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);
         }
         // $_debug >= 2 && var_dump($documents);//var_dump($documents);die("documents");