dallgoot / yaml

sources/NodeFactory.php

Braces +24 added lines, -14 removed lines

@@ -92,10 +92,13 @@ 
     final private static function onCompact(string $nodeString, int $line):Node
     {
         $json = json_decode($nodeString, false, 512, self::JSON_OPTIONS);
-        if (json_last_error() === \JSON_ERROR_NONE)       return new NodeJSON($nodeString, $line, $json);
-        elseif (preg_match(Regex::MAPPING, $nodeString))  return new NodeCompactMapping($nodeString, $line);
-        elseif (preg_match(Regex::SEQUENCE, $nodeString)) return new NodeCompactSequence($nodeString, $line);
-        else {
+        if (json_last_error() === \JSON_ERROR_NONE) {
+            return new NodeJSON($nodeString, $line, $json);
+        } elseif (preg_match(Regex::MAPPING, $nodeString)) {
+            return new NodeCompactMapping($nodeString, $line);
+        } elseif (preg_match(Regex::SEQUENCE, $nodeString)) {
+            return new NodeCompactSequence($nodeString, $line);
+        } else {
             return new NodePartial($nodeString, $line);
         }
     }
@@ -110,9 +113,11 @@ 
      */
     final private static function onHyphen(string $nodeString, int $line):Node
     {
-        if (substr($nodeString, 0, 3) === '---')       return new NodeDocStart($nodeString, $line);
-        elseif (preg_match(Regex::ITEM, $nodeString))  return new NodeItem($nodeString, $line);
-        else {
+        if (substr($nodeString, 0, 3) === '---') {
+            return new NodeDocStart($nodeString, $line);
+        } elseif (preg_match(Regex::ITEM, $nodeString)) {
+            return new NodeItem($nodeString, $line);
+        } else {
             return new NodeScalar($nodeString, $line);
         }
     }
@@ -126,10 +131,13 @@ 
      */
     final private static function onNodeAction(string $nodeString, int $line):Node
     {
-        if ($nodeString[0] === '!')     return new NodeTag($nodeString, $line);
-        elseif ($nodeString[0] === '&') return new NodeRefDef($nodeString, $line);
-        elseif ($nodeString[0] === '*') return new NodeRefCall($nodeString, $line);
-        else {
+        if ($nodeString[0] === '!') {
+            return new NodeTag($nodeString, $line);
+        } elseif ($nodeString[0] === '&') {
+            return new NodeRefDef($nodeString, $line);
+        } elseif ($nodeString[0] === '*') {
+            return new NodeRefCall($nodeString, $line);
+        } else {
             throw new \ParseError("Not a action node !! $nodeString[0]");
         }
     }
@@ -137,9 +145,11 @@ 
 
     final private static function onLiteral(string $nodeString, int $line):Node
     {
-        if ($nodeString[0] === '>')      return new NodeLitFolded($nodeString, $line);
-        elseif ($nodeString[0] === '|')  return new NodeLit($nodeString, $line);
-        else {
+        if ($nodeString[0] === '>') {
+            return new NodeLitFolded($nodeString, $line);
+        } elseif ($nodeString[0] === '|') {
+            return new NodeLit($nodeString, $line);
+        } else {
             throw new \ParseError("Not a literal node !! $nodeString[0]");
         }
     }

sources/Tag.php

Indentation +6 added lines, -6 removed lines

@@ -21,12 +21,12 @@
     private const NO_NAME = '%s Error: a tag MUST have a name';
     private const WRONG_VALUE = "Error : cannot transform tag '%s' for type '%s'";
     private const LEGACY_TAGS_HANDLERS = ['!str'       => 'strHandler',
-                                          '!binary'    => 'binaryHandler',
-                                          '!set'       => 'setHandler',
-                                          '!omap'      => 'mapHandler',
-                                          'php/object' => 'symfonyPHPobjectHandler',
-                                          '!inline'    => 'inlineHandler',
-                                          '!long'      => 'longHandler'];
+                                            '!binary'    => 'binaryHandler',
+                                            '!set'       => 'setHandler',
+                                            '!omap'      => 'mapHandler',
+                                            'php/object' => 'symfonyPHPobjectHandler',
+                                            '!inline'    => 'inlineHandler',
+                                            '!long'      => 'longHandler'];
 
     public static $registeredHandlers = [];
 

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
     {
         $reflectAPI = new \ReflectionClass(self::class);
         $methodsList = [];
-        $list = $reflectAPI->getMethods(RM::IS_FINAL | RM::IS_STATIC & RM::IS_PRIVATE);
+        $list = $reflectAPI->getMethods(RM::IS_FINAL|RM::IS_STATIC & RM::IS_PRIVATE);
         foreach ($list as $method) {
             $methodsList[$method->name] = $method->getClosure($this);
         }
@@ -77,7 +77,7 @@ 
      */
     private function checkHandlerArgument($tagName, $node)
     {
-        if (!($node instanceof Node) && !($node instanceof NodeList) ) {
+        if (!($node instanceof Node) && !($node instanceof NodeList)) {
             throw new \Exception(sprintf(self::WRONG_VALUE, $tagName, gettype($node)));
         }
     }

Braces +6 added lines, -2 removed lines

@@ -45,7 +45,9 @@ 
         }
         $this->tagName = $tagName;
         $this->raw = $raw;
-        if (empty(self::$registeredHandlers)) $this->registerLegacyTags();
+        if (empty(self::$registeredHandlers)) {
+            $this->registerLegacyTags();
+        }
     }
 
     /**
@@ -143,7 +145,9 @@ 
     private final static function strHandler(object $node, object &$parent = null)
     {
         if ($node instanceof Node) {
-            if ($node instanceof NodeKey) $node->build($parent);
+            if ($node instanceof NodeKey) {
+                $node->build($parent);
+            }
             return ltrim($node->raw);
         // } elseif ($node instanceof NodeList) {
         //     return Builder::buildLitteral($node);

sources/Dumper.php

Spacing +2 added lines, -2 removed lines

@@ -143,7 +143,7 @@ 
         foreach ($array as $key => $item) {
             $lineStart = current($refKeys) === $key ? "- " : "- $key: ";
             if (is_scalar($item)) {
-                self::add($lineStart.self::dump($item,0), $indent);
+                self::add($lineStart.self::dump($item, 0), $indent);
             } else {
                 self::add(rtrim($lineStart), $indent);
                 self::dump($item, $indent + self::INDENT);
@@ -213,7 +213,7 @@ 
         if (is_array($subject) || $subject instanceof \ArrayIterator) {
             $max = count($subject);
             $objectAsArray = is_array($subject) ? $subject : $subject->getArrayCopy();
-            if(array_keys($objectAsArray) !== range(0, $max-1)) {
+            if (array_keys($objectAsArray) !== range(0, $max - 1)) {
                 $pairs = $objectAsArray;
             } else {
                 $valuesList = [];

Braces +18 added lines, -6 removed lines

@@ -41,7 +41,9 @@ 
      */
     public static function toString($dataType, int $options = null):string
     {
-        if (is_null($dataType)) throw new \Exception(self::class.": No content to convert to Yaml");
+        if (is_null($dataType)) {
+            throw new \Exception(self::class.": No content to convert to Yaml");
+        }
         self::$options = is_int($options) ? $options : self::OPTIONS;
         self::$result = new DLL;
         if ($dataType instanceof YamlObject) {
@@ -83,8 +85,12 @@ 
     private static function dump($dataType, int $indent)
     {
         if (is_scalar($dataType)) {
-            if ($dataType === INF) return '.inf';
-            if ($dataType === -INF) return '-.inf';
+            if ($dataType === INF) {
+                return '.inf';
+            }
+            if ($dataType === -INF) {
+                return '-.inf';
+            }
             switch (gettype($dataType)) {
                 case 'boolean': return $dataType ? 'true' : 'false';
                 case 'float': //fall through
@@ -106,7 +112,9 @@ 
      */
     private static function dumpYamlObject(YamlObject $obj)
     {
-        if ($obj->hasDocStart() && self::$result instanceof DLL) self::$result->push("---");
+        if ($obj->hasDocStart() && self::$result instanceof DLL) {
+            self::$result->push("---");
+        }
         // self::dump($obj, 0);
         if (count($obj) > 0) {
             self::dumpArray($obj->getArrayCopy(), 0);
@@ -182,9 +190,13 @@ 
                 self::add(self::dump($obj->value, $indent + self::INDENT), $indent + self::INDENT);
             }
         }
-        if ($obj instanceof Compact) return self::dumpCompact($obj, $indent);
+        if ($obj instanceof Compact) {
+            return self::dumpCompact($obj, $indent);
+        }
         //TODO:  consider dumping datetime as date strings according to a format provided by user or default
-        if ($obj instanceof \DateTime) return $obj->format(self::DATE_FORMAT);
+        if ($obj instanceof \DateTime) {
+            return $obj->format(self::DATE_FORMAT);
+        }
         $propList = get_object_vars($obj);
         foreach ($propList as $property => $value) {
             if (is_scalar($value) || $value instanceof Compact || $value instanceof \DateTime) {

sources/nodetypes/NodeSetKey.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     public function build(&$parent = null)
     {
         $built = is_object($this->value) ? $this->value->build($parent) : null;
-        $stringKey = is_string($built) && Regex::isProperlyQuoted($built) ? trim($built, '\'" '): $built;
+        $stringKey = is_string($built) && Regex::isProperlyQuoted($built) ? trim($built, '\'" ') : $built;
         $key = json_encode($stringKey, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
         if (empty($key)) throw new \Exception("Cant serialize complex key: ".var_export($this->value, true));
         $parent->{trim($key, '\'" ')} = null;

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
         $built = is_object($this->value) ? $this->value->build($parent) : null;
         $stringKey = is_string($built) && Regex::isProperlyQuoted($built) ? trim($built, '\'" '): $built;
         $key = json_encode($stringKey, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
-        if (empty($key)) throw new \Exception("Cant serialize complex key: ".var_export($this->value, true));
+        if (empty($key)) {
+            throw new \Exception("Cant serialize complex key: ".var_export($this->value, true));
+        }
         $parent->{trim($key, '\'" ')} = null;
     }
 

sources/nodetypes/NodeComment.php

Indentation +12 added lines, -12 removed lines

@@ -10,15 +10,15 @@ 
  */
 class NodeComment extends Node
 {
-       /**
-     * According to the current Node type and deepest value
-     * this indicates if self::parse skips (or not) the parent and previous assignment
-     *
-     * @param      Node     $target    The parent target Node
-     *
-     * @return     boolean  True if context, False otherwiser
-     * @todo  is this really necessary according ot other checkings out there ?
-     */
+        /**
+         * According to the current Node type and deepest value
+         * this indicates if self::parse skips (or not) the parent and previous assignment
+         *
+         * @param      Node     $target    The parent target Node
+         *
+         * @return     boolean  True if context, False otherwiser
+         * @todo  is this really necessary according ot other checkings out there ?
+         */
     public function skipOnContext(Node &$target):bool
     {
         if (!$this->identifier) {
@@ -28,8 +28,8 @@ 
         return false;
     }
 
-   public function needsSpecialProcess(Node &$previous, array &$emptyLines):bool
-   {
+    public function needsSpecialProcess(Node &$previous, array &$emptyLines):bool
+    {
         $deepest = $previous->getDeepestNode();
         if (!($previous->getParent() instanceof NodeLiterals)
             && !($deepest instanceof NodeLiterals)) {
@@ -37,5 +37,5 @@ 
             return true;
         }
         return false;
-   }
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     public function skipOnContext(Node &$target):bool
     {
         if (!$this->identifier) {
-            $target = $target->getParent(-1);//if alone-on-line comment --> set parent to root
+            $target = $target->getParent(-1); //if alone-on-line comment --> set parent to root
             return true;
         }
         return false;

sources/nodetypes/NodeKey.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     public function getTargetOnLessIndent(Node $previous):Node
     {
         if ($this->indent === 0) {
-            return $previous->getParent(-1);//get root
+            return $previous->getParent(-1); //get root
         } else {
             return parent::getTargetOnLessIndent($previous);
         }
@@ -47,7 +47,7 @@ 
     public function getTargetonEqualIndent(Node &$previous):Node
     {
         if ($this->indent === 0) {
-            return $previous->getParent(-1);//get root
+            return $previous->getParent(-1); //get root
         } else {
             return parent::getTargetonEqualIndent($previous);
         }

sources/nodetypes/NodeCompactSequence.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     {
         parent::__construct($nodeString, $line);
         $this->value = new NodeList();
-        preg_match_all(Regex::SEQUENCE_VALUES, trim(substr(ltrim($nodeString), 1,-1)), $matches);
+        preg_match_all(Regex::SEQUENCE_VALUES, trim(substr(ltrim($nodeString), 1, -1)), $matches);
         foreach ($matches['item'] as $key => $item) {
             $this->value->push(new NodeItem('- '.$item, $line));
         }

sources/nodetypes/NodeLiterals.php

Indentation +2 added lines, -2 removed lines

@@ -76,8 +76,8 @@
         }
         if ($list->count()) {
             if ($this->modifier !== '+') {
-                 self::litteralStripLeading($list);
-                 self::litteralStripTrailing($list);
+                    self::litteralStripLeading($list);
+                    self::litteralStripTrailing($list);
             }
             $first = $list->shift();
             $refIndent = $first->indent ?? 0;

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
             $result = substr($first->raw, $first->indent);
             foreach ($list as $child) {
                 if ($this instanceof NodeLitFolded) {
-                    if($child->indent > $refIndent || ($child instanceof NodeBlank)) {
+                    if ($child->indent > $refIndent || ($child instanceof NodeBlank)) {
                         $separator = "\n";
                     } else {
                         $separator = !empty($result) && $result[-1] === "\n" ? '' : $refSeparator;
@@ -110,7 +110,7 @@ 
                         // $val .= $cursor->value;
                     }*/
                 }
-                $result .= $separator .$val;
+                $result .= $separator.$val;
             }
         }
         return $result.($this->modifier === '-' ? "" : "\n");

sources/nodetypes/NodeLit.php

Indentation +2 added lines, -2 removed lines

@@ -16,8 +16,8 @@
         $result = '';
         if ($list->count()) {
             if ($modifier !== '+') {
-                 self::litteralStripLeading($list);
-                 self::litteralStripTrailing($list);
+                    self::litteralStripLeading($list);
+                    self::litteralStripTrailing($list);
             }
             $first = $list->shift();
             $refIndent = $first->indent ?? 0;