@@ -112,8 +112,12 @@ discard block |
||
| 112 | 112 | \.nan | \.NaN | \.NAN tag:yaml.org,2002:float (Not a number) |
| 113 | 113 | * tag:yaml.org,2002:str (Default) |
| 114 | 114 | */ |
| 115 | - if (Regex::isDate($v)) return self::$dateAsObject && !$onlyScalar ? date_create($v) : $v; |
|
| 116 | - if (Regex::isNumber($v)) return self::getNumber($v); |
|
| 115 | + if (Regex::isDate($v)) { |
|
| 116 | + return self::$dateAsObject && !$onlyScalar ? date_create($v) : $v; |
|
| 117 | + } |
|
| 118 | + if (Regex::isNumber($v)) { |
|
| 119 | + return self::getNumber($v); |
|
| 120 | + } |
|
| 117 | 121 | $types = ['yes' => true, |
| 118 | 122 | 'no' => false, |
| 119 | 123 | 'true' => true, |
@@ -136,8 +140,12 @@ discard block |
||
| 136 | 140 | */ |
| 137 | 141 | private static function getNumber(string $v) |
| 138 | 142 | { |
| 139 | - if ((bool) preg_match(Regex::OCTAL_NUM, $v)) return intval(base_convert($v, 8, 10)); |
|
| 140 | - if ((bool) preg_match(Regex::HEX_NUM, $v)) return intval(base_convert($v, 16, 10)); |
|
| 143 | + if ((bool) preg_match(Regex::OCTAL_NUM, $v)) { |
|
| 144 | + return intval(base_convert($v, 8, 10)); |
|
| 145 | + } |
|
| 146 | + if ((bool) preg_match(Regex::HEX_NUM, $v)) { |
|
| 147 | + return intval(base_convert($v, 16, 10)); |
|
| 148 | + } |
|
| 141 | 149 | return is_bool(strpos($v, '.')) || substr_count($v, '.') > 1 ? intval($v) : floatval($v); |
| 142 | 150 | } |
| 143 | 151 | |
@@ -53,8 +53,12 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | public function dumpScalar($dataType, $indent) |
| 55 | 55 | { |
| 56 | - if ($dataType === \INF) return '.inf'; |
|
| 57 | - if ($dataType === -\INF) return '-.inf'; |
|
| 56 | + if ($dataType === \INF) { |
|
| 57 | + return '.inf'; |
|
| 58 | + } |
|
| 59 | + if ($dataType === -\INF) { |
|
| 60 | + return '-.inf'; |
|
| 61 | + } |
|
| 58 | 62 | switch (gettype($dataType)) { |
| 59 | 63 | case 'boolean': return $dataType ? 'true' : 'false'; |
| 60 | 64 | case 'float': //fall through |
@@ -75,8 +79,9 @@ discard block |
||
| 75 | 79 | } elseif (is_object($dataType)) { |
| 76 | 80 | if ($obj instanceof Tag) { |
| 77 | 81 | if ($obj instanceof Compact |
| 78 | - if ($obj instanceof \DateTime) |
|
| 79 | - return self::dumpArray($dataType, $indent); |
|
| 82 | + if ($obj instanceof \DateTime) { |
|
| 83 | + return self::dumpArray($dataType, $indent); |
|
| 84 | + } |
|
| 80 | 85 | $iterator = new ArrayIterator(); |
| 81 | 86 | } |
| 82 | 87 | } |
@@ -152,9 +157,13 @@ discard block |
||
| 152 | 157 | self::add(self::dump($obj->value, $indent + self::INDENT), $indent + self::INDENT); |
| 153 | 158 | } |
| 154 | 159 | } |
| 155 | - if ($obj instanceof Compact) return self::dumpCompact($obj, $indent); |
|
| 160 | + if ($obj instanceof Compact) { |
|
| 161 | + return self::dumpCompact($obj, $indent); |
|
| 162 | + } |
|
| 156 | 163 | //TODO: consider dumping datetime as date strings according to a format provided by user or default |
| 157 | - if ($obj instanceof \DateTime) return $obj->format(self::DATE_FORMAT); |
|
| 164 | + if ($obj instanceof \DateTime) { |
|
| 165 | + return $obj->format(self::DATE_FORMAT); |
|
| 166 | + } |
|
| 158 | 167 | $propList = get_object_vars($obj); |
| 159 | 168 | foreach ($propList as $property => $value) { |
| 160 | 169 | if (is_scalar($value) || $value instanceof Compact || $value instanceof \DateTime) { |
@@ -43,7 +43,9 @@ discard block |
||
| 43 | 43 | */ |
| 44 | 44 | public static function toString($dataType, int $options = null):string |
| 45 | 45 | { |
| 46 | - if (empty($dataType)) throw new \Exception(self::class.": No content to convert to Yaml"); |
|
| 46 | + if (empty($dataType)) { |
|
| 47 | + throw new \Exception(self::class.": No content to convert to Yaml"); |
|
| 48 | + } |
|
| 47 | 49 | self::$options = is_int($options) ? $options : self::OPTIONS; |
| 48 | 50 | if (is_scalar($dataType)) { |
| 49 | 51 | // TODO: what to woth comments ??? |
@@ -79,8 +81,12 @@ discard block |
||
| 79 | 81 | private static function dump($dataType, int $indent) |
| 80 | 82 | { |
| 81 | 83 | if (is_scalar($dataType)) { |
| 82 | - if ($dataType === \INF) return '.inf'; |
|
| 83 | - if ($dataType === -\INF) return '-.inf'; |
|
| 84 | + if ($dataType === \INF) { |
|
| 85 | + return '.inf'; |
|
| 86 | + } |
|
| 87 | + if ($dataType === -\INF) { |
|
| 88 | + return '-.inf'; |
|
| 89 | + } |
|
| 84 | 90 | switch (gettype($dataType)) { |
| 85 | 91 | case 'boolean': return $dataType ? 'true' : 'false'; |
| 86 | 92 | case 'float': //fall through |
@@ -102,7 +108,9 @@ discard block |
||
| 102 | 108 | */ |
| 103 | 109 | private static function dumpYamlObject(YamlObject $obj) |
| 104 | 110 | { |
| 105 | - if ($obj->hasDocStart() && self::$result instanceof DLL) self::$result->push("---"); |
|
| 111 | + if ($obj->hasDocStart() && self::$result instanceof DLL) { |
|
| 112 | + self::$result->push("---"); |
|
| 113 | + } |
|
| 106 | 114 | // self::dump($obj, 0); |
| 107 | 115 | if (count($obj) > 0) { |
| 108 | 116 | self::dumpArray($obj->getArrayCopy(), 0); |