dallgoot / yaml

sources/NodeFactory.php

Spacing +4 added lines, -4 removed lines

@@ -21,8 +21,8 @@ 
         elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) return new NodeKey($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];
@@ -127,9 +127,9 @@ 
         if (!((bool) preg_match(Regex::NODE_ACTIONS, trim($nodeString), $matches))) {
             return new NodeScalar($nodeString, $line);
         }
-        $action = trim($matches['action']);//var_dump($matches);
+        $action = trim($matches['action']); //var_dump($matches);
         switch ($action[0]) {
-            case '!': return new NodeTag   ($nodeString, $line);
+            case '!': return new NodeTag($nodeString, $line);
             case '&': return new NodeAnchor($nodeString, $line);
             case '*': return new NodeAnchor($nodeString, $line);
             // default:

Braces +19 added lines, -11 removed lines

@@ -16,10 +16,13 @@ 
     final public static function get($nodeString = null, $line = 0):Node
     {
         $trimmed = ltrim($nodeString);
-        if ($trimmed === '')                                return new NodeBlank($nodeString, $line);
-        elseif (substr($trimmed, 0, 3) === '...')           return new NodeDocEnd($nodeString, $line);
-        elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) return new NodeKey($nodeString, $line, $matches);
-        else {
+        if ($trimmed === '') {
+            return new NodeBlank($nodeString, $line);
+        } elseif (substr($trimmed, 0, 3) === '...') {
+            return new NodeDocEnd($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) {
+            return new NodeKey($nodeString, $line, $matches);
+        } else {
             $first = $trimmed[0];
             $stringGroups = ["-" ,'>|' ,'"\'',"#%" ,"{[" ,":?" ,'*&!'];
             $methodGroups = ['Hyphen','Literal','Quoted','Special','Compact','SetElement','NodeAction'];
@@ -90,10 +93,13 @@ 
     final private static function onCompact(string $first, string $nodeString, int $line):Node
     {
         json_decode($nodeString, false, 512, self::JSON_OPTIONS);
-        if (json_last_error() === \JSON_ERROR_NONE)             return new NodeJSON($nodeString, $line);
-        elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString)))  return new NodeCompactMapping($nodeString, $line);
-        elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) return new NodeCompactSequence($nodeString, $line);
-        else {
+        if (json_last_error() === \JSON_ERROR_NONE) {
+            return new NodeJSON($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString))) {
+            return new NodeCompactMapping($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) {
+            return new NodeCompactSequence($nodeString, $line);
+        } else {
             return new NodePartial($nodeString, $line);
         }
     }
@@ -108,9 +114,11 @@ 
      */
     final private static function onHyphen(string $first, string $nodeString, int $line):Node
     {
-        if (substr($nodeString, 0, 3) === '---')              return new NodeDocStart($nodeString, $line);
-        elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString)))  return new NodeItem($nodeString, $line);
-        else {
+        if (substr($nodeString, 0, 3) === '---') {
+            return new NodeDocStart($nodeString, $line);
+        } elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString))) {
+            return new NodeItem($nodeString, $line);
+        } else {
             return new NodeScalar($nodeString, $line);
         }
     }

sources/tag/TagFactory.php

Indentation +3 added lines, -3 removed lines

@@ -23,8 +23,8 @@ 
 
     public static $tagsNamespaces = [];
 /**
- * The primary tag handle is a single “!” character.
- * # Global
+     * The primary tag handle is a single “!” character.
+     * # Global
 %TAG ! tag:example.com,2000:app/
 ---
 !foo "bar"
@@ -43,7 +43,7 @@ 
 %TAG !e! tag:example.com,2000:app/
 ---
 !e!foo "bar"
- */
+     */
     /**
      * Add Handlers for legacy Yaml tags
      *

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
     {
         $reflectAPI = new \ReflectionClass(self::class);
         $methodsList = [];
-        $list = $reflectAPI->getMethods(RM::IS_FINAL | RM::IS_STATIC & RM::IS_PRIVATE);
+        $list = $reflectAPI->getMethods(RM::IS_FINAL|RM::IS_STATIC & RM::IS_PRIVATE);
         foreach ($list as $method) {
             $methodsList[$method->name] = $method->getClosure();
         }
@@ -77,7 +77,7 @@ 
     public static function transform(string $identifier, $value)
     {
         if (self::isKnown($identifier)) {
-            if (!($value instanceof Node) && !($value instanceof NodeList) ) {
+            if (!($value instanceof Node) && !($value instanceof NodeList)) {
                 throw new \Exception(sprintf(self::WRONG_VALUE, $identifier, gettype($value)));
             }
             return self::$registeredHandlers[$identifier]($value);

sources/tag/TagNamespaceLocal.php

Indentation +6 added lines, -6 removed lines

@@ -18,12 +18,12 @@
 class TagNamespaceLocal implements TagNamespaceInterface
 {
     public const LEGACY_TAGS_HANDLERS = ['!!str'       => 'strHandler',
-                                          '!!binary'    => 'binaryHandler',
-                                          '!set'        => 'setHandler',
-                                          '!!omap'      => 'omapHandler',
-                                          '!php/object' => 'symfonyPHPobjectHandler',
-                                          '!inline'     => 'inlineHandler',
-                                      ];
+                                            '!!binary'    => 'binaryHandler',
+                                            '!set'        => 'setHandler',
+                                            '!!omap'      => 'omapHandler',
+                                            '!php/object' => 'symfonyPHPobjectHandler',
+                                            '!inline'     => 'inlineHandler',
+                                        ];
 
 
     /**

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
                 // $list[] = self::strHandler($child)->raw;
                 $list[] = self::strHandler($child);
             }
-            return new NodeScalar(implode('',$list), 0);
+            return new NodeScalar(implode('', $list), 0);
         }
     }
 

sources/Loader.php

Spacing +7 added lines, -7 removed lines

@@ -18,10 +18,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 */
@@ -142,7 +142,7 @@ 
                 $previous = $target->add($node);
             }
             $this->_attachBlankLines($previous);
-            if ($this->_debug === 1){
+            if ($this->_debug === 1) {
                 return;
             }
             return Builder::buildContent($root, $this->_debug);
@@ -183,8 +183,8 @@ 
     {
         $deepest = $previous->getDeepestNode();
         if ($deepest instanceof NodePartial) {
-            return $deepest->specialProcess($current,  $this->_blankBuffer);
-        } elseif(!($current instanceof NodePartial)) {
+            return $deepest->specialProcess($current, $this->_blankBuffer);
+        } elseif (!($current instanceof NodePartial)) {
             return $current->specialProcess($previous, $this->_blankBuffer);
         }
         return false;

Braces +6 added lines, -2 removed lines

@@ -129,8 +129,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);

sources/DumperHandlers.php

Indentation +2 added lines, -2 removed lines

@@ -88,8 +88,8 @@
     private static function dumpYamlObject(YamlObject $obj)
     {
         if ($this->multipleDocs || $obj->hasDocStart() || $obj->isTagged() || $obj->isScalar()) {
-           $this->multipleDocs = true;
-          // && self::$result instanceof DLL) self::$result->push("---");
+            $this->multipleDocs = true;
+            // && self::$result instanceof DLL) self::$result->push("---");
         }
         if (count($obj) > 0) {
             self::dumpArray($obj->getArrayCopy(), 0);

Spacing +4 added lines, -4 removed lines

@@ -40,9 +40,9 @@ 
      */
     public static function dump($dataType, int $indent):string
     {
-        if(is_null($dataType)) {
+        if (is_null($dataType)) {
             return '';
-        } elseif(is_resource($dataType)) {
+        } elseif (is_resource($dataType)) {
             return get_resource_type($dataType);
         } elseif (is_scalar($dataType)) {
             return self::dumpScalar($dataType, $indent);
@@ -126,7 +126,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(rtrim($lineStart), $indent);
                 self::dump($item, $indent + self::INDENT);
@@ -183,7 +183,7 @@ 
         if (is_array($subject) || $subject instanceof \ArrayIterator) {
             $max = count($subject);
             $objectAsArray = is_array($subject) ? $subject : $subject->getArrayCopy();
-            if(array_keys($objectAsArray) !== range(0, $max-1)) {
+            if (array_keys($objectAsArray) !== range(0, $max - 1)) {
                 $pairs = $objectAsArray;
             } else {
                 $valuesList = [];

Braces +15 added lines, -6 removed lines

@@ -53,8 +53,12 @@ 
 
     public function dumpScalar($dataType, $indent)
     {
-        if ($dataType === \INF) return '.inf';
-        if ($dataType === -\INF) return '-.inf';
+        if ($dataType === \INF) {
+            return '.inf';
+        }
+        if ($dataType === -\INF) {
+            return '-.inf';
+        }
         switch (gettype($dataType)) {
             case 'boolean': return $dataType ? 'true' : 'false';
             case 'float': //fall through
@@ -75,8 +79,9 @@ 
         } elseif (is_object($dataType)) {
             if ($obj instanceof Tag) {
             if ($obj instanceof Compact
-            if ($obj instanceof \DateTime)
-            return self::dumpArray($dataType, $indent);
+            if ($obj instanceof \DateTime) {
+                        return self::dumpArray($dataType, $indent);
+            }
             $iterator = new ArrayIterator();
         }
     }
@@ -152,9 +157,13 @@ 
                 self::add(self::dump($obj->value, $indent + self::INDENT), $indent + self::INDENT);
             }
         }
-        if ($obj instanceof Compact) return self::dumpCompact($obj, $indent);
+        if ($obj instanceof Compact) {
+            return self::dumpCompact($obj, $indent);
+        }
         //TODO:  consider dumping datetime as date strings according to a format provided by user or default
-        if ($obj instanceof \DateTime) return $obj->format(self::DATE_FORMAT);
+        if ($obj instanceof \DateTime) {
+            return $obj->format(self::DATE_FORMAT);
+        }
         $propList = get_object_vars($obj);
         foreach ($propList as $property => $value) {
             if (is_scalar($value) || $value instanceof Compact || $value instanceof \DateTime) {

sources/Dumper.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         self::$options = is_int($options) ? $options : self::OPTIONS;
         if (is_scalar($dataType)) {
             // TODO: what to woth comments ???
-            return "--- ".DumperHandlers::dumpScalar($dataType, 0). self::LINEFEED ;
+            return "--- ".DumperHandlers::dumpScalar($dataType, 0).self::LINEFEED;
         }
         return DumperHandlers::dump($dataType, $options);
     }

Braces +12 added lines, -4 removed lines

@@ -43,7 +43,9 @@ 
      */
     public static 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");
+        }
         self::$options = is_int($options) ? $options : self::OPTIONS;
         if (is_scalar($dataType)) {
             // TODO: what to woth comments ???
@@ -79,8 +81,12 @@ 
     private static function dump($dataType, int $indent)
     {
         if (is_scalar($dataType)) {
-            if ($dataType === \INF) return '.inf';
-            if ($dataType === -\INF) return '-.inf';
+            if ($dataType === \INF) {
+                return '.inf';
+            }
+            if ($dataType === -\INF) {
+                return '-.inf';
+            }
             switch (gettype($dataType)) {
                 case 'boolean': return $dataType ? 'true' : 'false';
                 case 'float': //fall through
@@ -102,7 +108,9 @@ 
      */
     private static function dumpYamlObject(YamlObject $obj)
     {
-        if ($obj->hasDocStart() && self::$result instanceof DLL) self::$result->push("---");
+        if ($obj->hasDocStart() && self::$result instanceof DLL) {
+            self::$result->push("---");
+        }
         // self::dump($obj, 0);
         if (count($obj) > 0) {
             self::dumpArray($obj->getArrayCopy(), 0);

examples/write.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 namespace Dallgoot\Yaml;
 
-require_once __DIR__ . '/dependencies/autoload.php';
+require_once __DIR__.'/dependencies/autoload.php';
 
 use Dallgoot\Yaml\{Loader, Dumper};
 

Braces +3 added lines, -1 removed lines

@@ -21,4 +21,6 @@
 if ($nameResultPair[$testName] !== $text) {
     var_dump('EXPECTED', $nameResultPair[$testName]);
     var_dump('RECEIVED', $text);
-} else echo 'OK';
+} else {
+    echo 'OK';
+}

examples/read.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 /**
  * 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);
 
@@ -14,7 +14,7 @@ 
 * load and parse if file exists
 */
 // $content = file_get_contents('./tests/cases/parsing/multidoc_mapping.yml');//var_dump($content);
-$content = file_get_contents('./tests/definitions/examples_tests.yml');//var_dump($content);
+$content = file_get_contents('./tests/definitions/examples_tests.yml'); //var_dump($content);
 $yaml = Yaml::parse($content, 0, $debug);
 // var_dump($yaml);
 var_dump(json_encode($yaml, JSON_OPTIONS));