@@ -238,7 +238,6 @@ |
||
| 238 | 238 | /** |
| 239 | 239 | * Builds a litteral (folded or not) or any NodeList that has YAML::RAW type (like a multiline value) |
| 240 | 240 | * |
| 241 | - * @param NodeList $children The children |
|
| 242 | 241 | * @param integer $type The type |
| 243 | 242 | * |
| 244 | 243 | * @return string The litteral. |
@@ -42,10 +42,14 @@ discard block |
||
| 42 | 42 | } |
| 43 | 43 | $_root->value instanceof NodeList && $_root->value->setIteratorMode(NodeList::IT_MODE_DELETE); |
| 44 | 44 | foreach ($_root->value as $child) { |
| 45 | - if ($child->type & Y::DOC_START) $totalDocStart++; |
|
| 45 | + if ($child->type & Y::DOC_START) { |
|
| 46 | + $totalDocStart++; |
|
| 47 | + } |
|
| 46 | 48 | //if 0 or 1 DOC_START = we are still in first document |
| 47 | 49 | $currentDoc = $totalDocStart > 1 ? $totalDocStart - 1 : 0; |
| 48 | - if (!isset($documents[$currentDoc])) $documents[$currentDoc] = new NodeList(); |
|
| 50 | + if (!isset($documents[$currentDoc])) { |
|
| 51 | + $documents[$currentDoc] = new NodeList(); |
|
| 52 | + } |
|
| 49 | 53 | $documents[$currentDoc]->push($child); |
| 50 | 54 | } |
| 51 | 55 | $content = []; |
@@ -70,7 +74,9 @@ discard block |
||
| 70 | 74 | */ |
| 71 | 75 | private static function build(object $node, &$parent = null) |
| 72 | 76 | { |
| 73 | - if ($node instanceof NodeList) return self::buildNodeList($node, $parent); |
|
| 77 | + if ($node instanceof NodeList) { |
|
| 78 | + return self::buildNodeList($node, $parent); |
|
| 79 | + } |
|
| 74 | 80 | return self::buildNode($node, $parent); |
| 75 | 81 | } |
| 76 | 82 | |
@@ -133,13 +139,17 @@ discard block |
||
| 133 | 139 | } else { |
| 134 | 140 | $tmp = Node2PHP::get($node); |
| 135 | 141 | } |
| 136 | - if ($type === Y::REF_DEF) self::$_root->addReference($identifier, $tmp); |
|
| 142 | + if ($type === Y::REF_DEF) { |
|
| 143 | + self::$_root->addReference($identifier, $tmp); |
|
| 144 | + } |
|
| 137 | 145 | return self::$_root->getReference($identifier); |
| 138 | 146 | } |
| 139 | 147 | if ($type & (Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) { |
| 140 | 148 | return self::buildNodeList($node->value, $parent); |
| 141 | 149 | } |
| 142 | - if ($type & Y::COMMENT) self::$_root->addComment($node->line, $node->value); |
|
| 150 | + if ($type & Y::COMMENT) { |
|
| 151 | + self::$_root->addComment($node->line, $node->value); |
|
| 152 | + } |
|
| 143 | 153 | $typesActions = [Y::DIRECTIVE => 'buildDirective', |
| 144 | 154 | Y::ITEM => 'buildItem', |
| 145 | 155 | Y::KEY => 'buildKey', |
@@ -254,18 +264,24 @@ discard block |
||
| 254 | 264 | } |
| 255 | 265 | $result = ''; |
| 256 | 266 | $separator = ''; |
| 257 | - if ($type & Y::LITT) $separator = "\n"; |
|
| 258 | - if ($type & Y::LITT_FOLDED) $separator = ' '; |
|
| 267 | + if ($type & Y::LITT) { |
|
| 268 | + $separator = "\n"; |
|
| 269 | + } |
|
| 270 | + if ($type & Y::LITT_FOLDED) { |
|
| 271 | + $separator = ' '; |
|
| 272 | + } |
|
| 259 | 273 | foreach ($list as $child) { |
| 260 | 274 | if ($child->value instanceof NodeList) { |
| 261 | 275 | $result .= self::buildLitteral($child->value, $type).$separator; |
| 262 | 276 | } else { |
| 263 | 277 | $val = $child->type & (Y::SCALAR|Y::BLANK) ? $child->value : substr($child->raw, $refIndent); |
| 264 | 278 | if ($type & Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) { |
| 265 | - if ($result[-1] === $separator) |
|
| 266 | - $result[-1] = "\n"; |
|
| 267 | - if ($result[-1] === "\n") |
|
| 268 | - $result .= $val; |
|
| 279 | + if ($result[-1] === $separator) { |
|
| 280 | + $result[-1] = "\n"; |
|
| 281 | + } |
|
| 282 | + if ($result[-1] === "\n") { |
|
| 283 | + $result .= $val; |
|
| 284 | + } |
|
| 269 | 285 | continue; |
| 270 | 286 | } |
| 271 | 287 | $result .= $val.$separator; |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | * Create the Node object and parses $nodeString IF not null (else assume a root type Node) |
| 33 | 33 | * |
| 34 | 34 | * @param string|null $nodeString The node string |
| 35 | - * @param int|null $line The line |
|
| 35 | + * @param integer $line The line |
|
| 36 | 36 | */ |
| 37 | 37 | public function __construct($nodeString = null, $line = 0) |
| 38 | 38 | { |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | * Process when a "key: value" syntax is found in the parsed string |
| 222 | 222 | * Note : key is match 1, value is match 2 as per regex from R::KEY |
| 223 | 223 | * |
| 224 | - * @param array $matches The matches provided by 'preg_match' function in Node::parse |
|
| 224 | + * @param string[] $matches The matches provided by 'preg_match' function in Node::parse |
|
| 225 | 225 | */ |
| 226 | 226 | private function onKey(array $matches) |
| 227 | 227 | { |