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) {

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
         if (count(self::$schemas) === 0) {
             self::createCoreSchema();
         }
-        if (!($value instanceof NodeGeneric) && !($value instanceof NodeList) ) {
+        if (!($value instanceof NodeGeneric) && !($value instanceof NodeList)) {
               throw new \Exception(sprintf(self::WRONG_VALUE, $identifier, gettype($value)));
         } else {
             // try {

sources/tag/CoreSchema.php

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
      */
     public function str(object $node, &$parent = null)
     {
-        if($node instanceof Nodes\Literals){
+        if ($node instanceof Nodes\Literals) {
             $node = $node->value;
         }
         if ($node instanceof Nodes\NodeGeneric) {
@@ -72,7 +72,7 @@ 
                 $list[] = $this->str($child);
             }
             // return new Nodes\Scalar(implode('',$list), 0);
-            return implode('',$list);
+            return implode('', $list);
         }
     }
 
@@ -133,7 +133,7 @@ 
                 $keyValue = $key->value->build();
                 if (is_null($parent)) {
                     return [$keyName => $keyValue];
-                } else{
+                } else {
                     $parent[$keyName] = $keyValue;
                 }
             } else {

sources/nodes/DocStart.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
             throw new \Exception(__METHOD__." expects a YamlObject as parent", 1);
         }
         if (!is_null($this->value)) {
-            if ($this->value instanceof Tag){
+            if ($this->value instanceof Tag) {
                 preg_match(Regex::TAG_PARTS, $this->value->raw, $tagparts);
                 if (preg_match("/(?(DEFINE)".Regex::TAG_URI.')(?&url)/', $tagparts['tagname'], $matches)) {
                     // throw new \UnexpectedValueException("Tag '".$this->value->raw."' is invalid", 1);

sources/nodes/Tag.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
         } catch (\UnexpectedValueException $e) {
             return new Tagged($this->tag, is_null($value) ? null : $this->value->build($parent));
         } catch (\Throwable $e) {
-            throw new \Exception("Tagged value could not be transformed for tag '$this->tag'", 1, $e);;
+            throw new \Exception("Tagged value could not be transformed for tag '$this->tag'", 1, $e); ;
         }
     }
 }
\ No newline at end of file

sources/NodeFactory.php

Spacing +3 added lines, -3 removed lines

@@ -28,8 +28,8 @@ 
         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'];
+            $stringGroups = ['-', '>|', '"\'', "#%", "{[", ":?", '*&!'];
+            $methodGroups = ['Hyphen', 'Literal', 'Quoted', 'Special', 'Compact', 'SetElement', 'NodeAction'];
             foreach ($stringGroups as $groupIndex => $stringRef) {
                 if (is_int(strpos($stringRef, $first))) {
                     $methodName = 'on'.$methodGroups[$groupIndex];
@@ -145,7 +145,7 @@ 
         }
         // $action = trim($matches['action']);//var_dump($matches);
         switch ($first) {
-            case '!': return new Nodes\Tag   ($nodeString, $line);
+            case '!': return new Nodes\Tag($nodeString, $line);
             default :
                 return new Nodes\Anchor($nodeString, $line);
             // case '&': return new NodeAnchor($nodeString, $line);

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);
         }
     }

examples/read.php

Spacing +2 added lines, -2 removed lines

@@ -6,14 +6,14 @@
 /**
  * Display some use cases for Yaml library
  */
-const JSON_OPTIONS = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_LINE_TERMINATORS | JSON_UNESCAPED_UNICODE | JSON_PRESERVE_ZERO_FRACTION | JSON_PARTIAL_OUTPUT_ON_ERROR;
+const JSON_OPTIONS = JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_LINE_TERMINATORS|JSON_UNESCAPED_UNICODE|JSON_PRESERVE_ZERO_FRACTION|JSON_PARTIAL_OUTPUT_ON_ERROR;
 
 $debug = (int) (isset($argv[1]) ? $argv[1] : null);
 
 /* USE CASE 1
 * load and parse if file exists
 */
-$content = file_get_contents('./tests/cases/examples/Example_2_25.yml');//var_dump($content);
+$content = file_get_contents('./tests/cases/examples/Example_2_25.yml'); //var_dump($content);
 $yaml = Yaml::parse($content, 0, $debug);
 // var_dump($yaml);
 var_dump(json_encode($yaml, JSON_OPTIONS));