dallgoot / yaml

yaml/Node.php

Braces +45 added lines, -15 removed lines

@@ -59,7 +59,9 @@ 
      */
     public function getParent(int $indent = null):Node
     {
-        if (!is_int($indent)) return $this->parent ?? $this;
+        if (!is_int($indent)) {
+            return $this->parent ?? $this;
+        }
         $cursor = $this;
         while ($cursor instanceof Node && $cursor->indent >= $indent) {
             $cursor = $cursor->parent;
@@ -150,8 +152,12 @@ 
             $type = R::isProperlyQuoted($nodeValue) ? Y::QUOTED : Y::PARTIAL;
             return [$type, $nodeValue];
         }
-        if (in_array($first, ['{', '[']))      return $this->onObject($nodeValue);
-        if (in_array($first, ['!', '&', '*'])) return $this->onNodeAction($nodeValue);
+        if (in_array($first, ['{', '['])) {
+            return $this->onObject($nodeValue);
+        }
+        if (in_array($first, ['!', '&', '*'])) {
+            return $this->onNodeAction($nodeValue);
+        }
         switch ($first) {
             case '#': return [Y::COMMENT, ltrim($v)];
             case "-": return $this->onHyphen($nodeValue);
@@ -203,9 +209,15 @@ 
     private function onObject($value):array
     {
         json_decode($value, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
-        if (json_last_error() === JSON_ERROR_NONE)  return [Y::JSON, $value];
-        if (preg_match(R::MAPPING, $value))         return [Y::COMPACT_MAPPING, $value];
-        if (preg_match(R::SEQUENCE, $value))        return [Y::COMPACT_SEQUENCE, $value];
+        if (json_last_error() === JSON_ERROR_NONE) {
+            return [Y::JSON, $value];
+        }
+        if (preg_match(R::MAPPING, $value)) {
+            return [Y::COMPACT_MAPPING, $value];
+        }
+        if (preg_match(R::SEQUENCE, $value)) {
+            return [Y::COMPACT_SEQUENCE, $value];
+        }
         return [Y::PARTIAL, $value];
     }
 
@@ -220,7 +232,9 @@ 
     {
         if (substr($nodeValue, 0, 3) === '---') {
             $rest = trim(substr($nodeValue, 3));
-            if (empty($rest)) return [Y::DOC_START, null];
+            if (empty($rest)) {
+                return [Y::DOC_START, null];
+            }
             $n = new Node($rest, $this->line);
             $n->indent = $this->indent + 4;
             return [Y::DOC_START, $n->setParent($this)];
@@ -262,9 +276,15 @@ 
     public function getPhpValue()
     {
         $v = &$this->value;
-        if (is_null($v)) return null;
-        if ($this->type & (Y::REF_CALL | Y::SCALAR)) return self::getScalar($v);
-        if ($this->type & (Y::COMPACT_MAPPING | Y::COMPACT_SEQUENCE)) return self::getCompact(substr($v, 1, -1), $this->type);
+        if (is_null($v)) {
+            return null;
+        }
+        if ($this->type & (Y::REF_CALL | Y::SCALAR)) {
+            return self::getScalar($v);
+        }
+        if ($this->type & (Y::COMPACT_MAPPING | Y::COMPACT_SEQUENCE)) {
+            return self::getCompact(substr($v, 1, -1), $this->type);
+        }
         switch ($this->type) {
             case Y::JSON:   return json_decode($v, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR);
             case Y::QUOTED: return substr($v, 1, -1);
@@ -293,9 +313,15 @@ 
                     '-.inf' => -INF,
                     '.nan'  => NAN
         ];
-        if (isset($types[strtolower($v)])) return $types[strtolower($v)];
-        if (R::isDate($v))   return date_create($v);
-        if (R::isNumber($v)) return self::getNumber($v);
+        if (isset($types[strtolower($v)])) {
+            return $types[strtolower($v)];
+        }
+        if (R::isDate($v)) {
+            return date_create($v);
+        }
+        if (R::isNumber($v)) {
+            return self::getNumber($v);
+        }
         return strval($v);
     }
 
@@ -308,8 +334,12 @@ 
      */
     private static function getNumber(string $v)
     {
-        if (preg_match("/^(0o\d+)$/i", $v))      return intval(base_convert($v, 8, 10));
-        if (preg_match("/^(0x[\da-f]+)$/i", $v)) return intval(base_convert($v, 16, 10));
+        if (preg_match("/^(0o\d+)$/i", $v)) {
+            return intval(base_convert($v, 8, 10));
+        }
+        if (preg_match("/^(0x[\da-f]+)$/i", $v)) {
+            return intval(base_convert($v, 16, 10));
+        }
         // TODO: remove these if not needed
         // if preg_match("/^([\d.]+e[-+]\d{1,2})$/", $v)://fall through
         // if preg_match("/^([-+]?(?:\d+|\d*.\d+))$/", $v):

yaml/Regex.php

Indentation +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         $matchSpaced    = preg_match($spaced, $v);
         $matchIso       = preg_match($iso8601, $v);
         if (is_bool($matchDate) || is_bool($matchCanonical) || is_bool($matchSpaced) || is_bool($matchIso)) {
-                  throw new \Exception("Regex date error");
+                    throw new \Exception("Regex date error");
         }
 
         return $matchDate || $matchCanonical || $matchSpaced || $matchIso;