@@ -17,17 +17,17 @@ discard block |
||
17 | 17 | //public |
18 | 18 | public $errors = []; |
19 | 19 | |
20 | - public const EXCLUDE_DIRECTIVES = 1;//DONT include_directive |
|
21 | - public const IGNORE_COMMENTS = 2;//DONT include_comments |
|
22 | - public const NO_PARSING_EXCEPTIONS = 4;//THROW Exception on parsing Errors |
|
23 | - public const NO_OBJECT_FOR_DATE = 8;//DONT import date strings as dateTime Object |
|
20 | + public const EXCLUDE_DIRECTIVES = 1; //DONT include_directive |
|
21 | + public const IGNORE_COMMENTS = 2; //DONT include_comments |
|
22 | + public const NO_PARSING_EXCEPTIONS = 4; //THROW Exception on parsing Errors |
|
23 | + public const NO_OBJECT_FOR_DATE = 8; //DONT import date strings as dateTime Object |
|
24 | 24 | //privates |
25 | 25 | /* @var null|string */ |
26 | 26 | private $content; |
27 | 27 | /* @var null|string */ |
28 | 28 | private $filePath; |
29 | 29 | /* @var integer */ |
30 | - private $debug = 0;///TODO: determine levels |
|
30 | + private $debug = 0; ///TODO: determine levels |
|
31 | 31 | /* @var integer */ |
32 | 32 | private $options = 0; |
33 | 33 | //Exceptions messages |
@@ -112,8 +112,8 @@ discard block |
||
112 | 112 | } |
113 | 113 | $emptyLines = []; |
114 | 114 | switch ($n->indent <=> $previous->indent) { |
115 | - case -1: $previous->getParent($n->indent)->add($n);break; |
|
116 | - case 0: $previous->getParent()->add($n);break; |
|
115 | + case -1: $previous->getParent($n->indent)->add($n); break; |
|
116 | + case 0: $previous->getParent()->add($n); break; |
|
117 | 117 | default: |
118 | 118 | if ($this->onDeepestType($n, $previous, $lineString)) continue 2; |
119 | 119 | $previous->add($n); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | private static function buildNodeList(NodeList $node, &$parent) |
30 | 30 | { |
31 | 31 | $type = &$node->type; |
32 | - if ($type & (Y\RAW | Y\LITTERALS)) { |
|
32 | + if ($type&(Y\RAW|Y\LITTERALS)) { |
|
33 | 33 | return self::litteral($node, $type); |
34 | 34 | } |
35 | 35 | $p = $parent; |
@@ -182,15 +182,15 @@ discard block |
||
182 | 182 | { |
183 | 183 | self::$_root = new YamlObject(); |
184 | 184 | $childTypes = $list->getTypes(); |
185 | - $isMapping = (Y\KEY | Y\MAPPING) & $childTypes; |
|
185 | + $isMapping = (Y\KEY|Y\MAPPING)&$childTypes; |
|
186 | 186 | $isSequence = Y\ITEM & $childTypes; |
187 | 187 | $isSet = Y\SET_VALUE & $childTypes; |
188 | 188 | if ($isMapping && $isSequence) { |
189 | 189 | throw new \ParseError(sprintf(self::INVALID_DOCUMENT, $key)); |
190 | 190 | } else { |
191 | 191 | switch (true) { |
192 | - case $isSequence: $list->type = Y\SEQUENCE;break; |
|
193 | - case $isSet: $list->type = Y\SET;break; |
|
192 | + case $isSequence: $list->type = Y\SEQUENCE; break; |
|
193 | + case $isSet: $list->type = Y\SET; break; |
|
194 | 194 | default: $list->type = Y\MAPPING; |
195 | 195 | } |
196 | 196 | } |
@@ -212,10 +212,10 @@ discard block |
||
212 | 212 | $children->rewind(); |
213 | 213 | $refIndent = $children->current()->indent; |
214 | 214 | $separator = $type === Y\RAW ? '' : "\n"; |
215 | - $action = function ($c) { return $c->value; }; |
|
216 | - if ($type & Y\LITT_FOLDED) { |
|
215 | + $action = function($c) { return $c->value; }; |
|
216 | + if ($type&Y\LITT_FOLDED) { |
|
217 | 217 | $separator = ' '; |
218 | - $action = function ($c) use ($refIndent) { |
|
218 | + $action = function($c) use ($refIndent) { |
|
219 | 219 | return $c->indent > $refIndent || ($c->type & Y\BLANK) ? "\n".$c->value : $c->value; |
220 | 220 | }; |
221 | 221 | } |
@@ -94,8 +94,8 @@ discard block |
||
94 | 94 | //modify type according to child |
95 | 95 | switch ($child->type) { |
96 | 96 | case Y\COMMENT: //fall through |
97 | - case Y\KEY: $this->value->type = Y\MAPPING;break; |
|
98 | - case Y\ITEM: $this->value->type = Y\SEQUENCE;break; |
|
97 | + case Y\KEY: $this->value->type = Y\MAPPING; break; |
|
98 | + case Y\ITEM: $this->value->type = Y\SEQUENCE; break; |
|
99 | 99 | } |
100 | 100 | $this->type & Y\LITTERALS && $this->value->type = $this->type; |
101 | 101 | } |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | */ |
120 | 120 | public function parse(string $nodeString):Node |
121 | 121 | { |
122 | - $nodeValue = preg_replace("/^\t+/m", " ", $nodeString);//permissive to tabs but replacement |
|
122 | + $nodeValue = preg_replace("/^\t+/m", " ", $nodeString); //permissive to tabs but replacement |
|
123 | 123 | $this->indent = strspn($nodeValue, ' '); |
124 | 124 | $nodeValue = ltrim($nodeValue); |
125 | 125 | if ($nodeValue === '') { |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | case '#': return [Y\COMMENT, ltrim($v)]; |
157 | 157 | case "-": return $this->onHyphen($nodeValue); |
158 | 158 | case '%': return [Y\DIRECTIVE, ltrim($v)]; |
159 | - case '?': return [Y\SET_KEY, empty($v) ? null : new Node(ltrim($v), $this->line)]; |
|
159 | + case '?': return [Y\SET_KEY, empty($v) ? null : new Node(ltrim($v), $this->line)]; |
|
160 | 160 | case ':': return [Y\SET_VALUE, empty($v) ? null : new Node(ltrim($v), $this->line)]; |
161 | 161 | case '>': return [Y\LITT_FOLDED, null]; |
162 | 162 | case '|': return [Y\LITT, null]; |
@@ -181,8 +181,8 @@ discard block |
||
181 | 181 | if (!is_bool($hasComment)) { |
182 | 182 | $tmpNode = new Node(trim(substr($value, 0, $hasComment)), $this->line); |
183 | 183 | if ($tmpNode->type !== Y\PARTIAL) { |
184 | - $comment = new Node(trim(substr($value, $hasComment+1)), $this->line); |
|
185 | - $comment->identifier = true;//to specify it is NOT a fullline comment |
|
184 | + $comment = new Node(trim(substr($value, $hasComment + 1)), $this->line); |
|
185 | + $comment->identifier = true; //to specify it is NOT a fullline comment |
|
186 | 186 | $this->add($comment); |
187 | 187 | $n = $tmpNode; |
188 | 188 | } |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | $type = ['!' => Y\TAG, '&' => Y\REF_DEF, '*' => Y\REF_CALL][$nodeValue[0]]; |
251 | 251 | $pos = strpos($v, ' '); |
252 | 252 | $this->identifier = is_bool($pos) ? $v : strstr($v, ' ', true); |
253 | - $n = is_bool($pos) ? null : (new Node(trim(substr($nodeValue, $pos+1)), $this->line))->setParent($this); |
|
253 | + $n = is_bool($pos) ? null : (new Node(trim(substr($nodeValue, $pos + 1)), $this->line))->setParent($this); |
|
254 | 254 | return [$type, $n]; |
255 | 255 | } |
256 | 256 | |
@@ -264,8 +264,8 @@ discard block |
||
264 | 264 | { |
265 | 265 | $v = $this->value; |
266 | 266 | if (is_null($v)) return null; |
267 | - if ($this->type & (Y\REF_CALL | Y\SCALAR)) return self::getScalar($v); |
|
268 | - if ($this->type & (Y\COMPACT_MAPPING | Y\COMPACT_SEQUENCE)) return self::getCompact(substr($v, 1, -1), $this->type); |
|
267 | + if ($this->type & (Y\REF_CALL|Y\SCALAR)) return self::getScalar($v); |
|
268 | + if ($this->type & (Y\COMPACT_MAPPING|Y\COMPACT_SEQUENCE)) return self::getCompact(substr($v, 1, -1), $this->type); |
|
269 | 269 | switch ($this->type) { |
270 | 270 | case Y\JSON: return json_decode($v, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR); |
271 | 271 | case Y\QUOTED: return substr($v, 1, -1); |
@@ -321,7 +321,7 @@ discard block |
||
321 | 321 | { |
322 | 322 | $out = new Compact(); |
323 | 323 | if ($type === Y\COMPACT_SEQUENCE) { |
324 | - $f = function ($e) { return self::getScalar(trim($e));}; |
|
324 | + $f = function($e) { return self::getScalar(trim($e)); }; |
|
325 | 325 | //TODO : that's not robust enough, improve it |
326 | 326 | foreach (array_map($f, explode(",", $mappingOrSeqString)) as $key => $value) { |
327 | 327 | $out[$key] = $value; |
@@ -13,7 +13,7 @@ |
||
13 | 13 | class NodeList extends \SplDoublyLinkedList |
14 | 14 | { |
15 | 15 | /* @var null|int */ |
16 | - public $type = null;//Y\LITT_FOLDED; |
|
16 | + public $type = null; //Y\LITT_FOLDED; |
|
17 | 17 | |
18 | 18 | public function __construct() |
19 | 19 | { |