@@ -90,8 +90,12 @@ discard block |
||
| 90 | 90 | */ |
| 91 | 91 | public static function getScalar(string $v, bool $onlyScalar = false) |
| 92 | 92 | { |
| 93 | - if (Regex::isDate($v)) return self::$dateAsObject && !$onlyScalar ? date_create($v) : $v; |
|
| 94 | - if (Regex::isNumber($v)) return self::getNumber($v); |
|
| 93 | + if (Regex::isDate($v)) { |
|
| 94 | + return self::$dateAsObject && !$onlyScalar ? date_create($v) : $v; |
|
| 95 | + } |
|
| 96 | + if (Regex::isNumber($v)) { |
|
| 97 | + return self::getNumber($v); |
|
| 98 | + } |
|
| 95 | 99 | $types = ['yes' => true, |
| 96 | 100 | 'no' => false, |
| 97 | 101 | 'true' => true, |
@@ -114,8 +118,12 @@ discard block |
||
| 114 | 118 | */ |
| 115 | 119 | private static function getNumber(string $v) |
| 116 | 120 | { |
| 117 | - if (preg_match(Regex::OCTAL_NUM, $v)) return intval(base_convert($v, 8, 10)); |
|
| 118 | - if (preg_match(Regex::HEX_NUM, $v)) return intval(base_convert($v, 16, 10)); |
|
| 121 | + if (preg_match(Regex::OCTAL_NUM, $v)) { |
|
| 122 | + return intval(base_convert($v, 8, 10)); |
|
| 123 | + } |
|
| 124 | + if (preg_match(Regex::HEX_NUM, $v)) { |
|
| 125 | + return intval(base_convert($v, 16, 10)); |
|
| 126 | + } |
|
| 119 | 127 | return is_bool(strpos($v, '.')) ? intval($v) : floatval($v); |
| 120 | 128 | } |
| 121 | 129 | |
@@ -25,7 +25,9 @@ |
||
| 25 | 25 | |
| 26 | 26 | public function add(Node $child):Node |
| 27 | 27 | { |
| 28 | - if (is_null($this->value)) $this->value = new NodeList(); |
|
| 28 | + if (is_null($this->value)) { |
|
| 29 | + $this->value = new NodeList(); |
|
| 30 | + } |
|
| 29 | 31 | $candidate = $child; |
| 30 | 32 | if (!isOneOf($child, ['NodeScalar', 'NodeBlank', 'NodeComment', 'NodeQuoted'])) { |
| 31 | 33 | $candidate = new NodeScalar((string) $child->raw, $child->line); |
@@ -108,7 +108,9 @@ |
||
| 108 | 108 | { |
| 109 | 109 | foreach ($comparison as $className) { |
| 110 | 110 | $fqn = __NAMESPACE__."\\$className"; |
| 111 | - if ($subject instanceof $fqn) return true; |
|
| 111 | + if ($subject instanceof $fqn) { |
|
| 112 | + return true; |
|
| 113 | + } |
|
| 112 | 114 | } |
| 113 | 115 | return false; |
| 114 | 116 | } |
| 115 | 117 | \ No newline at end of file |