dallgoot / yaml

yaml/Loader.php

Spacing +10 added lines, -10 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;
             }
@@ -111,9 +111,9 @@ 
                 $target = $previous;
                 switch ($n->indent <=> $previous->indent) {
                     case -1:
-                        $target = $previous->getParent($n->indent);break;//, $n->type & Y::ITEM ? Y::KEY : null);
+                        $target = $previous->getParent($n->indent); break; //, $n->type & Y::ITEM ? Y::KEY : null);
                     case 0:
-                        $this->onEqualIndent($n, $previous, $target);break;
+                        $this->onEqualIndent($n, $previous, $target); break;
                     default:
                         $this->onMoreIndent($previous, $target);
                 }
@@ -156,7 +156,7 @@ 
     {
         $deepest = $previous->getDeepestNode();
         if ($n->type & Y::KEY && $n->indent === 0) {
-            $target = $previous->getParent(-1);//get root
+            $target = $previous->getParent(-1); //get root
         } elseif ($n->type & Y::ITEM && $deepest->type & Y::KEY && is_null($deepest->value)) {
             $target = $deepest;
         } else {
@@ -192,7 +192,7 @@ 
                   && !($deepest->type & Y::LITTERALS)) {
             // $previous->getParent(0)->add($n);
             return true;
-        } elseif ($n->type & Y::TAG && is_null($n->value) ){//&& $previous->type & (Y::ROOT|Y::DOC_START|Y::DOC_END)) {
+        } elseif ($n->type & Y::TAG && is_null($n->value)) {//&& $previous->type & (Y::ROOT|Y::DOC_START|Y::DOC_END)) {
             $n->value = '';
         }
         return false;

Braces +15 added lines, -5 removed lines

@@ -77,7 +77,9 @@ 
     {
         $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);
+        if (!is_array($source) || !count($source)) {
+            throw new \Exception(self::EXCEPTION_LINE_SPLIT);
+        }
         return function () use($source) {
             foreach ($source as $key => $value) {
                 yield ++$key => $value;
@@ -105,7 +107,9 @@ 
         try {
             foreach ($sourceIterator() as $lineNb => $lineString) {
                 $n = new Node($lineString, $lineNb);
-                if ($this->onSpecialType($n, $previous, $emptyLines, $lineString)) continue;
+                if ($this->onSpecialType($n, $previous, $emptyLines, $lineString)) {
+                    continue;
+                }
                 $this->attachBlankLines($emptyLines, $previous);
                 $emptyLines = [];
                 $target = $previous;
@@ -117,7 +121,9 @@ 
                     default:
                         $this->onMoreIndent($previous, $target);
                 }
-                if ($this->onContextType($n, $target, $lineString)) continue;
+                if ($this->onContextType($n, $target, $lineString)) {
+                    continue;
+                }
                 $target->add($n);
                 $previous = $n;
             }
@@ -200,8 +206,12 @@ 
 
     private function onSpecialBlank(array &$emptyLines, Node $n, Node $previous, Node $deepest)
     {
-        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);
+        }
     }
 
     private function onContextType(Node &$n, Node &$previous, $lineString):bool