dallgoot / yaml

yaml/YamlObject.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     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));
         $privateApi = array_map($getName, $reflectAPI->getMethods(\ReflectionMethod::IS_PRIVATE));
         if (!in_array($funcName, $publicApi) && !in_array($funcName, $privateApi)) {

yaml/Node.php

Spacing +8 added lines, -8 removed lines

@@ -189,7 +189,7 @@ 
             return;
         }
         // Note : php don't like '?' as an array key -_-'
-        if(in_array($first, ['?', ':'])) {
+        if (in_array($first, ['?', ':'])) {
             $this->type = $first === '?' ? Y::SET_KEY : Y::SET_VALUE;
             if (!empty(trim($v))) {
                 $this->value = new NodeList;
@@ -201,7 +201,7 @@ 
             $this->onHyphen($nodeValue);
             return;
         }
-        $characters = [ '#' =>  [Y::COMMENT, ltrim($v)],
+        $characters = ['#' =>  [Y::COMMENT, ltrim($v)],
                         '%' =>  [Y::DIRECTIVE, ltrim($v)],
                         '>' =>  [Y::LITT_FOLDED, null],
                         '|' =>  [Y::LITT, null]
@@ -254,28 +254,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;
-            $count = preg_match_all(R::SEQUENCE_VALUES, trim(substr($value, 1,-1)), $matches);
+            $count = 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/multiline_quoted_with_blank.yml');//var_dump($content);
+$content = file_get_contents('./tests/cases/parsing/multiline_quoted_with_blank.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/Loader.php

Spacing +7 added lines, -7 removed lines

@@ -19,17 +19,17 @@ 
     /* @var null|string */
     public static $error;
 
-    public const EXCLUDE_DIRECTIVES = 1;//DONT include_directive
-    public const IGNORE_COMMENTS    = 2;//DONT include_comments
-    public const NO_PARSING_EXCEPTIONS = 4;//THROW Exception on parsing Errors
-    public const NO_OBJECT_FOR_DATE = 8;//DONT import date strings as dateTime Object
+    public const EXCLUDE_DIRECTIVES = 1; //DONT include_directive
+    public const IGNORE_COMMENTS    = 2; //DONT include_comments
+    public const NO_PARSING_EXCEPTIONS = 4; //THROW Exception on parsing Errors
+    public const NO_OBJECT_FOR_DATE = 8; //DONT import date strings as dateTime Object
     //privates
     /* @var null|false|array| */
     private $content;
     /* @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
@@ -92,7 +92,7 @@ 
         $previous = $root = new Node();
         $emptyLines = [];
         try { //var_dump($source);
-            $gen = function () use($source) {
+            $gen = function() use($source) {
                 foreach ($source as $key => $value) {
                     yield ++$key => $value;
                 }
@@ -116,7 +116,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/Builder.php

Spacing +24 added lines, -24 removed lines

@@ -38,7 +38,7 @@ 
             $q->push($_root->value);
             // return self::buildNodeList($q, new YamlObject);
             self::$_root = new YamlObject;
-            $tmp =  self::buildNodeList($q, self::$_root);
+            $tmp = self::buildNodeList($q, self::$_root);
             // var_dump('alone', $tmp);
             return $tmp;
         }
@@ -87,29 +87,29 @@ 
      *
      * @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)
     {
         if (is_null($node->type)) {
-            $childTypes  = $node->getTypes();
-            if ($childTypes & (Y::KEY|Y::SET_KEY)) {
-                if ($childTypes & Y::ITEM) {
+            $childTypes = $node->getTypes();
+            if ($childTypes&(Y::KEY|Y::SET_KEY)) {
+                if ($childTypes&Y::ITEM) {
                     // TODO: replace the document index in HERE ----------v
                     throw new \ParseError(sprintf(self::INVALID_DOCUMENT, 0));
                 } else {
                     $node->type = Y::MAPPING;
                 }
             } else {
-                if ($childTypes & Y::ITEM) {
+                if ($childTypes&Y::ITEM) {
                     $node->type = Y::SEQUENCE;
-                } elseif (!($childTypes & Y::COMMENT)) {
+                } elseif (!($childTypes&Y::COMMENT)) {
                     $node->type = Y::LITT_FOLDED;
                 }
             }
         }
-        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)) {
@@ -118,7 +118,7 @@ 
             $out = $parent ?? [];
         } else {
             $out = '';
-            $action = function ($child, &$out) {
+            $action = function($child, &$out) {
                 if ($child->type & (Y::SCALAR|Y::QUOTED)) {
                     if ($parent) {
                         $parent->setText(self::build($child));
@@ -148,7 +148,7 @@ 
     private static function buildNode(Node $node, &$parent)
     {
         extract((array) $node, EXTR_REFS);
-        if ($type & (Y::REF_DEF | Y::REF_CALL)) {
+        if ($type&(Y::REF_DEF|Y::REF_CALL)) {
             if (is_object($value)) {
                 $tmp = self::build($value, $parent) ?? $parent;
             } else {
@@ -157,10 +157,10 @@ 
             if ($type === Y::REF_DEF) self::$_root->addReference($identifier, $tmp);
             return self::$_root->getReference($identifier);
         }
-        if ($type & (Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) {
+        if ($type&(Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) {
             return self::buildNodeList($node->value, $parent);
         }
-        if ($type & Y::COMMENT) self::$_root->addComment($node->line, $node->value);
+        if ($type&Y::COMMENT) self::$_root->addComment($node->line, $node->value);
         $typesActions = [Y::DIRECTIVE => 'buildDirective',
                          Y::ITEM      => 'buildItem',
                          Y::KEY       => 'buildKey',
@@ -183,7 +183,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)) {
@@ -201,7 +201,7 @@ 
             }
             if ($value instanceof NodeList) {
                 $childTypes = $value->getTypes();
-                if (is_null($value->type) && $childTypes & Y::SCALAR && !($childTypes & Y::COMMENT)) {
+                if (is_null($value->type) && $childTypes&Y::SCALAR && !($childTypes&Y::COMMENT)) {
                     $result = self::buildLitteral($value, Y::LITT_FOLDED);
                 } else {
                     $result = self::buildNodeList($value);
@@ -230,7 +230,7 @@ 
      */
     private static function buildItem(Node $node, &$parent)
     {
-        extract((array) $node, EXTR_REFS);//var_dump(__METHOD__);
+        extract((array) $node, EXTR_REFS); //var_dump(__METHOD__);
         if (!is_array($parent) && !($parent instanceof \ArrayIterator)) {
             throw new \Exception("parent must be an Iterable not ".(is_object($parent) ? get_class($parent) : gettype($parent)), 1);
         }
@@ -238,7 +238,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) {
@@ -282,13 +282,13 @@ 
                 $lines[] = self::buildLitteral($child->value, $type);
             } else {
                 $prefix = '';
-                if ($type & Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) {
+                if ($type&Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) {
                     $prefix = "\n";
                 }
                 if (!($child->type & (Y::SCALAR|Y::BLANK))) {
                     switch ($child->type) {
-                        case Y::ITEM:    $child->value = '- '.$child->value;break;
-                        case Y::COMMENT: $child->value = '# '.$child->value;break;
+                        case Y::ITEM:    $child->value = '- '.$child->value; break;
+                        case Y::COMMENT: $child->value = '# '.$child->value; break;
                         default: //die(__METHOD__.Y::getName($child->type));
                     }
                 }
@@ -299,9 +299,9 @@ 
                 $lines[] = $prefix.trim($val);
             }
         }
-        if ($type & Y::RAW)         return implode('',   $lines);
-        if ($type & Y::LITT)        return implode("\n", $lines);
-        if ($type & Y::LITT_FOLDED) return preg_replace(['/ +(\n)/','/(\n+) +/'], "$1", implode(' ',  $lines));
+        if ($type&Y::RAW)         return implode('', $lines);
+        if ($type&Y::LITT)        return implode("\n", $lines);
+        if ($type&Y::LITT_FOLDED) return preg_replace(['/ +(\n)/', '/(\n+) +/'], "$1", implode(' ', $lines));
         // TODO : rewrite without 'preg_replace' if ($type & Y::LITT_FOLDED) return implode(' ',  $lines);
         return '';
     }
@@ -317,7 +317,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;

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 {