dallgoot / yaml

sources/tag/TagFactory.php

Indentation +4 added lines, -5 removed lines

@@ -62,7 +62,6 @@ 
 %TAG !! tag:example.com,2000:app/
 %TAG !e! tag:example.com,2000:app/
 !<tag:yaml.org,2002:str> foo :
-
      */
     /**
      * Add Handlers for legacy Yaml tags
@@ -107,16 +106,16 @@ 
             self::createCoreSchema();
         }
         if (!($value instanceof NodeGeneric) && !($value instanceof NodeList) ) {
-              throw new \Exception(sprintf(self::WRONG_VALUE, $identifier, gettype($value)));
+                throw new \Exception(sprintf(self::WRONG_VALUE, $identifier, gettype($value)));
         } else {
             // try {
                 if (!preg_match(Regex::TAG_PARTS, $identifier, $matches)) {
                     throw new \UnexpectedValueException("Tag '$identifier' is invalid", 1);
                 }
                 return self::runHandler($matches['handle'],
-                                          $matches['tagname'],
-                                          $value,
-                                          $parent);
+                                            $matches['tagname'],
+                                            $value,
+                                            $parent);
             // } catch (\UnexpectedValueException $e) {
             //     return new Tagged($identifier, is_null($value) ? null : $value->build($parent));
             // } catch (\Throwable $e) {

sources/NodeFactory.php

Braces +19 added lines, -11 removed lines

@@ -23,10 +23,13 @@ 
     final public static function get($nodeString = null, $line = 0):NodeGeneric
     {
         $trimmed = ltrim($nodeString);
-        if ($trimmed === '')                                return new Nodes\Blank($nodeString, $line);
-        elseif (substr($trimmed, 0, 3) === '...')           return new Nodes\DocEnd($nodeString, $line);
-        elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) return new Nodes\Key($nodeString, $line, $matches);
-        else {
+        if ($trimmed === '') {
+            return new Nodes\Blank($nodeString, $line);
+        } elseif (substr($trimmed, 0, 3) === '...') {
+            return new Nodes\DocEnd($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) {
+            return new Nodes\Key($nodeString, $line, $matches);
+        } else {
             $first = $trimmed[0];
             $stringGroups = ['-',         '>|' ,   '"\'',    "#%" ,    "{[" ,       ":?" ,       '*&!'];
             $methodGroups = ['Hyphen','Literal','Quoted','Special','Compact','SetElement','NodeAction'];
@@ -105,10 +108,13 @@ 
     final private static function onCompact(string $first, string $nodeString, int $line):NodeGeneric
     {
         json_decode($nodeString, false, 512, self::JSON_OPTIONS);
-        if (json_last_error() === \JSON_ERROR_NONE)             return new Nodes\JSON($nodeString, $line);
-        elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString)))  return new Nodes\CompactMapping($nodeString, $line);
-        elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) return new Nodes\CompactSequence($nodeString, $line);
-        else {
+        if (json_last_error() === \JSON_ERROR_NONE) {
+            return new Nodes\JSON($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString))) {
+            return new Nodes\CompactMapping($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) {
+            return new Nodes\CompactSequence($nodeString, $line);
+        } else {
             return new Nodes\Partial($nodeString, $line);
         }
     }
@@ -123,9 +129,11 @@ 
      */
     final private static function onHyphen(string $first, string $nodeString, int $line):NodeGeneric
     {
-        if (substr($nodeString, 0, 3) === '---')              return new Nodes\DocStart($nodeString, $line);
-        elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString)))  return new Nodes\Item($nodeString, $line);
-        else {
+        if (substr($nodeString, 0, 3) === '---') {
+            return new Nodes\DocStart($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString))) {
+            return new Nodes\Item($nodeString, $line);
+        } else {
             return new Nodes\Scalar($nodeString, $line);
         }
     }