dallgoot / yaml

sources/NodeFactory.php

Spacing +4 added lines, -4 removed lines

@@ -21,8 +21,8 @@ 
         elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) return new NodeKey($nodeString, $line, $matches);
         else {
             $first = $trimmed[0];
-            $stringGroups = ["-" ,'>|' ,'"\'',"#%" ,"{[" ,":?" ,'*&!'];
-            $methodGroups = ['Hyphen','Literal','Quoted','Special','Compact','SetElement','NodeAction'];
+            $stringGroups = ["-", '>|', '"\'', "#%", "{[", ":?", '*&!'];
+            $methodGroups = ['Hyphen', 'Literal', 'Quoted', 'Special', 'Compact', 'SetElement', 'NodeAction'];
             foreach ($stringGroups as $groupIndex => $stringRef) {
                 if (is_int(strpos($stringRef, $first))) {
                     $methodName = 'on'.$methodGroups[$groupIndex];
@@ -127,9 +127,9 @@ 
         if (!((bool) preg_match(Regex::NODE_ACTIONS, trim($nodeString), $matches))) {
             return new NodeScalar($nodeString, $line);
         }
-        $action = trim($matches['action']);//var_dump($matches);
+        $action = trim($matches['action']); //var_dump($matches);
         switch ($action[0]) {
-            case '!': return new NodeTag   ($nodeString, $line);
+            case '!': return new NodeTag($nodeString, $line);
             case '&': return new NodeAnchor($nodeString, $line);
             case '*': return new NodeAnchor($nodeString, $line);
             // default:

Braces +19 added lines, -11 removed lines

@@ -16,10 +16,13 @@ 
     final public static function get($nodeString = null, $line = 0):Node
     {
         $trimmed = ltrim($nodeString);
-        if ($trimmed === '')                                return new NodeBlank($nodeString, $line);
-        elseif (substr($trimmed, 0, 3) === '...')           return new NodeDocEnd($nodeString, $line);
-        elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) return new NodeKey($nodeString, $line, $matches);
-        else {
+        if ($trimmed === '') {
+            return new NodeBlank($nodeString, $line);
+        } elseif (substr($trimmed, 0, 3) === '...') {
+            return new NodeDocEnd($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) {
+            return new NodeKey($nodeString, $line, $matches);
+        } else {
             $first = $trimmed[0];
             $stringGroups = ["-" ,'>|' ,'"\'',"#%" ,"{[" ,":?" ,'*&!'];
             $methodGroups = ['Hyphen','Literal','Quoted','Special','Compact','SetElement','NodeAction'];
@@ -90,10 +93,13 @@ 
     final private static function onCompact(string $first, string $nodeString, int $line):Node
     {
         json_decode($nodeString, false, 512, self::JSON_OPTIONS);
-        if (json_last_error() === \JSON_ERROR_NONE)             return new NodeJSON($nodeString, $line);
-        elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString)))  return new NodeCompactMapping($nodeString, $line);
-        elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) return new NodeCompactSequence($nodeString, $line);
-        else {
+        if (json_last_error() === \JSON_ERROR_NONE) {
+            return new NodeJSON($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString))) {
+            return new NodeCompactMapping($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) {
+            return new NodeCompactSequence($nodeString, $line);
+        } else {
             return new NodePartial($nodeString, $line);
         }
     }
@@ -108,9 +114,11 @@ 
      */
     final private static function onHyphen(string $first, string $nodeString, int $line):Node
     {
-        if (substr($nodeString, 0, 3) === '---')              return new NodeDocStart($nodeString, $line);
-        elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString)))  return new NodeItem($nodeString, $line);
-        else {
+        if (substr($nodeString, 0, 3) === '---') {
+            return new NodeDocStart($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString))) {
+            return new NodeItem($nodeString, $line);
+        } else {
             return new NodeScalar($nodeString, $line);
         }
     }

sources/Builder.php

Braces +12 added lines, -4 removed lines

@@ -89,8 +89,12 @@ 
      */
     public static function getScalar(string $v, bool $onlyScalar = false)
     {
-        if (Regex::isDate($v))   return self::$dateAsObject && !$onlyScalar ? date_create($v) : $v;
-        if (Regex::isNumber($v)) return self::getNumber($v);
+        if (Regex::isDate($v)) {
+            return self::$dateAsObject && !$onlyScalar ? date_create($v) : $v;
+        }
+        if (Regex::isNumber($v)) {
+            return self::getNumber($v);
+        }
         $types = ['yes'   => true,
                   'no'    => false,
                   'true'  => true,
@@ -113,8 +117,12 @@ 
      */
     private static function getNumber(string $v)
     {
-        if ((bool) preg_match(Regex::OCTAL_NUM, $v)) return intval(base_convert($v, 8, 10));
-        if ((bool) preg_match(Regex::HEX_NUM, $v))   return intval(base_convert($v, 16, 10));
+        if ((bool) preg_match(Regex::OCTAL_NUM, $v)) {
+            return intval(base_convert($v, 8, 10));
+        }
+        if ((bool) preg_match(Regex::HEX_NUM, $v)) {
+            return intval(base_convert($v, 16, 10));
+        }
         return is_bool(strpos($v, '.')) || substr_count($v, '.') > 1 ? intval($v) : floatval($v);
     }