@@ -21,7 +21,9 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | public function __construct(int $options = null) |
| 23 | 23 | { |
| 24 | - if (is_int($options)) self::$options = $options; |
|
| 24 | + if (is_int($options)) { |
|
| 25 | + self::$options = $options; |
|
| 26 | + } |
|
| 25 | 27 | } |
| 26 | 28 | |
| 27 | 29 | /** |
@@ -36,7 +38,9 @@ discard block |
||
| 36 | 38 | */ |
| 37 | 39 | public static function toString($dataType, int $options = null):string |
| 38 | 40 | { |
| 39 | - if (is_null($dataType)) throw new \Exception(self::class.": No content to convert to Yaml", 1); |
|
| 41 | + if (is_null($dataType)) { |
|
| 42 | + throw new \Exception(self::class.": No content to convert to Yaml", 1); |
|
| 43 | + } |
|
| 40 | 44 | self::$options = is_int($options) ? $options : self::OPTIONS; |
| 41 | 45 | self::$result = new DLL; |
| 42 | 46 | self::$result->setIteratorMode(DLL::IT_MODE_FIFO | DLL::IT_MODE_DELETE); |
@@ -74,8 +78,12 @@ discard block |
||
| 74 | 78 | if (is_scalar($dataType)) { |
| 75 | 79 | switch (gettype($dataType)) { |
| 76 | 80 | case 'boolean': return $dataType ? 'true' : 'false'; |
| 77 | - case 'float': if (is_infinite((float) $dataType)) return $dataType > 0 ? '.inf' : '-.inf'; |
|
| 78 | - case 'double': if (is_nan((float) $dataType)) return '.nan'; |
|
| 81 | + case 'float': if (is_infinite((float) $dataType)) { |
|
| 82 | + return $dataType > 0 ? '.inf' : '-.inf'; |
|
| 83 | + } |
|
| 84 | + case 'double': if (is_nan((float) $dataType)) { |
|
| 85 | + return '.nan'; |
|
| 86 | + } |
|
| 79 | 87 | default: |
| 80 | 88 | return $dataType; |
| 81 | 89 | } |
@@ -78,9 +78,13 @@ discard block |
||
| 78 | 78 | public function parse($strContent = null) |
| 79 | 79 | { |
| 80 | 80 | $source = $this->content; |
| 81 | - if (is_null($source)) $source = preg_split("/([^\n\r]+)/um", $strContent, 0, PREG_SPLIT_DELIM_CAPTURE); |
|
| 81 | + if (is_null($source)) { |
|
| 82 | + $source = preg_split("/([^\n\r]+)/um", $strContent, 0, PREG_SPLIT_DELIM_CAPTURE); |
|
| 83 | + } |
|
| 82 | 84 | //TODO : be more permissive on $strContent values |
| 83 | - if (!is_array($source)) throw new \Exception(self::EXCEPTION_LINE_SPLIT); |
|
| 85 | + if (!is_array($source)) { |
|
| 86 | + throw new \Exception(self::EXCEPTION_LINE_SPLIT); |
|
| 87 | + } |
|
| 84 | 88 | $previous = $root = new Node(); |
| 85 | 89 | $emptyLines = []; |
| 86 | 90 | $specialTypes = Y\LITTERALS | Y\BLANK; |
@@ -108,7 +112,9 @@ discard block |
||
| 108 | 112 | case -1: $previous->getParent($n->indent)->add($n);break; |
| 109 | 113 | case 0: $previous->getParent()->add($n);break; |
| 110 | 114 | default: |
| 111 | - if ($this->onDeepestType($n, $previous, $lineString)) continue 2; |
|
| 115 | + if ($this->onDeepestType($n, $previous, $lineString)) { |
|
| 116 | + continue 2; |
|
| 117 | + } |
|
| 112 | 118 | $previous->add($n); |
| 113 | 119 | } |
| 114 | 120 | $previous = $n; |
@@ -147,8 +153,12 @@ discard block |
||
| 147 | 153 | } |
| 148 | 154 | } |
| 149 | 155 | if ($n->type & Y\BLANK) { |
| 150 | - if ($previous->type & Y\SCALAR) $emptyLines[] = $n->setParent($previous->getParent()); |
|
| 151 | - if ($deepest->type & Y\LITTERALS) $emptyLines[] = $n->setParent($deepest); |
|
| 156 | + if ($previous->type & Y\SCALAR) { |
|
| 157 | + $emptyLines[] = $n->setParent($previous->getParent()); |
|
| 158 | + } |
|
| 159 | + if ($deepest->type & Y\LITTERALS) { |
|
| 160 | + $emptyLines[] = $n->setParent($deepest); |
|
| 161 | + } |
|
| 152 | 162 | return true; |
| 153 | 163 | } |
| 154 | 164 | return false; |