dallgoot / yaml

yaml/Loader.php

Spacing +7 added lines, -7 removed lines

@@ -19,17 +19,17 @@ 
     /* @var null|string */
     public $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|string */
     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
@@ -117,7 +117,7 @@ 
                 $target->add($n);
                 $previous = $n;
             }
-            if ($this->debug === 2) echo "\033[33mParsed Structure\033[0m\n",var_export($root, true);
+            if ($this->debug === 2) echo "\033[33mParsed Structure\033[0m\n", var_export($root, true);
             $out = Builder::buildContent($root, $this->debug);
             return $out;
         } catch (\Error|\Exception|\ParseError $e) {
@@ -155,7 +155,7 @@ 
             $deepest->parse($deepest->value.' '.ltrim($lineString));
             return true;
         }
-        if(($previous->type & Y::LITTERALS) || (($deepest->type & Y::LITTERALS) && is_null($deepest->value))) {
+        if (($previous->type & Y::LITTERALS) || (($deepest->type & Y::LITTERALS) && is_null($deepest->value))) {
             $n->type = Y::SCALAR;
             $n->identifier = null;
             $n->value = trim($lineString);

Braces +18 added lines, -6 removed lines

@@ -87,7 +87,9 @@ 
     {
         $source = $this->content ?? preg_split("/([^\n\r]+)/um", $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);
+        }
         $previous = $root = new Node();
         $emptyLines = [];
         try {
@@ -99,7 +101,9 @@ 
             foreach ($gen() as $lineNb => $lineString) {
                 $n = new Node($lineString, $lineNb);
                 if ($n->type & (Y::LITTERALS|Y::BLANK)) {
-                    if ($this->onSpecialType($n, $previous, $emptyLines)) continue;
+                    if ($this->onSpecialType($n, $previous, $emptyLines)) {
+                        continue;
+                    }
                 } else {
                     foreach ($emptyLines as $blankNode) {
                         $blankNode->getParent()->add($blankNode);
@@ -113,11 +117,15 @@ 
                         break;
                     default: $target = $previous;
                 }
-                if ($this->onContextType($n, $target, $lineString)) continue;
+                if ($this->onContextType($n, $target, $lineString)) {
+                    continue;
+                }
                 $target->add($n);
                 $previous = $n;
             }
-            if ($this->debug === 2) echo "\033[33mParsed Structure\033[0m\n",var_export($root, true);
+            if ($this->debug === 2) {
+                echo "\033[33mParsed Structure\033[0m\n",var_export($root, true);
+            }
             $out = Builder::buildContent($root, $this->debug);
             return $out;
         } catch (\Error|\Exception|\ParseError $e) {
@@ -137,8 +145,12 @@ 
     {
         $deepest = $previous->getDeepestNode();
         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;