dallgoot / yaml

Regex.php

Braces +3 added lines, -2 removed lines

@@ -40,8 +40,9 @@
         $matchCanonical = preg_match($canonical, $v);
         $matchSpaced    = preg_match($spaced, $v);
         $matchIso       = preg_match($iso8601, $v);
-        if (is_bool($matchDate) || is_bool($matchCanonical) || is_bool($matchSpaced) || is_bool($matchIso))
-          throw new \Exception("Regex date error");
+        if (is_bool($matchDate) || is_bool($matchCanonical) || is_bool($matchSpaced) || is_bool($matchIso)) {
+                  throw new \Exception("Regex date error");
+        }
 
         return $matchDate || $matchCanonical || $matchSpaced || $matchIso;
     }

Node.php

Braces +36 added lines, -12 removed lines

@@ -110,8 +110,12 @@ 
             $type = R::isProperlyQuoted($nodeValue) ? T::QUOTED : T::PARTIAL;
             return [$type, $nodeValue];
         }
-        if (in_array($nodeValue[0], ['{', '[']))      return $this->_onObject($nodeValue);
-        if (in_array($nodeValue[0], ['!', '&', '*'])) return $this->_onNodeAction($nodeValue);
+        if (in_array($nodeValue[0], ['{', '['])) {
+            return $this->_onObject($nodeValue);
+        }
+        if (in_array($nodeValue[0], ['!', '&', '*'])) {
+            return $this->_onNodeAction($nodeValue);
+        }
         switch ($nodeValue[0]) {
             case '#': return [T::COMMENT, ltrim($v)];
             case "-": return $this->_onMinus($nodeValue);
@@ -149,9 +153,15 @@ 
     private function _onObject($value):array
     {
         json_decode($value, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
-        if (json_last_error() === JSON_ERROR_NONE)  return [T::JSON, $value];
-        if (preg_match(R::MAPPING, $value))         return [T::MAPPING_SHORT, $value];
-        if (preg_match(R::SEQUENCE, $value))        return [T::SEQUENCE_SHORT, $value];
+        if (json_last_error() === JSON_ERROR_NONE) {
+            return [T::JSON, $value];
+        }
+        if (preg_match(R::MAPPING, $value)) {
+            return [T::MAPPING_SHORT, $value];
+        }
+        if (preg_match(R::SEQUENCE, $value)) {
+            return [T::SEQUENCE_SHORT, $value];
+        }
         return [T::PARTIAL, $value];
     }
 
@@ -159,7 +169,9 @@ 
     {
         if (substr($nodeValue, 0, 3) === '---') {
             $rest = trim(substr($nodeValue, 3));
-            if (empty($rest)) return [T::DOC_START, null];
+            if (empty($rest)) {
+                return [T::DOC_START, null];
+            }
             $n = new Node($rest, $this->line);
             $n->indent = $this->indent + 4;
             return [T::DOC_START, $n->setParent($this)];
@@ -188,7 +200,9 @@ 
     public function getPhpValue()
     {
         $v = $this->value;
-        if (is_null($v)) return null;
+        if (is_null($v)) {
+            return null;
+        }
         switch ($this->type) {
             case T::JSON:   return json_decode($v, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR);
             case T::QUOTED: return substr($v, 1, -1);
@@ -217,16 +231,26 @@ 
                   '-.inf' => -INF,
                   '.nan'  => NAN
         ];
-        if (in_array(strtolower($v), array_keys($types))) return $types[strtolower($v)];
-        if (R::isDate($v))   return date_create($v);
-        if (R::isNumber($v)) return $this->getNumber($v);
+        if (in_array(strtolower($v), array_keys($types))) {
+            return $types[strtolower($v)];
+        }
+        if (R::isDate($v)) {
+            return date_create($v);
+        }
+        if (R::isNumber($v)) {
+            return $this->getNumber($v);
+        }
         return strval($v);
     }
 
     private function getNumber($v)
     {
-        if (preg_match("/^(0o\d+)$/i", $v))      return intval(base_convert($v, 8, 10));
-        if (preg_match("/^(0x[\da-f]+)$/i", $v)) return intval(base_convert($v, 16, 10));
+        if (preg_match("/^(0o\d+)$/i", $v)) {
+            return intval(base_convert($v, 8, 10));
+        }
+        if (preg_match("/^(0x[\da-f]+)$/i", $v)) {
+            return intval(base_convert($v, 16, 10));
+        }
         // if preg_match("/^([\d.]+e[-+]\d{1,2})$/", $v)://fall through
         // if preg_match("/^([-+]?(?:\d+|\d*.\d+))$/", $v):
             return is_bool(strpos($v, '.')) ? intval($v) : floatval($v);

YamlObject.php

Braces +6 added lines, -2 removed lines

@@ -40,8 +40,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;
     }
 }

Builder.php

Braces +20 added lines, -8 removed lines

@@ -19,7 +19,9 @@ 
 
     private static function build(object $node, &$parent = null)
     {
-        if ($node instanceof DLL) return self::buildDLL($node, $parent);
+        if ($node instanceof DLL) {
+            return self::buildDLL($node, $parent);
+        }
         return self::buildNode($node, $parent);
     }
 
@@ -62,12 +64,15 @@ 
             case T::REF_DEF: //fall through
             case T::REF_CALL:
                 $tmp = is_object($value) ? self::build($value, $parent) : $node->getPhpValue();
-                if ($type === T::REF_DEF) self::$root->addReference($name, $tmp);
+                if ($type === T::REF_DEF) {
+                    self::$root->addReference($name, $tmp);
+                }
                 return self::$root->getReference($name);
             case T::SET_KEY:
                 $key = json_encode(self::build($value, $parent), JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
-                if (empty($key))
-                    throw new \Exception("Cant serialize complex key: ".var_export($value, true), 1);
+                if (empty($key)) {
+                                    throw new \Exception("Cant serialize complex key: ".var_export($value, true), 1);
+                }
                 $parent->{$key} = null;
                 return;
             case T::SET_VALUE:
@@ -86,8 +91,11 @@ 
                     $parent->addTag($name);return;
                 } else {
                     if (in_array($name, ['!binary', '!str'])) {
-                        if (is_object($value->value)) $value->value->type = T::RAW;
-                        else $value->type = T::RAW;
+                        if (is_object($value->value)) {
+                            $value->value->type = T::RAW;
+                        } else {
+                            $value->type = T::RAW;
+                        }
                     }
                     $val = is_null($value) ? null : self::build($value, $node);
                     return new Tag($name, $val);
@@ -149,10 +157,14 @@ 
         }
         $root->value->setIteratorMode(DLL::IT_MODE_DELETE);
         foreach ($root->value as $child) {
-            if ($child->type === T::DOC_START) $totalDocStart++;
+            if ($child->type === T::DOC_START) {
+                $totalDocStart++;
+            }
             //if 0 or 1 DOC_START = we are still in first document
             $currentDoc = $totalDocStart > 1 ? $totalDocStart - 1 : 0;
-            if (!isset($documents[$currentDoc])) $documents[$currentDoc] = new DLL();
+            if (!isset($documents[$currentDoc])) {
+                $documents[$currentDoc] = new DLL();
+            }
             $documents[$currentDoc]->push($child);
         }
         $debug >= 2 && var_dump($documents);

Loader.php

Braces +18 added lines, -6 removed lines

@@ -66,9 +66,13 @@ 
     public function parse($strContent = null)
     {
         $source = $this->_content;
-        if (is_null($source)) $source = preg_split("/([^\n\r]+)/um", $strContent, 0, PREG_SPLIT_DELIM_CAPTURE);
+        if (is_null($source)) {
+            $source = preg_split("/([^\n\r]+)/um", $strContent, 0, PREG_SPLIT_DELIM_CAPTURE);
+        }
         //TODO : be more permissive on $strContent values
-        if (!is_array($source)) throw new \Exception(self::EXCEPTION_LINE_SPLIT);
+        if (!is_array($source)) {
+            throw new \Exception(self::EXCEPTION_LINE_SPLIT);
+        }
         $previous = $root = new Node();
         $emptyLines = [];
         $specialTypes = [T::LITTERAL, T::LITTERAL_FOLDED, T::EMPTY];
@@ -85,7 +89,9 @@ 
                     $deepest->parse($deepest->value.' '.ltrim($lineString));
                 } else {
                     if (in_array($n->type, $specialTypes)) {
-                        if ($this->_onSpecialType($n, $parent, $previous, $emptyLines)) continue;
+                        if ($this->_onSpecialType($n, $parent, $previous, $emptyLines)) {
+                            continue;
+                        }
                     }
                     foreach ($emptyLines as $key => $node) {
                         $node->getParent()->add($node);
@@ -96,7 +102,9 @@ 
                     } elseif ($n->indent === $previous->indent) {
                         $parent = $previous->getParent();
                     } elseif ($n->indent > $previous->indent) {
-                        if ($this->_onDeepestType($n, $parent, $previous, $lineString)) continue;
+                        if ($this->_onDeepestType($n, $parent, $previous, $lineString)) {
+                            continue;
+                        }
                     }
                     $parent->add($n);
                     $previous = $n;
@@ -125,8 +133,12 @@ 
         $deepest = $previous->getDeepestNode();
         switch ($n->type) {
             case T::EMPTY:
-                if ($previous->type === T::SCALAR) $emptyLines[] = $n->setParent($previous->getParent());
-                if (in_array($deepest->type, T::$LITTERALS)) $emptyLines[] = $n->setParent($deepest);
+                if ($previous->type === T::SCALAR) {
+                    $emptyLines[] = $n->setParent($previous->getParent());
+                }
+                if (in_array($deepest->type, T::$LITTERALS)) {
+                    $emptyLines[] = $n->setParent($deepest);
+                }
                 return true;
                 break;
             case T::LITTERAL://fall through