dallgoot / yaml

sources/NodeFactory.php

Spacing +3 added lines, -3 removed lines

@@ -28,8 +28,8 @@ 
         elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) return new Nodes\Key($nodeString, $line, $matches);
         else {
             $first = $trimmed[0];
-            $stringGroups = ['-',         '>|' ,   '"\'',    "#%" ,    "{[" ,       ":?" ,       '*&!'];
-            $methodGroups = ['Hyphen','Literal','Quoted','Special','Compact','SetElement','NodeAction'];
+            $stringGroups = ['-', '>|', '"\'', "#%", "{[", ":?", '*&!'];
+            $methodGroups = ['Hyphen', 'Literal', 'Quoted', 'Special', 'Compact', 'SetElement', 'NodeAction'];
             foreach ($stringGroups as $groupIndex => $stringRef) {
                 if (is_int(strpos($stringRef, $first))) {
                     $methodName = 'on'.$methodGroups[$groupIndex];
@@ -145,7 +145,7 @@ 
         }
         // $action = trim($matches['action']);//var_dump($matches);
         switch ($first) {
-            case '!': return new Nodes\Tag   ($nodeString, $line);
+            case '!': return new Nodes\Tag($nodeString, $line);
             default :
                 return new Nodes\Anchor($nodeString, $line);
             // case '&': return new NodeAnchor($nodeString, $line);

Braces +19 added lines, -11 removed lines

@@ -23,10 +23,13 @@ 
     final public static function get($nodeString = null, $line = 0):NodeGeneric
     {
         $trimmed = ltrim($nodeString);
-        if ($trimmed === '')                                return new Nodes\Blank($nodeString, $line);
-        elseif (substr($trimmed, 0, 3) === '...')           return new Nodes\DocEnd($nodeString, $line);
-        elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) return new Nodes\Key($nodeString, $line, $matches);
-        else {
+        if ($trimmed === '') {
+            return new Nodes\Blank($nodeString, $line);
+        } elseif (substr($trimmed, 0, 3) === '...') {
+            return new Nodes\DocEnd($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) {
+            return new Nodes\Key($nodeString, $line, $matches);
+        } else {
             $first = $trimmed[0];
             $stringGroups = ['-',         '>|' ,   '"\'',    "#%" ,    "{[" ,       ":?" ,       '*&!'];
             $methodGroups = ['Hyphen','Literal','Quoted','Special','Compact','SetElement','NodeAction'];
@@ -105,10 +108,13 @@ 
     final private static function onCompact(string $first, string $nodeString, int $line):NodeGeneric
     {
         json_decode($nodeString, false, 512, self::JSON_OPTIONS);
-        if (json_last_error() === \JSON_ERROR_NONE)             return new Nodes\JSON($nodeString, $line);
-        elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString)))  return new Nodes\CompactMapping($nodeString, $line);
-        elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) return new Nodes\CompactSequence($nodeString, $line);
-        else {
+        if (json_last_error() === \JSON_ERROR_NONE) {
+            return new Nodes\JSON($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString))) {
+            return new Nodes\CompactMapping($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) {
+            return new Nodes\CompactSequence($nodeString, $line);
+        } else {
             return new Nodes\Partial($nodeString, $line);
         }
     }
@@ -123,9 +129,11 @@ 
      */
     final private static function onHyphen(string $first, string $nodeString, int $line):NodeGeneric
     {
-        if (substr($nodeString, 0, 3) === '---')              return new Nodes\DocStart($nodeString, $line);
-        elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString)))  return new Nodes\Item($nodeString, $line);
-        else {
+        if (substr($nodeString, 0, 3) === '---') {
+            return new Nodes\DocStart($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString))) {
+            return new Nodes\Item($nodeString, $line);
+        } else {
             return new Nodes\Scalar($nodeString, $line);
         }
     }

sources/Loader.php

Braces +6 added lines, -2 removed lines

@@ -130,8 +130,12 @@
         try {
             foreach ($generator as $lineNB => $lineString) {
                 $node = NodeFactory::get($lineString, $lineNB);
-                if ($this->_debug === 1) echo get_class($node)."\n";
-                if ($this->needsSpecialProcess($node, $previous)) continue;
+                if ($this->_debug === 1) {
+                    echo get_class($node)."\n";
+                }
+                if ($this->needsSpecialProcess($node, $previous)) {
+                    continue;
+                }
                 $this->_attachBlankLines($previous);
                 switch ($node->indent <=> $previous->indent) {
                     case -1: $target = $previous->getTargetOnLessIndent($node);

Spacing +6 added lines, -6 removed lines

@@ -20,10 +20,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
 
     //private
     /* @var null|array */
@@ -179,8 +179,8 @@ 
     {
         $deepest = $previous->getDeepestNode();
         if ($deepest instanceof Nodes\Partial) {
-            return $deepest->specialProcess($current,  $this->_blankBuffer);
-        } elseif(!($current instanceof Nodes\Partial)) {
+            return $deepest->specialProcess($current, $this->_blankBuffer);
+        } elseif (!($current instanceof Nodes\Partial)) {
             return $current->specialProcess($previous, $this->_blankBuffer);
         }
         return false;

sources/nodes/Quoted.php

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 {
     public function build(&$parent = null)
     {
-        return substr(Scalar::replaceSequences(trim($this->raw)), 1,-1);
+        return substr(Scalar::replaceSequences(trim($this->raw)), 1, -1);
     }
 }
\ No newline at end of file

sources/nodes/Scalar.php

Braces +12 added lines, -4 removed lines

@@ -96,8 +96,12 @@ 
  \.nan | \.NaN | \.NAN   tag:yaml.org,2002:float (Not a number)
  *   tag:yaml.org,2002:str (Default)
  */
-        if (Regex::isDate($v))   return Builder::$dateAsObject && !$onlyScalar ? date_create($v) : $v;
-        if (Regex::isNumber($v)) return self::getNumber($v);
+        if (Regex::isDate($v)) {
+            return Builder::$dateAsObject && !$onlyScalar ? date_create($v) : $v;
+        }
+        if (Regex::isNumber($v)) {
+            return self::getNumber($v);
+        }
         $types = ['yes'   => true,
                   'no'    => false,
                   'true'  => true,
@@ -141,8 +145,12 @@ 
      */
     private static function getNumber(string $v)
     {
-        if ((bool) preg_match(Regex::OCTAL_NUM, $v)) return intval(base_convert($v, 8, 10));
-        if ((bool) preg_match(Regex::HEX_NUM, $v))   return intval(base_convert($v, 16, 10));
+        if ((bool) preg_match(Regex::OCTAL_NUM, $v)) {
+            return intval(base_convert($v, 8, 10));
+        }
+        if ((bool) preg_match(Regex::HEX_NUM, $v)) {
+            return intval(base_convert($v, 16, 10));
+        }
         return is_bool(strpos($v, '.')) || substr_count($v, '.') > 1 ? intval($v) : floatval($v);
     }
 

Indentation +19 added lines, -19 removed lines

@@ -99,35 +99,35 @@
         if (Regex::isDate($v))   return Builder::$dateAsObject && !$onlyScalar ? date_create($v) : $v;
         if (Regex::isNumber($v)) return self::getNumber($v);
         $types = ['yes'   => true,
-                  'no'    => false,
-                  'true'  => true,
-                  'false' => false,
-                  'null'  => null,
-                  '.inf'  => \INF,
-                  '-.inf' => -\INF,
-                  '.nan'  => \NAN
+                    'no'    => false,
+                    'true'  => true,
+                    'false' => false,
+                    'null'  => null,
+                    '.inf'  => \INF,
+                    '-.inf' => -\INF,
+                    '.nan'  => \NAN
         ];
         return array_key_exists(strtolower($v), $types) ? $types[strtolower($v)] : self::replaceSequences($v);
     }
 
     public static function replaceSequences($value='')
     {
-      $replaceUnicodeSeq = function ($matches) {
+        $replaceUnicodeSeq = function ($matches) {
             return json_decode('"'.$matches[1].'"');
-      };
-      $replaceNonPrintable = function ($matches) {
+        };
+        $replaceNonPrintable = function ($matches) {
             // var_dump($matches[1]);
         return $matches[1]."";
-      };
+        };
 // preg_match( "/[^\x{06F0}-\x{06F9}\x]+/u" , '۱۲۳۴۵۶۷۸۹۰' );
-      return preg_replace_callback_array(
-          [
-              '/((?<![\\\\])\\\\x[0-9a-f]{2})/i' => $replaceUnicodeSeq,
-              '/((?<![\\\\])\\\\u[0-9a-f]{4,})/i' => $replaceUnicodeSeq,
-              '/(\\\\b|\\\\n|\\\\t|\\\\r)/' => $replaceNonPrintable
-          ],
-          $value
-      );
+        return preg_replace_callback_array(
+            [
+                '/((?<![\\\\])\\\\x[0-9a-f]{2})/i' => $replaceUnicodeSeq,
+                '/((?<![\\\\])\\\\u[0-9a-f]{4,})/i' => $replaceUnicodeSeq,
+                '/(\\\\b|\\\\n|\\\\t|\\\\r)/' => $replaceNonPrintable
+            ],
+            $value
+        );
     }
 
 

Spacing +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
 
     public function getTargetOnLessIndent(NodeGeneric &$node):NodeGeneric
     {
-        if ($node instanceof Scalar || $node instanceof Blank ) {
+        if ($node instanceof Scalar || $node instanceof Blank) {
             return $this->getParent();
         } else {
             return $this->getParent($node->indent);
@@ -110,12 +110,12 @@ 
         return array_key_exists(strtolower($v), $types) ? $types[strtolower($v)] : self::replaceSequences($v);
     }
 
-    public static function replaceSequences($value='')
+    public static function replaceSequences($value = '')
     {
-      $replaceUnicodeSeq = function ($matches) {
+      $replaceUnicodeSeq = function($matches) {
             return json_decode('"'.$matches[1].'"');
       };
-      $replaceNonPrintable = function ($matches) {
+      $replaceNonPrintable = function($matches) {
             // var_dump($matches[1]);
         return $matches[1]."";
       };

examples/read.php

Spacing +4 added lines, -4 removed lines

@@ -6,18 +6,18 @@
 /**
  * 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;
 
 $debug = (int) (isset($argv[1]) ? $argv[1] : null);
 
-echo memory_get_usage() . "\n";
+echo memory_get_usage()."\n";
 /* USE CASE 1
 * load and parse if file exists
 */
-$content = file_get_contents('./tests/cases/examples/Example_2_25.yml');//var_dump($content);
+$content = file_get_contents('./tests/cases/examples/Example_2_25.yml'); //var_dump($content);
 $yaml = Yaml::parse($content, 0, $debug);
 
-echo memory_get_usage() . "\n";
+echo memory_get_usage()."\n";
 // var_dump($yaml);
 var_dump(json_encode($yaml, JSON_OPTIONS));
 exit(0);

sources/DumperHandlers.php

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
             }
         }
         $previousCompactMode = $this->dumper->_compactMode;
-        $this->dumper->_compactMode =  true;
+        $this->dumper->_compactMode = true;
         $result = $this->dumper->iteratorToString(new \ArrayIterator($source), $keyMask, ', ', $indent);
         $this->dumper->_compactMode = $previousCompactMode;
         return sprintf($structureFormat, $result);
@@ -123,7 +123,7 @@ 
         // Example 5.13. Escaped Characters
 
         $str = json_encode(ltrim($str));
-        return strspn(substr($str,1,-1), "-:?{}[]#,&*!>|'\"%") > 0 ? $str : trim($str, '"');
+        return strspn(substr($str, 1, -1), "-:?{}[]#,&*!>|'\"%") > 0 ? $str : trim($str, '"');
     }
 
     public function dumpTagged(Tagged $obj, int $indent):string

Braces +6 added lines, -2 removed lines

@@ -22,8 +22,12 @@
 
     public function dumpScalar($dataType):string
     {
-        if ($dataType === \INF) return '.inf';
-        if ($dataType === -\INF) return '-.inf';
+        if ($dataType === \INF) {
+            return '.inf';
+        }
+        if ($dataType === -\INF) {
+            return '-.inf';
+        }
         $precision = "%.".$this->dumper->floatPrecision."F";
         switch (gettype($dataType)) {
             case 'boolean': return $dataType ? 'true' : 'false';

sources/Builder.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
                     $buffer->push($child);
                 }
             }
-            $documents[] = self::buildDocument($buffer, count($documents) +1);
+            $documents[] = self::buildDocument($buffer, count($documents) + 1);
         } catch (\Throwable $e) {
             throw new \Exception($e->getMessage(), 1, $e);
         }

sources/Dumper.php

Indentation +3 added lines, -3 removed lines

@@ -105,8 +105,8 @@ 
     public function dumpYamlObject(YamlObject $obj):string
     {
         if ($this->multipleDocs || $obj->hasDocStart() || $obj->isTagged()) {
-           $this->multipleDocs = true;
-          // && $this->$result instanceof DLL) $this->$result->push("---");
+            $this->multipleDocs = true;
+            // && $this->$result instanceof DLL) $this->$result->push("---");
         }
         // $this->insertComments($obj->getComment());
         if (count($obj) > 0) {
@@ -118,7 +118,7 @@ 
 
 
     public function iteratorToString(\Iterator $iterable,
-                                      string $keyMask, string $itemSeparator, int $indent):string
+                                        string $keyMask, string $itemSeparator, int $indent):string
     {
         $pairs = [];
         $valueIndent = $indent + self::INDENT;

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     private $handler;
 
 
-    public function __construct($options=null)
+    public function __construct($options = null)
     {
         $this->options = is_int($options) ? $options : self::OPTIONS;
         $this->handler = new DumperHandlers($this);
@@ -50,7 +50,7 @@ 
     {
         if (empty($dataType)) throw new \Exception(self::class.": No content to convert to Yaml");
         if (is_scalar($dataType)) {
-            return "--- ".$this->handler->dumpScalar($dataType). self::LINEFEED ;
+            return "--- ".$this->handler->dumpScalar($dataType).self::LINEFEED;
         }
         return $this->dump($dataType, 0);
     }

Braces +3 added lines, -1 removed lines

@@ -48,7 +48,9 @@
      */
     public function toString($dataType, int $options = null):string
     {
-        if (empty($dataType)) throw new \Exception(self::class.": No content to convert to Yaml");
+        if (empty($dataType)) {
+            throw new \Exception(self::class.": No content to convert to Yaml");
+        }
         if (is_scalar($dataType)) {
             return "--- ".$this->handler->dumpScalar($dataType). self::LINEFEED ;
         }