@@ -174,7 +174,7 @@ |
||
| 174 | 174 | elseif (in_array($first, ['?', ':'])) NodeHandlers::onSetElement($nodeValue, $this); |
| 175 | 175 | elseif (in_array($first, ['!', '&', '*'])) NodeHandlers::onNodeAction($nodeValue, $this); |
| 176 | 176 | else { |
| 177 | - $characters = [ '#' => [Y::COMMENT, $v], |
|
| 177 | + $characters = ['#' => [Y::COMMENT, $v], |
|
| 178 | 178 | '%' => [Y::DIRECTIVE, $v], |
| 179 | 179 | '>' => [Y::LITT_FOLDED, null], |
| 180 | 180 | '|' => [Y::LITT, null] |
@@ -66,28 +66,28 @@ |
||
| 66 | 66 | public static function onCompact($value, Node $node) |
| 67 | 67 | { |
| 68 | 68 | $node->value = json_decode($value, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES); |
| 69 | - if (json_last_error() === JSON_ERROR_NONE){ |
|
| 69 | + if (json_last_error() === JSON_ERROR_NONE) { |
|
| 70 | 70 | $node->type = Y::JSON; |
| 71 | 71 | return; |
| 72 | 72 | } |
| 73 | 73 | $node->value = new NodeList(); |
| 74 | - if (preg_match(R::MAPPING, $value)){ |
|
| 74 | + if (preg_match(R::MAPPING, $value)) { |
|
| 75 | 75 | $node->type = Y::COMPACT_MAPPING; |
| 76 | 76 | $node->value->type = Y::COMPACT_MAPPING; |
| 77 | - preg_match_all(R::MAPPING_VALUES, trim(substr($value, 1,-1)), $matches); |
|
| 77 | + preg_match_all(R::MAPPING_VALUES, trim(substr($value, 1, -1)), $matches); |
|
| 78 | 78 | foreach ($matches['k'] as $index => $property) { |
| 79 | 79 | $n = new Node('', $node->line); |
| 80 | 80 | $n->type = Y::KEY; |
| 81 | - $n->identifier = trim($property, '"\' ');//TODO : maybe check for proper quoting first ? |
|
| 81 | + $n->identifier = trim($property, '"\' '); //TODO : maybe check for proper quoting first ? |
|
| 82 | 82 | $n->value = new Node($matches['v'][$index], $node->line); |
| 83 | 83 | $node->value->push($n); |
| 84 | 84 | } |
| 85 | 85 | return; |
| 86 | 86 | } |
| 87 | - if (preg_match(R::SEQUENCE, $value)){ |
|
| 87 | + if (preg_match(R::SEQUENCE, $value)) { |
|
| 88 | 88 | $node->type = Y::COMPACT_SEQUENCE; |
| 89 | 89 | $node->value->type = Y::COMPACT_SEQUENCE; |
| 90 | - preg_match_all(R::SEQUENCE_VALUES, trim(substr($value, 1,-1)), $matches); |
|
| 90 | + preg_match_all(R::SEQUENCE_VALUES, trim(substr($value, 1, -1)), $matches); |
|
| 91 | 91 | foreach ($matches['item'] as $key => $item) { |
| 92 | 92 | $i = new Node('', $node->line); |
| 93 | 93 | $i->type = Y::ITEM; |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | if ($_root->value instanceof NddeList) $_root->value->setIteratorMode(NodeList::IT_MODE_DELETE); |
| 37 | 37 | foreach ($_root->value as $child) { |
| 38 | 38 | if ($child->type & Y::DOC_START) { |
| 39 | - if(++$totalDocStart > 1){ |
|
| 39 | + if (++$totalDocStart > 1) { |
|
| 40 | 40 | $documents[] = self::buildDocument($buffer, count($documents)); |
| 41 | 41 | $buffer = new NodeList($child); |
| 42 | 42 | } |
@@ -81,13 +81,13 @@ discard block |
||
| 81 | 81 | * |
| 82 | 82 | * @return mixed The parent (object|array) or a string representing the NodeList. |
| 83 | 83 | */ |
| 84 | - public static function buildNodeList(NodeList $node, &$parent=null) |
|
| 84 | + public static function buildNodeList(NodeList $node, &$parent = null) |
|
| 85 | 85 | { |
| 86 | 86 | $node->forceType(); |
| 87 | - if ($node->type & (Y::RAW | Y::LITTERALS)) { |
|
| 87 | + if ($node->type & (Y::RAW|Y::LITTERALS)) { |
|
| 88 | 88 | return self::buildLitteral($node, (int) $node->type); |
| 89 | 89 | } |
| 90 | - $action = function ($child, &$parent, &$out) { |
|
| 90 | + $action = function($child, &$parent, &$out) { |
|
| 91 | 91 | self::build($child, $out); |
| 92 | 92 | }; |
| 93 | 93 | if ($node->type & (Y::COMPACT_MAPPING|Y::MAPPING|Y::SET)) { |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | $out = $parent ?? []; |
| 97 | 97 | } else { |
| 98 | 98 | $out = ''; |
| 99 | - $action = function ($child, &$parent, &$out) { |
|
| 99 | + $action = function($child, &$parent, &$out) { |
|
| 100 | 100 | if ($child->type & (Y::SCALAR|Y::QUOTED)) { |
| 101 | 101 | if ($parent) { |
| 102 | 102 | $parent->setText(self::build($child)); |
@@ -135,11 +135,11 @@ discard block |
||
| 135 | 135 | ]; |
| 136 | 136 | if (isset($actions[$type])) { |
| 137 | 137 | return TB::{$actions[$type]}($node, $parent); |
| 138 | - } elseif ($type & Y::COMMENT) { |
|
| 138 | + } elseif ($type&Y::COMMENT) { |
|
| 139 | 139 | self::$_root->addComment($line, $value); |
| 140 | - } elseif ($type & (Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) { |
|
| 140 | + } elseif ($type&(Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) { |
|
| 141 | 141 | return self::buildNodeList($value, $parent); |
| 142 | - } elseif ($type & (Y::REF_DEF | Y::REF_CALL)) { |
|
| 142 | + } elseif ($type&(Y::REF_DEF|Y::REF_CALL)) { |
|
| 143 | 143 | return TB::buildReference($node, $parent); |
| 144 | 144 | } elseif ($value instanceof Node) { |
| 145 | 145 | return self::buildNode($value, $parent); |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | //remove trailing blank |
| 166 | 166 | while ($list->top()->type & Y::BLANK) $list->pop(); |
| 167 | 167 | $result = ''; |
| 168 | - $separator = [ Y::RAW => '', Y::LITT => "\n", Y::LITT_FOLDED => ' '][$type]; |
|
| 168 | + $separator = [Y::RAW => '', Y::LITT => "\n", Y::LITT_FOLDED => ' '][$type]; |
|
| 169 | 169 | foreach ($list as $child) { |
| 170 | 170 | if ($child->value instanceof NodeList) { |
| 171 | 171 | $result .= self::buildLitteral($child->value, $type).$separator; |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | private static function setLiteralValue(Node $child, string &$result, int $refIndent, string $separator, int $type) |
| 180 | 180 | { |
| 181 | 181 | $val = $child->type & (Y::SCALAR) ? $child->value : substr($child->raw, $refIndent); |
| 182 | - if ($type & Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) { |
|
| 182 | + if ($type&Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) { |
|
| 183 | 183 | if ($result[-1] === $separator) |
| 184 | 184 | $result[-1] = "\n"; |
| 185 | 185 | if ($result[-1] === "\n") |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | * @throws \ParseError if Key has no name(identifier) Note: empty string is allowed |
| 33 | 33 | * @return null |
| 34 | 34 | */ |
| 35 | - public static function buildKey(Node $node, &$parent=null) |
|
| 35 | + public static function buildKey(Node $node, &$parent = null) |
|
| 36 | 36 | { |
| 37 | 37 | extract((array) $node, EXTR_REFS); |
| 38 | 38 | if (is_null($identifier)) { |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | public function buildSetKey(Node $node, &$parent) |
| 99 | 99 | { |
| 100 | 100 | $built = is_object($node->value) ? Builder::build($node->value) : null; |
| 101 | - $stringKey = is_string($built) && Regex::isProperlyQuoted($built) ? trim($built, '\'" '): $built; |
|
| 101 | + $stringKey = is_string($built) && Regex::isProperlyQuoted($built) ? trim($built, '\'" ') : $built; |
|
| 102 | 102 | $key = json_encode($stringKey, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES); |
| 103 | 103 | if (empty($key)) throw new \Exception("Cant serialize complex key: ".var_export($node->value, true), 1); |
| 104 | 104 | $parent->{trim($key, '\'" ')} = null; |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | { |
| 115 | 115 | $prop = array_keys(get_object_vars($parent)); |
| 116 | 116 | $key = end($prop); |
| 117 | - if ($node->value->type & (Y::ITEM|Y::KEY )) { |
|
| 117 | + if ($node->value->type & (Y::ITEM|Y::KEY)) { |
|
| 118 | 118 | $node->value = new NodeList($node->value); |
| 119 | 119 | } |
| 120 | 120 | $parent->{$key} = Builder::build(/** @scrutinizer ignore-type */ $node->value); |