dallgoot / yaml

yaml/Dumper.php

Spacing +3 added lines, -3 removed lines

@@ -116,7 +116,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($lineStart, $indent);
                 self::dump($item, $indent + self::INDENT);
@@ -163,10 +163,10 @@ 
         if (is_array($subject) || $subject instanceof \ArrayIterator) {
             $max = count($subject);
             $objectAsArray = is_array($subject) ? $subject : $subject->getArrayCopy();
-            if(array_keys($objectAsArray) !== range(0, $max)) {
+            if (array_keys($objectAsArray) !== range(0, $max)) {
                 $pairs = $objectAsArray;
             } else {
-                $valuesList = array_map(self::dump, $objectAsArray, array_fill( 0 , $max , $indent ));
+                $valuesList = array_map(self::dump, $objectAsArray, array_fill(0, $max, $indent));
                 return '['.implode(', ', $valuesList).']';
             }
         } else {

yaml/Loader.php

Spacing +7 added lines, -7 removed lines

@@ -17,10 +17,10 @@ 
     //public
     /* @var null|string */
     public static $error;
-    public const IGNORE_DIRECTIVES = 1;//DONT include_directive
-    public const IGNORE_COMMENTS    = 2;//DONT include_comments
-    public const NO_PARSING_EXCEPTIONS = 4;//DONT throw Exception on parsing errors
-    public const NO_OBJECT_FOR_DATE = 8;//DONT import date strings as dateTime Object
+    public const IGNORE_DIRECTIVES = 1; //DONT include_directive
+    public const IGNORE_COMMENTS    = 2; //DONT include_comments
+    public const NO_PARSING_EXCEPTIONS = 4; //DONT throw Exception on parsing errors
+    public const NO_OBJECT_FOR_DATE = 8; //DONT import date strings as dateTime Object
 
     //privates
     /* @var null|false|array */
@@ -28,7 +28,7 @@ 
     /* @var null|string */
     private $filePath;
     /* @var integer */
-    private $debug = 0;///TODO: determine levels
+    private $debug = 0; ///TODO: determine levels
     /* @var integer */
     private $options = 0;
     //Exceptions messages
@@ -78,7 +78,7 @@ 
         $source = $this->content ?? preg_split("/\n/m", preg_replace('/(\r\n|\r)/', "\n", $strContent), 0, PREG_SPLIT_DELIM_CAPTURE);
         //TODO : be more permissive on $strContent values
         if (!is_array($source) || !count($source)) throw new \Exception(self::EXCEPTION_LINE_SPLIT);
-        return function () use($source) {
+        return function() use($source) {
             foreach ($source as $key => $value) {
                 yield ++$key => $value;
             }
@@ -120,7 +120,7 @@ 
                     case 0:
                         if ($n->type & Y::KEY && $n->indent === 0) {
                             $target = $root;
-                        } elseif($n->type & Y::ITEM && $deepest->type & Y::KEY && is_null($deepest->value)) {
+                        } elseif ($n->type & Y::ITEM && $deepest->type & Y::KEY && is_null($deepest->value)) {
                             $target = $deepest;
                         } else {
                             $target = $previous->getParent();

yaml/NodeList.php

Spacing +5 added lines, -5 removed lines

@@ -45,16 +45,16 @@
     public function forceType()
     {
         if (is_null($this->type)) {
-            $childTypes  = $this->getTypes();
-            if ($childTypes & (Y::KEY|Y::SET_KEY)) {
-                if ($childTypes & Y::ITEM) {
+            $childTypes = $this->getTypes();
+            if ($childTypes&(Y::KEY|Y::SET_KEY)) {
+                if ($childTypes&Y::ITEM) {
                     throw new \ParseError(self::class.": Error conflicting types found");
                 }
                 $this->type = Y::MAPPING;
             } else {
-                if ($childTypes & Y::ITEM) {
+                if ($childTypes&Y::ITEM) {
                     $this->type = Y::SEQUENCE;
-                } elseif (!($childTypes & Y::COMMENT)) {
+                } elseif (!($childTypes&Y::COMMENT)) {
                     $this->type = Y::LITT_FOLDED;
                 }
             }

yaml/YamlObject.php

Spacing +2 added lines, -2 removed lines

@@ -43,9 +43,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)), 1);
         }
         return call_user_func_array([$this->__yaml__object__api, $funcName], $arguments);

yaml/Compact.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         $prop = get_object_vars($this);
         if (count($prop) > 0) return $prop;
         if (count($this) > 0) return iterator_to_array($this);
-        return $this;//new \Stdclass;
+        return $this; //new \Stdclass;
     }
 
     /**

yaml/Node.php

Spacing +7 added lines, -7 removed lines

@@ -182,7 +182,7 @@ 
         elseif (in_array($first, ['?', ':']))      $this->onSetElement($nodeValue);
         elseif (in_array($first, ['!', '&', '*'])) $this->onNodeAction($nodeValue);
         else {
-            $characters = [ '#' =>  [Y::COMMENT, $v],
+            $characters = ['#' =>  [Y::COMMENT, $v],
                             '%' =>  [Y::DIRECTIVE, $v],
                             '>' =>  [Y::LITT_FOLDED, null],
                             '|' =>  [Y::LITT, null]
@@ -251,28 +251,28 @@ 
     private function onCompact($value)
     {
         $this->value = json_decode($value, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
-        if (json_last_error() === JSON_ERROR_NONE){
+        if (json_last_error() === JSON_ERROR_NONE) {
             $this->type = Y::JSON;
             return;
         }
         $this->value = new NodeList();
-        if (preg_match(R::MAPPING, $value)){
+        if (preg_match(R::MAPPING, $value)) {
             $this->type = Y::COMPACT_MAPPING;
             $this->value->type = Y::COMPACT_MAPPING;
-            preg_match_all(R::MAPPING_VALUES, trim(substr($value, 1,-1)), $matches);
+            preg_match_all(R::MAPPING_VALUES, trim(substr($value, 1, -1)), $matches);
             foreach ($matches['k'] as $index => $property) {
                 $n = new Node('', $this->line);
                 $n->type = Y::KEY;
-                $n->identifier = trim($property, '"\' ');//TODO : maybe check for proper quoting first ?
+                $n->identifier = trim($property, '"\' '); //TODO : maybe check for proper quoting first ?
                 $n->value = new Node($matches['v'][$index], $this->line);
                 $this->value->push($n);
             }
             return;
         }
-        if (preg_match(R::SEQUENCE, $value)){
+        if (preg_match(R::SEQUENCE, $value)) {
             $this->type = Y::COMPACT_SEQUENCE;
             $this->value->type = Y::COMPACT_SEQUENCE;
-            preg_match_all(R::SEQUENCE_VALUES, trim(substr($value, 1,-1)), $matches);
+            preg_match_all(R::SEQUENCE_VALUES, trim(substr($value, 1, -1)), $matches);
             foreach ($matches['item'] as $key => $item) {
                 $i = new Node('', $this->line);
                 $i->type = Y::ITEM;

example.php

Spacing +2 added lines, -2 removed lines

@@ -6,13 +6,13 @@
 /**
  * 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;
 
 /* USE CASE 1
 * load and parse if file exists
 */
 ini_set("auto_detect_line_endings", 1);
-$content = file_get_contents('./tests/cases/parsing/multidoc_sequence.yml');//var_dump($content);
+$content = file_get_contents('./tests/cases/parsing/multidoc_sequence.yml'); //var_dump($content);
 // $content = file_get_contents('./tests/cases/examples/Example_2_17.yml');//var_dump($content);
 $yaml = Y::parse($content, null, 3);
 // $yaml = Y::parseFile('./references/Example 2.27.yml', null, 1);

yaml/Builder.php

Spacing +14 added lines, -14 removed lines

@@ -37,7 +37,7 @@ 
         $_root->value->setIteratorMode(NodeList::IT_MODE_DELETE);
         foreach ($_root->value as $child) {
             if ($child->type & Y::DOC_START) {
-                if(++$totalDocStart > 1){
+                if (++$totalDocStart > 1) {
                     $documents[] = self::buildDocument($buffer, count($documents));
                     $buffer = new NodeList($child);
                 }
@@ -82,13 +82,13 @@ 
      *
      * @return mixed    The parent (object|array) or a string representing the NodeList.
      */
-    private static function buildNodeList(NodeList $node, &$parent=null)
+    private static function buildNodeList(NodeList $node, &$parent = null)
     {
         $node->forceType();
-        if ($node->type & (Y::RAW | Y::LITTERALS)) {
+        if ($node->type & (Y::RAW|Y::LITTERALS)) {
             return self::buildLitteral($node, (int) $node->type);
         }
-        $action = function ($child, &$parent, &$out) {
+        $action = function($child, &$parent, &$out) {
             self::build($child, $out);
         };
         if ($node->type & (Y::COMPACT_MAPPING|Y::MAPPING|Y::SET)) {
@@ -97,7 +97,7 @@ 
             $out = $parent ?? [];
         } else {
             $out = '';
-            $action = function ($child, &$parent, &$out) {
+            $action = function($child, &$parent, &$out) {
                 if ($child->type & (Y::SCALAR|Y::QUOTED)) {
                     if ($parent) {
                         $parent->setText(self::build($child));
@@ -136,11 +136,11 @@ 
         ];
         if (isset($actions[$type])) {
             return self::{$actions[$type]}($node, $parent);
-        } elseif ($type & Y::COMMENT) {
+        } elseif ($type&Y::COMMENT) {
             self::$_root->addComment($line, $value);
-        } elseif ($type & (Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) {
+        } elseif ($type&(Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) {
             return self::buildNodeList($value, $parent);
-        } elseif ($type & (Y::REF_DEF | Y::REF_CALL)) {
+        } elseif ($type&(Y::REF_DEF|Y::REF_CALL)) {
             return self::handleReference($node, $parent);
         } elseif ($value instanceof Node) {
             return self::buildNode($value, $parent);
@@ -166,7 +166,7 @@ 
      * @throws \ParseError if Key has no name(identifier) Note: empty string is allowed
      * @return null
      */
-    private static function buildKey(Node $node, &$parent=null)
+    private static function buildKey(Node $node, &$parent = null)
     {
         extract((array) $node, EXTR_REFS);
         if (is_null($identifier)) {
@@ -213,7 +213,7 @@ 
         $numKeys = array_filter(array_keys($ref), 'is_int');
         $key = count($numKeys) > 0 ? max($numKeys) + 1 : 0;
         if ($value instanceof Node) {
-            if($value->type & Y::KEY) {
+            if ($value->type & Y::KEY) {
                 self::buildKey($node->value, $parent);
                 return;
             } elseif ($value->type & Y::ITEM) {
@@ -242,7 +242,7 @@ 
         //remove trailing blank
         while ($list->top()->type & Y::BLANK) $list->pop();
         $result = '';
-        $separator = [ Y::RAW => '', Y::LITT => "\n", Y::LITT_FOLDED => ' '][$type];
+        $separator = [Y::RAW => '', Y::LITT => "\n", Y::LITT_FOLDED => ' '][$type];
         foreach ($list as $child) {
             if ($child->value instanceof NodeList) {
                 $result .= self::buildLitteral($child->value, $type).$separator;
@@ -256,7 +256,7 @@ 
     private function setLiteralValue(Node $child, string &$result, int $refIndent, string $separator, int $type)
     {
         $val = $child->type & (Y::SCALAR) ? $child->value : substr($child->raw, $refIndent);
-        if ($type & Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) {
+        if ($type&Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) {
             if ($result[-1] === $separator)
                 $result[-1] = "\n";
             if ($result[-1] === "\n")
@@ -277,7 +277,7 @@ 
     private function buildSetKey(Node $node, &$parent)
     {
         $built = is_object($node->value) ? self::build($node->value) : 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($node->value, true), 1);
         $parent->{trim($key, '\'" ')} = null;
@@ -293,7 +293,7 @@ 
     {
         $prop = array_keys(get_object_vars($parent));
         $key = end($prop);
-        if ($node->value->type & (Y::ITEM|Y::KEY )) {
+        if ($node->value->type & (Y::ITEM|Y::KEY)) {
             $node->value = new NodeList($node->value);
         }
         $parent->{$key} = self::build($node->value);