dallgoot / yaml

yaml/Dumper.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         if (is_null($dataType)) throw new \Exception(self::class.": No content to convert to Yaml", 1);
         self::$options = is_int($options) ? $options : self::OPTIONS;
         self::$result = new DLL;
-        self::$result->setIteratorMode(DLL::IT_MODE_FIFO | DLL::IT_MODE_DELETE);
+        self::$result->setIteratorMode(DLL::IT_MODE_FIFO|DLL::IT_MODE_DELETE);
         if ($dataType instanceof YamlObject) {
             self::dumpYamlObject($dataType);
         } elseif (is_array($dataType) && $dataType[0] instanceof YamlObject) {

Braces +12 added lines, -4 removed lines

@@ -21,7 +21,9 @@ 
 
     public function __construct(int $options = null)
     {
-        if (is_int($options)) self::$options = $options;
+        if (is_int($options)) {
+            self::$options = $options;
+        }
     }
 
     /**
@@ -36,7 +38,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", 1);
+        if (is_null($dataType)) {
+            throw new \Exception(self::class.": No content to convert to Yaml", 1);
+        }
         self::$options = is_int($options) ? $options : self::OPTIONS;
         self::$result = new DLL;
         self::$result->setIteratorMode(DLL::IT_MODE_FIFO | DLL::IT_MODE_DELETE);
@@ -74,8 +78,12 @@ 
         if (is_scalar($dataType)) {
             switch (gettype($dataType)) {
                 case 'boolean': return $dataType ? 'true' : 'false';
-                case 'float': if (is_infinite((float) $dataType)) return $dataType > 0 ? '.inf' : '-.inf';
-                case 'double': if (is_nan((float) $dataType)) return '.nan';
+                case 'float': if (is_infinite((float) $dataType)) {
+                    return $dataType > 0 ? '.inf' : '-.inf';
+                }
+                case 'double': if (is_nan((float) $dataType)) {
+                    return '.nan';
+                }
                 default:
                     return $dataType;
             }

yaml/Builder.php

Spacing +16 added lines, -16 removed lines

@@ -25,14 +25,14 @@ 
     private static function buildNodeList(NodeList $node, &$parent)
     {
         $type = property_exists($node, "type") ? $node->type : null;
-        if ($type & (Y\RAW | Y\LITTERALS)) {
+        if ($type&(Y\RAW|Y\LITTERALS)) {
             return self::litteral($node, $type);
         }
         $p = $parent;
         switch ($type) {
             case Y\MAPPING: //fall through
-            case Y\SET:      $p = new \StdClass;break;
-            case Y\SEQUENCE: $p = [];break;
+            case Y\SET:      $p = new \StdClass; break;
+            case Y\SEQUENCE: $p = []; break;
             // case Y\KEY: $p = $parent;break;
         }
         $out = null;
@@ -53,10 +53,10 @@ 
     {
         list($line, $type, $value, $identifier) = [$node->line, $node->type, $node->value, $node->identifier];
         switch ($type) {
-            case Y\COMMENT: self::$_root->addComment($line, $value);return;
-            case Y\DIRECTIVE: return;//TODO
-            case Y\ITEM: self::buildItem($value, $parent);return;
-            case Y\KEY:  self::buildKey($node, $parent);return;
+            case Y\COMMENT: self::$_root->addComment($line, $value); return;
+            case Y\DIRECTIVE: return; //TODO
+            case Y\ITEM: self::buildItem($value, $parent); return;
+            case Y\KEY:  self::buildKey($node, $parent); return;
             case Y\REF_DEF: //fall through
             case Y\REF_CALL://TODO: self::build returns what ?
                 $tmp = is_object($value) ? self::build($value, $parent) : $node->getPhpValue();
@@ -71,8 +71,8 @@ 
             case Y\SET_VALUE:
                 $prop = array_keys(get_object_vars($parent));
                 $key = end($prop);
-                if (property_exists($value, "type") && ($value->type & (Y\ITEM | Y\MAPPING))) {
-                    $p = $value->type === Y\ITEM  ? [] : new \StdClass;
+                if (property_exists($value, "type") && ($value->type & (Y\ITEM|Y\MAPPING))) {
+                    $p = $value->type === Y\ITEM ? [] : new \StdClass;
                     self::build($value, $p);
                 } else {
                     $p = self::build($value, $parent->{$key});
@@ -81,7 +81,7 @@ 
                 return;
             case Y\TAG:
                 if ($parent === self::$_root) {
-                    $parent->addTag($identifier);return;
+                    $parent->addTag($identifier); return;
                 } else {//TODO: have somewhere a list of common tags and their treatment
                     if (in_array($identifier, ['!binary', '!str'])) {
                         if ($value->value instanceof NodeList) $value->value->type = Y\RAW;
@@ -109,7 +109,7 @@ 
         if (is_null($identifier)) {
             throw new \ParseError(sprintf(self::ERROR_NO_KEYNAME, $node->line));
         } else {
-            if ($value instanceof Node && ($value->type & (Y\KEY | Y\ITEM))) {
+            if ($value instanceof Node && ($value->type & (Y\KEY|Y\ITEM))) {
                 $parent->{$identifier} = $value->type & Y\KEY ? new \StdClass : [];
                 self::build($value, $parent->{$identifier});
             } elseif (is_object($value)) {
@@ -175,8 +175,8 @@ 
             throw new \ParseError(sprintf(self::INVALID_DOCUMENT, $key));
         } else {
             switch (true) {
-                case $isSequence: $list->type = Y\SEQUENCE;break;
-                case $isSet:      $list->type = Y\SET;break;
+                case $isSequence: $list->type = Y\SEQUENCE; break;
+                case $isSet:      $list->type = Y\SET; break;
                 default:          $list->type = Y\MAPPING;
             }
         }
@@ -198,10 +198,10 @@ 
         $children->rewind();
         $refIndent = $children->current()->indent;
         $separator = $type === Y\RAW ? '' : "\n";
-        $action = function ($c) { return $c->value; };
-        if ($type & Y\LITT_FOLDED) {
+        $action = function($c) { return $c->value; };
+        if ($type&Y\LITT_FOLDED) {
             $separator = ' ';
-            $action = function ($c) use ($refIndent) {
+            $action = function($c) use ($refIndent) {
                 return $c->indent > $refIndent || ($c->type & Y\BLANK) ? "\n".$c->value : $c->value;
             };
         }

yaml/Loader.php

Spacing +14 added lines, -14 removed lines

@@ -10,17 +10,17 @@ 
     //public
     public $errors = [];
 
-    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|string */
     private $content;
     /* @var null|string */
     private $filePath;
     /* @var int */
-    private $debug = 0;///TODO: determine levels
+    private $debug = 0; ///TODO: determine levels
     /* @var int */
     private $options = 0;
     //Exceptions messages
@@ -31,8 +31,8 @@ 
 
     public function __construct($absolutePath = null, $options = null, $debug = 0)
     {
-        $this->debug   = is_int($debug)   ? min($debug, 3) : 1;
-        $this->options = is_int($options) ? $options       : $this->options;
+        $this->debug   = is_int($debug) ? min($debug, 3) : 1;
+        $this->options = is_int($options) ? $options : $this->options;
         if (is_string($absolutePath)) {
             $this->load($absolutePath);
         }
@@ -83,10 +83,10 @@ 
         if (!is_array($source)) throw new \Exception(self::EXCEPTION_LINE_SPLIT);
         $previous = $root = new Node();
         $emptyLines = [];
-        $specialTypes = Y\LITTERALS | Y\BLANK;
+        $specialTypes = Y\LITTERALS|Y\BLANK;
         try {
             foreach ($source as $lineNb => $lineString) {
-                $n = new Node($lineString, $lineNb + 1);//TODO: useful???-> $this->debug && var_dump($n);
+                $n = new Node($lineString, $lineNb + 1); //TODO: useful???-> $this->debug && var_dump($n);
                 $deepest = $previous->getDeepestNode();
                 if ($deepest->type & Y\PARTIAL) {
                     //TODO:verify this edge case
@@ -105,8 +105,8 @@ 
                     }
                     $emptyLines = [];
                     switch ($n->indent <=> $previous->indent) {
-                        case -1: $previous->getParent($n->indent)->add($n);break;
-                        case 0: $previous->getParent()->add($n);break;
+                        case -1: $previous->getParent($n->indent)->add($n); break;
+                        case 0: $previous->getParent()->add($n); break;
                         default:
                             if ($this->onDeepestType($n, $previous, $lineString)) continue 2;
                             $previous->add($n);
@@ -122,7 +122,7 @@ 
             return $out;
         } catch (\Error|\Exception|\ParseError $e) {
             $file = basename($this->filePath);
-            $message = basename($e->getFile())."@".$e->getLine().":".$e->getMessage()." in '$file' @".($lineNb+1)."\n";
+            $message = basename($e->getFile())."@".$e->getLine().":".$e->getMessage()." in '$file' @".($lineNb + 1)."\n";
             if ($e instanceof \ParseError && ($this->options & self::NO_PARSING_EXCEPTIONS)) {
                 trigger_error($message, E_USER_WARNING);
                 $this->errors[] = $message;
@@ -160,7 +160,7 @@ 
         // if ($deepest->type & Y\LITTERALS) {
         //     $n->value = trim($lineString);//fall through
         // }
-        if (($n->type & Y\SCALAR) && ($deepest->type & (Y\LITTERALS | Y\REF_DEF | Y\SET_VALUE)) && is_null($deepest->value)) {
+        if (($n->type & Y\SCALAR) && ($deepest->type & (Y\LITTERALS|Y\REF_DEF|Y\SET_VALUE)) && is_null($deepest->value)) {
             $previous = $deepest;
         }
         if (($deepest->type & Y\TAG) && is_null($deepest->value)) {
@@ -169,7 +169,7 @@ 
         // // if ($previous->type & Y\ITEM && $n->type & Y\KEY) {
         // //     $previous
         // // }
-        if ($deepest->type & (Y\BLANK | Y\SCALAR)) {//|| ($previous->type & (Y\ITEM | Y\SET_KEY))) {
+        if ($deepest->type & (Y\BLANK|Y\SCALAR)) {//|| ($previous->type & (Y\ITEM | Y\SET_KEY))) {
                 $previous = $deepest->getParent();
         //     // if ($n->type === Y\SCALAR && ($deepest->getParent()->type & Y\LITTERALS)) {
         //     //     // $deepest->type = Y\SCALAR;

Braces +15 added lines, -5 removed lines

@@ -78,9 +78,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 = Y\LITTERALS | Y\BLANK;
@@ -108,7 +112,9 @@ 
                         case -1: $previous->getParent($n->indent)->add($n);break;
                         case 0: $previous->getParent()->add($n);break;
                         default:
-                            if ($this->onDeepestType($n, $previous, $lineString)) continue 2;
+                            if ($this->onDeepestType($n, $previous, $lineString)) {
+                                continue 2;
+                            }
                             $previous->add($n);
                     }
                     $previous = $n;
@@ -147,8 +153,12 @@ 
             }
         }
         if ($n->type & Y\BLANK) {
-            if ($previous->type & Y\SCALAR) $emptyLines[] = $n->setParent($previous->getParent());
-            if ($deepest->type & Y\LITTERALS) $emptyLines[] = $n->setParent($deepest);
+            if ($previous->type & Y\SCALAR) {
+                $emptyLines[] = $n->setParent($previous->getParent());
+            }
+            if ($deepest->type & Y\LITTERALS) {
+                $emptyLines[] = $n->setParent($deepest);
+            }
             return true;
         }
         return false;