@@ -74,8 +74,12 @@ |
||
| 74 | 74 | { |
| 75 | 75 | $prop = get_object_vars($this); |
| 76 | 76 | unset($prop["__yaml__object__api"]); |
| 77 | - if (count($prop) > 0) return $prop; |
|
| 78 | - if (count($this) > 0) return iterator_to_array($this); |
|
| 77 | + if (count($prop) > 0) { |
|
| 78 | + return $prop; |
|
| 79 | + } |
|
| 80 | + if (count($this) > 0) { |
|
| 81 | + return iterator_to_array($this); |
|
| 82 | + } |
|
| 79 | 83 | return $this->__yaml__object__api->value ?? "_Empty YamlObject_"; |
| 80 | 84 | } |
| 81 | 85 | } |
@@ -50,7 +50,9 @@ discard block |
||
| 50 | 50 | $tmp->rewind(); |
| 51 | 51 | $fqn = __NAMESPACE__."\\Nodes\\$nodeType"; |
| 52 | 52 | foreach ($tmp as $child) { |
| 53 | - if ($child instanceof $fqn) return true; |
|
| 53 | + if ($child instanceof $fqn) { |
|
| 54 | + return true; |
|
| 55 | + } |
|
| 54 | 56 | } |
| 55 | 57 | return false; |
| 56 | 58 | } |
@@ -64,7 +66,9 @@ discard block |
||
| 64 | 66 | && !($child instanceof Directive) |
| 65 | 67 | && !($child instanceof Blank) |
| 66 | 68 | && !($child instanceof Docstart |
| 67 | - && is_null($child->value)) ) return true; |
|
| 69 | + && is_null($child->value)) ) { |
|
| 70 | + return true; |
|
| 71 | + } |
|
| 68 | 72 | } |
| 69 | 73 | return false; |
| 70 | 74 | } |
@@ -72,9 +76,11 @@ discard block |
||
| 72 | 76 | public function push($node) |
| 73 | 77 | { |
| 74 | 78 | $type = null; |
| 75 | - if ($node instanceof Item ) $type = self::SEQUENCE; |
|
| 76 | - elseif ($node instanceof Key) $type = self::MAPPING; |
|
| 77 | - elseif ($node instanceof SetKey |
|
| 79 | + if ($node instanceof Item ) { |
|
| 80 | + $type = self::SEQUENCE; |
|
| 81 | + } elseif ($node instanceof Key) { |
|
| 82 | + $type = self::MAPPING; |
|
| 83 | + } elseif ($node instanceof SetKey |
|
| 78 | 84 | || $node instanceof SetValue) { |
| 79 | 85 | $type = self::SET; |
| 80 | 86 | } elseif ($node instanceof Scalar ){ |
@@ -34,7 +34,9 @@ |
||
| 34 | 34 | $built = is_null($this->value) ? null : $this->value->build(); |
| 35 | 35 | $stringKey = is_string($built) && Regex::isProperlyQuoted($built) ? trim($built, '\'" '): $built; |
| 36 | 36 | $key = json_encode($stringKey, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES); |
| 37 | - if (empty($key)) throw new \Exception("Cant serialize complex key: ".var_export($this->value, true)); |
|
| 37 | + if (empty($key)) { |
|
| 38 | + throw new \Exception("Cant serialize complex key: ".var_export($this->value, true)); |
|
| 39 | + } |
|
| 38 | 40 | $parent->{trim($key, '\'" ')} = null; |
| 39 | 41 | return null; |
| 40 | 42 | } |
@@ -226,7 +226,9 @@ discard block |
||
| 226 | 226 | { |
| 227 | 227 | foreach ($classNameList as $className) { |
| 228 | 228 | $fqn = __NAMESPACE__."\\$className"; |
| 229 | - if ($this instanceof $fqn) return true; |
|
| 229 | + if ($this instanceof $fqn) { |
|
| 230 | + return true; |
|
| 231 | + } |
|
| 230 | 232 | } |
| 231 | 233 | return false; |
| 232 | 234 | } |
@@ -240,13 +242,23 @@ discard block |
||
| 240 | 242 | { |
| 241 | 243 | $props = []; |
| 242 | 244 | $props['line->indent'] = "$this->line -> $this->indent"; |
| 243 | - if ($this->identifier) $props['identifier'] = "($this->identifier)"; |
|
| 244 | - if ($this->anchor) $props['anchor'] = "($this->anchor)"; |
|
| 245 | - if ($this->tag) $props['tag'] = "($this->tag)"; |
|
| 246 | - if ($this->value) $props['value'] = $this->value; |
|
| 245 | + if ($this->identifier) { |
|
| 246 | + $props['identifier'] = "($this->identifier)"; |
|
| 247 | + } |
|
| 248 | + if ($this->anchor) { |
|
| 249 | + $props['anchor'] = "($this->anchor)"; |
|
| 250 | + } |
|
| 251 | + if ($this->tag) { |
|
| 252 | + $props['tag'] = "($this->tag)"; |
|
| 253 | + } |
|
| 254 | + if ($this->value) { |
|
| 255 | + $props['value'] = $this->value; |
|
| 256 | + } |
|
| 247 | 257 | // $props['value'] = $this->value; |
| 248 | 258 | $props['raw'] = $this->raw; |
| 249 | - if (!$this->_parent) $props['parent'] = 'NO PARENT!!!'; |
|
| 259 | + if (!$this->_parent) { |
|
| 260 | + $props['parent'] = 'NO PARENT!!!'; |
|
| 261 | + } |
|
| 250 | 262 | return $props; |
| 251 | 263 | } |
| 252 | 264 | } |
@@ -32,7 +32,9 @@ |
||
| 32 | 32 | |
| 33 | 33 | public function add(NodeGeneric $child):NodeGeneric |
| 34 | 34 | { |
| 35 | - if (is_null($this->value)) $this->value = new NodeList(); |
|
| 35 | + if (is_null($this->value)) { |
|
| 36 | + $this->value = new NodeList(); |
|
| 37 | + } |
|
| 36 | 38 | $candidate = $child; |
| 37 | 39 | if (!$child->isOneOf('Scalar', 'Blank', 'Comment', 'Quoted')) { |
| 38 | 40 | $candidate = new Scalar((string) $child->raw, $child->line); |
@@ -24,4 +24,6 @@ |
||
| 24 | 24 | if ($nameResultPair[$testName] !== $text) { |
| 25 | 25 | var_dump('EXPECTED', $nameResultPair[$testName]); |
| 26 | 26 | var_dump('RECEIVED', $text); |
| 27 | -} else echo 'WRITE OK !!!'; |
|
| 27 | +} else { |
|
| 28 | + echo 'WRITE OK !!!'; |
|
| 29 | +} |
|
@@ -23,10 +23,13 @@ discard block |
||
| 23 | 23 | final public static function get($nodeString = null, $line = 0):NodeGeneric |
| 24 | 24 | { |
| 25 | 25 | $trimmed = ltrim($nodeString); |
| 26 | - if ($trimmed === '') return new Nodes\Blank($nodeString, $line); |
|
| 27 | - elseif (substr($trimmed, 0, 3) === '...') return new Nodes\DocEnd($nodeString, $line); |
|
| 28 | - elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) return new Nodes\Key($nodeString, $line, $matches); |
|
| 29 | - else { |
|
| 26 | + if ($trimmed === '') { |
|
| 27 | + return new Nodes\Blank($nodeString, $line); |
|
| 28 | + } elseif (substr($trimmed, 0, 3) === '...') { |
|
| 29 | + return new Nodes\DocEnd($nodeString, $line); |
|
| 30 | + } elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) { |
|
| 31 | + return new Nodes\Key($nodeString, $line, $matches); |
|
| 32 | + } else { |
|
| 30 | 33 | $first = $trimmed[0]; |
| 31 | 34 | $stringGroups = ['-', '>|' , '"\'', "#%" , "{[" , ":?" , '*&!']; |
| 32 | 35 | $methodGroups = ['Hyphen','Literal','Quoted','Special','Compact','SetElement','NodeAction']; |
@@ -105,10 +108,13 @@ discard block |
||
| 105 | 108 | final private static function onCompact(string $first, string $nodeString, int $line):NodeGeneric |
| 106 | 109 | { |
| 107 | 110 | json_decode($nodeString, false, 512, self::JSON_OPTIONS); |
| 108 | - if (json_last_error() === \JSON_ERROR_NONE) return new Nodes\JSON($nodeString, $line); |
|
| 109 | - elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString))) return new Nodes\CompactMapping($nodeString, $line); |
|
| 110 | - elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) return new Nodes\CompactSequence($nodeString, $line); |
|
| 111 | - else { |
|
| 111 | + if (json_last_error() === \JSON_ERROR_NONE) { |
|
| 112 | + return new Nodes\JSON($nodeString, $line); |
|
| 113 | + } elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString))) { |
|
| 114 | + return new Nodes\CompactMapping($nodeString, $line); |
|
| 115 | + } elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) { |
|
| 116 | + return new Nodes\CompactSequence($nodeString, $line); |
|
| 117 | + } else { |
|
| 112 | 118 | return new Nodes\Partial($nodeString, $line); |
| 113 | 119 | } |
| 114 | 120 | } |
@@ -123,9 +129,11 @@ discard block |
||
| 123 | 129 | */ |
| 124 | 130 | final private static function onHyphen(string $first, string $nodeString, int $line):NodeGeneric |
| 125 | 131 | { |
| 126 | - if (substr($nodeString, 0, 3) === '---') return new Nodes\DocStart($nodeString, $line); |
|
| 127 | - elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString))) return new Nodes\Item($nodeString, $line); |
|
| 128 | - else { |
|
| 132 | + if (substr($nodeString, 0, 3) === '---') { |
|
| 133 | + return new Nodes\DocStart($nodeString, $line); |
|
| 134 | + } elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString))) { |
|
| 135 | + return new Nodes\Item($nodeString, $line); |
|
| 136 | + } else { |
|
| 129 | 137 | return new Nodes\Scalar($nodeString, $line); |
| 130 | 138 | } |
| 131 | 139 | } |
@@ -130,8 +130,12 @@ |
||
| 130 | 130 | try { |
| 131 | 131 | foreach ($generator as $lineNB => $lineString) { |
| 132 | 132 | $node = NodeFactory::get($lineString, $lineNB); |
| 133 | - if ($this->_debug === 1) echo get_class($node)."\n"; |
|
| 134 | - if ($this->needsSpecialProcess($node, $previous)) continue; |
|
| 133 | + if ($this->_debug === 1) { |
|
| 134 | + echo get_class($node)."\n"; |
|
| 135 | + } |
|
| 136 | + if ($this->needsSpecialProcess($node, $previous)) { |
|
| 137 | + continue; |
|
| 138 | + } |
|
| 135 | 139 | $this->_attachBlankLines($previous); |
| 136 | 140 | switch ($node->indent <=> $previous->indent) { |
| 137 | 141 | case -1: $target = $previous->getTargetOnLessIndent($node); |
@@ -96,8 +96,12 @@ discard block |
||
| 96 | 96 | \.nan | \.NaN | \.NAN tag:yaml.org,2002:float (Not a number) |
| 97 | 97 | * tag:yaml.org,2002:str (Default) |
| 98 | 98 | */ |
| 99 | - if (Regex::isDate($v)) return Builder::$dateAsObject && !$onlyScalar ? date_create($v) : $v; |
|
| 100 | - if (Regex::isNumber($v)) return self::getNumber($v); |
|
| 99 | + if (Regex::isDate($v)) { |
|
| 100 | + return Builder::$dateAsObject && !$onlyScalar ? date_create($v) : $v; |
|
| 101 | + } |
|
| 102 | + if (Regex::isNumber($v)) { |
|
| 103 | + return self::getNumber($v); |
|
| 104 | + } |
|
| 101 | 105 | $types = ['yes' => true, |
| 102 | 106 | 'no' => false, |
| 103 | 107 | 'true' => true, |
@@ -141,8 +145,12 @@ discard block |
||
| 141 | 145 | */ |
| 142 | 146 | private static function getNumber(string $v) |
| 143 | 147 | { |
| 144 | - if ((bool) preg_match(Regex::OCTAL_NUM, $v)) return intval(base_convert($v, 8, 10)); |
|
| 145 | - if ((bool) preg_match(Regex::HEX_NUM, $v)) return intval(base_convert($v, 16, 10)); |
|
| 148 | + if ((bool) preg_match(Regex::OCTAL_NUM, $v)) { |
|
| 149 | + return intval(base_convert($v, 8, 10)); |
|
| 150 | + } |
|
| 151 | + if ((bool) preg_match(Regex::HEX_NUM, $v)) { |
|
| 152 | + return intval(base_convert($v, 16, 10)); |
|
| 153 | + } |
|
| 146 | 154 | return is_bool(strpos($v, '.')) || substr_count($v, '.') > 1 ? intval($v) : floatval($v); |
| 147 | 155 | } |
| 148 | 156 | |