dallgoot / yaml

sources/types/YamlObject.php

Spacing +2 added lines, -2 removed lines

@@ -46,9 +46,9 @@
     public function __call($funcName, $arguments)
     {
         $reflectAPI = new \ReflectionClass(get_class($this->__yaml__object__api));
-        $getName    = function ($o) { return $o->name; };
+        $getName    = function($o) { return $o->name; };
         $publicApi  = array_map($getName, $reflectAPI->getMethods(\ReflectionMethod::IS_PUBLIC));
-        if (!in_array($funcName, $publicApi) ) {
+        if (!in_array($funcName, $publicApi)) {
             throw new \BadMethodCallException(sprintf(self::UNDEFINED_METHOD, $funcName, implode(",", $publicApi)));
         }
         return call_user_func_array([$this->__yaml__object__api, $funcName], $arguments);

Braces +6 added lines, -2 removed lines

@@ -74,8 +74,12 @@
     {
         $prop = get_object_vars($this);
         unset($prop["__yaml__object__api"]);
-        if (count($prop) > 0) return $prop;
-        if (count($this) > 0) return iterator_to_array($this);
+        if (count($prop) > 0) {
+            return $prop;
+        }
+        if (count($this) > 0) {
+            return iterator_to_array($this);
+        }
         return $this->__yaml__object__api->value ?? "_Empty YamlObject_";
     }
 }

sources/NodeFactory.php

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 (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 (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 (preg_match(Regex::MAPPING, trim($nodeString)))  return new NodeCompactMapping($nodeString, $line);
-        elseif (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 (preg_match(Regex::MAPPING, trim($nodeString))) {
+            return new NodeCompactMapping($nodeString, $line);
+        } elseif (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 (preg_match(Regex::ITEM, ltrim($nodeString)))  return new NodeItem($nodeString, $line);
-        else {
+        if (substr($nodeString, 0, 3) === '---') {
+            return new NodeDocStart($nodeString, $line);
+        } elseif (preg_match(Regex::ITEM, ltrim($nodeString))) {
+            return new NodeItem($nodeString, $line);
+        } else {
             return new NodeScalar($nodeString, $line);
         }
     }

Spacing +4 added lines, -4 removed lines

@@ -21,8 +21,8 @@ 
         elseif (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 (!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:

sources/NodeList.php

Indentation +6 added lines, -6 removed lines

@@ -79,12 +79,12 @@
      */
     public function checkTypeCoherence($estimatedType):bool
     {
-       // if ($this->type === self::MAPPING) {
-       //     if ($estimatedType === self::SEQUENCE) {
-       //         throw new \ParseError("Error : no coherence in types", 1);
-       //     }
-       // }
-       return (bool) $estimatedType;
+        // if ($this->type === self::MAPPING) {
+        //     if ($estimatedType === self::SEQUENCE) {
+        //         throw new \ParseError("Error : no coherence in types", 1);
+        //     }
+        // }
+        return (bool) $estimatedType;
     }
 
     public function build(&$parent = null)

Spacing +6 added lines, -6 removed lines

@@ -51,7 +51,7 @@ 
                 && !($child instanceof NodeDirective)
                 && !($child instanceof NodeBlank)
                 && !($child instanceof NodeDocstart
-                && is_null($child->value)) ) return true;
+                && is_null($child->value))) return true;
         }
         return false;
     }
@@ -59,12 +59,12 @@ 
     public function push($node)
     {
         $type = null;
-        if     ($node instanceof NodeItem )    $type = self::SEQUENCE;
+        if ($node instanceof NodeItem)    $type = self::SEQUENCE;
         elseif ($node instanceof NodeKey)      $type = self::MAPPING;
         elseif ($node instanceof NodeSetKey
              || $node instanceof NodeSetValue) {
             $type = self::SET;
-        } elseif ($node instanceof NodeScalar ){
+        } elseif ($node instanceof NodeScalar) {
             $type = self::MULTILINE;
         }
         if (!is_null($type) && $this->checkTypeCoherence($type)) {
@@ -126,7 +126,7 @@ 
             $output = trim($first->raw);
             foreach ($list as $child) {
                 if ($child instanceof NodeScalar) {
-                    $separator = isset($output[-1])  && $output[-1] === "\n" ? '' : ' ';
+                    $separator = isset($output[-1]) && $output[-1] === "\n" ? '' : ' ';
                     $output .= $separator.trim($child->raw);
                 } elseif ($child instanceof NodeBlank) {
                     $output .= "\n";
@@ -146,10 +146,10 @@ 
             if ($child instanceof NodeComment) {
                 // $child->build();
             } else {
-                if($child->value instanceof NodeComment) {
+                if ($child->value instanceof NodeComment) {
                     // $child->value->build();
                     // $child->value = null;
-                } elseif($child->value instanceof NodeList) {
+                } elseif ($child->value instanceof NodeList) {
                     $child->value = $child->value->filterComment();
                 }
                 $out->push($child);

Braces +11 added lines, -5 removed lines

@@ -37,7 +37,9 @@ 
         $tmp->rewind();
         $fqn = __NAMESPACE__."\\$nodeType";
         foreach ($tmp as $child) {
-            if ($child instanceof $fqn) return true;
+            if ($child instanceof $fqn) {
+                return true;
+            }
         }
         return false;
     }
@@ -51,7 +53,9 @@ 
                 && !($child instanceof NodeDirective)
                 && !($child instanceof NodeBlank)
                 && !($child instanceof NodeDocstart
-                && is_null($child->value)) ) return true;
+                && is_null($child->value)) ) {
+                return true;
+            }
         }
         return false;
     }
@@ -59,9 +63,11 @@ 
     public function push($node)
     {
         $type = null;
-        if     ($node instanceof NodeItem )    $type = self::SEQUENCE;
-        elseif ($node instanceof NodeKey)      $type = self::MAPPING;
-        elseif ($node instanceof NodeSetKey
+        if     ($node instanceof NodeItem ) {
+            $type = self::SEQUENCE;
+        } elseif ($node instanceof NodeKey) {
+            $type = self::MAPPING;
+        } elseif ($node instanceof NodeSetKey
              || $node instanceof NodeSetValue) {
             $type = self::SET;
         } elseif ($node instanceof NodeScalar ){

sources/Builder.php

Indentation +7 added lines, -7 removed lines

@@ -92,13 +92,13 @@
         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,
-                  'false' => false,
-                  'null'  => null,
-                  '.inf'  => \INF,
-                  '-.inf' => -\INF,
-                  '.nan'  => \NAN
+                    'no'    => false,
+                    'true'  => true,
+                    'false' => false,
+                    'null'  => null,
+                    '.inf'  => \INF,
+                    '-.inf' => -\INF,
+                    '.nan'  => \NAN
         ];
         return array_key_exists(strtolower($v), $types) ? $types[strtolower($v)] : $v;
     }

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
                     $buffer->push($child);
                 }
             }
-            $documents[] = self::buildDocument($buffer, count($documents) +1);
+            $documents[] = self::buildDocument($buffer, count($documents) + 1);
         } catch (\Exception|\Error|\ParseError $e) {
             throw new \Exception($e->getMessage(), 1, $e);
         }

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 (preg_match(Regex::OCTAL_NUM, $v)) return intval(base_convert($v, 8, 10));
-        if (preg_match(Regex::HEX_NUM, $v))   return intval(base_convert($v, 16, 10));
+        if (preg_match(Regex::OCTAL_NUM, $v)) {
+            return intval(base_convert($v, 8, 10));
+        }
+        if (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);
     }
 

sources/nodes/NodeDocStart.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         if (is_null($this->value)) {
             return null;
         } else {
-            if ($this->value instanceof NodeTag){
+            if ($this->value instanceof NodeTag) {
                 $parent->addTag($this->value->tag);
                 $this->value->build($parent);
             } else {

sources/nodes/NodeLit.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
         $result = '';
         $list = $value->filterComment();
         if ($this->identifier !== '+') {
-             self::litteralStripTrailing($list);
+                self::litteralStripTrailing($list);
         }
         if ($list->count()) {
             $list->setIteratorMode(NodeList::IT_MODE_DELETE);

sources/nodes/NodeItem.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         if ($value instanceof NodeKey && $child instanceof NodeKey) {
             if ($value->indent === $child->indent) {
                 return parent::add($child);
-            } elseif ($value->isAwaitingChild($child)){
+            } elseif ($value->isAwaitingChild($child)) {
                 return $value->add($child);
             } else {
                 // throw new \ParseError('key ('.$value->identifier.')@'.$value->line.' has already a value', 1);

sources/nodes/NodeKey.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     public function setIdentifier(string $keyString)
     {
         if ($keyString === '') {
-           throw new \ParseError(sprintf(self::ERROR_NO_KEYNAME, $this->line));
+            throw new \ParseError(sprintf(self::ERROR_NO_KEYNAME, $this->line));
         } else {
             $keyNode = NodeFactory::get($keyString);
             if (!is_null($keyNode->anchor)) {

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 
     public function add(Node $child):Node
     {
-        if ($this->value instanceof Node && Yaml::isOneOf($this->value, ['NodeLit','NodeLitFolded', 'NodeAnchor'])) {
+        if ($this->value instanceof Node && Yaml::isOneOf($this->value, ['NodeLit', 'NodeLitFolded', 'NodeAnchor'])) {
             return $this->value->add($child);
         } else {
             return parent::add($child);
@@ -87,7 +87,7 @@ 
         if ($current instanceof NodeComment) {
             return true;
         }
-        if($current instanceof NodeScalar) {
+        if ($current instanceof NodeScalar) {
             return Yaml::isOneOf($node, ['NodeScalar', 'NodeBlank']);
         }
         if ($current instanceof NodeItem) {

sources/nodes/NodeLitFolded.php

Indentation +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
         $result = '';
         $list = $value->filterComment();
         if ($this->identifier !== '+') {
-             self::litteralStripLeading($list);
-             self::litteralStripTrailing($list);
+                self::litteralStripLeading($list);
+                self::litteralStripTrailing($list);
         }
         if ($list->count()) {
             $refSeparator = ' ';

Spacing +2 added lines, -2 removed lines

@@ -31,14 +31,14 @@
             $result = $this->getChildValue($first, $indent);
             foreach ($list as $child) {
                 $separator = ($result && $result[-1] === "\n") ? '' : $refSeparator;
-                if($child->indent > $indent || $child instanceof NodeBlank) {
+                if ($child->indent > $indent || $child instanceof NodeBlank) {
                     $separator = "\n";
                 }
                 $val = $this->getChildValue($child, $indent);
                 if ($child->value instanceof NodeList) {
                     $val = "\n".$this->getFinalString($child->value, $indent);
                 }
-                $result .= $separator .$val;
+                $result .= $separator.$val;
             }
         }
         return $result;