dallgoot / yaml

examples/load_modify_save.php

Spacing +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
 <?php
 namespace Dallgoot\Yaml;
 
-require_once __DIR__ . '/../../vendor/autoload.php';
+require_once __DIR__.'/../../vendor/autoload.php';
 
 use Dallgoot;
 
-$fileName = __DIR__ . '/../dummy.yml';
+$fileName = __DIR__.'/../dummy.yml';
 
 $yamlObject = Yaml::parseFile($fileName, $options = null, $debug = null);
 

examples/write.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 define('PROJECT_ROOT', __DIR__."/../");
-require_once PROJECT_ROOT . 'vendor/autoload.php';
+require_once PROJECT_ROOT.'vendor/autoload.php';
 
 use Dallgoot\Yaml;
 use Dallgoot\Yaml\{Loader, Dumper};
@@ -12,9 +12,9 @@ 
 // $yaml = (new Loader('./dummy.yml', null, 0))->parse();
 // var_dump($yaml);
 $testName = 'yamlObject_properties';
-$text = Yaml::dump((include PROJECT_ROOT . "tests/cases/dumping/$testName.php"), 0);
+$text = Yaml::dump((include PROJECT_ROOT."tests/cases/dumping/$testName.php"), 0);
 
-$nameResultPair = get_object_vars(Yaml::parseFile(PROJECT_ROOT . '/tests/definitions/dumping_tests.yml'));
+$nameResultPair = get_object_vars(Yaml::parseFile(PROJECT_ROOT.'/tests/definitions/dumping_tests.yml'));
 
 // var_dump($nameResultPair);
 

sources/Loader.php

Spacing +7 added lines, -7 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 */
@@ -144,7 +144,7 @@ 
                 $previous = $target->add($node);
             }
             $this->_attachBlankLines($previous);
-            if ($this->_debug === 1){
+            if ($this->_debug === 1) {
                 return null;
             }
             return Builder::buildContent($root, $this->_debug);
@@ -183,8 +183,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/NodeFactory.php

Spacing +4 added lines, -4 removed lines

@@ -27,8 +27,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];
@@ -134,9 +134,9 @@ 
         if (!((bool) preg_match(Regex::NODE_ACTIONS, trim($nodeString), $matches))) {
             return new Nodes\Scalar($nodeString, $line);
         }
-        $action = trim($matches['action']);//var_dump($matches);
+        $action = trim($matches['action']); //var_dump($matches);
         switch ($action[0]) {
-            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

@@ -22,10 +22,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'];
@@ -96,10 +99,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);
         }
     }
@@ -114,9 +120,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/DumperHandlers.php

Indentation +2 added lines, -2 removed lines

@@ -87,8 +87,8 @@
     private function dumpYamlObject(YamlObject $obj):string
     {
         if ($this->multipleDocs || $obj->hasDocStart() || $obj->isTagged() || $obj->isScalar()) {
-           $this->multipleDocs = true;
-          // && $this->$result instanceof DLL) $this->$result->push("---");
+            $this->multipleDocs = true;
+            // && $this->$result instanceof DLL) $this->$result->push("---");
         }
         if (count($obj) > 0) {
             return $this->iteratorToString($obj, '-', 0);

Spacing +4 added lines, -4 removed lines

@@ -32,9 +32,9 @@ 
 
     public 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 $this->dumpScalar($dataType, $indent);
@@ -101,7 +101,7 @@ 
     }
 
 
-    private function iteratorToString(iterable $iterator, string $mask, int $indent, bool $isCompact=false):string
+    private function iteratorToString(iterable $iterator, string $mask, int $indent, bool $isCompact = false):string
     {
         $pairs = [];
         foreach ($iterator as $key => $value) {
@@ -133,7 +133,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 +21 added lines, -7 removed lines

@@ -25,7 +25,9 @@ 
 
     public function __construct(int $options = null)
     {
-        if (is_int($options)) $this->options = $options;
+        if (is_int($options)) {
+            $this->options = $options;
+        }
     }
 
 
@@ -45,8 +47,12 @@ 
 
     public function dumpScalar($dataType, $indent):string
     {
-        if ($dataType === \INF) return '.inf';
-        if ($dataType === -\INF) return '-.inf';
+        if ($dataType === \INF) {
+            return '.inf';
+        }
+        if ($dataType === -\INF) {
+            return '-.inf';
+        }
         $precision = "%.".$this->floatPrecision."F";
         switch (gettype($dataType)) {
             case 'boolean': return $dataType ? 'true' : 'false';
@@ -73,11 +79,19 @@ 
                 }
             }
         } elseif (is_object($compound)) {
-            if ($compound instanceof YamlObject) return $this->dumpYamlObject($compound);
-            if ($compound instanceof Tagged)     return $this->dumpTagged($compound, $indent);
-            if ($compound instanceof Compact)    return $this->dumpCompact($compound, $indent);
+            if ($compound instanceof YamlObject) {
+                return $this->dumpYamlObject($compound);
+            }
+            if ($compound instanceof Tagged) {
+                return $this->dumpTagged($compound, $indent);
+            }
+            if ($compound instanceof Compact) {
+                return $this->dumpCompact($compound, $indent);
+            }
             //TODO:  consider dumping datetime as date strings according to a format provided by user
-            if ($compound instanceof \DateTime)  return $compound->format(self::DATE_FORMAT);
+            if ($compound instanceof \DateTime) {
+                return $compound->format(self::DATE_FORMAT);
+            }
             $iterator = new \ArrayIterator($compound);
         }
         return $this->iteratorToString($iterator, $mask, $indent);

sources/NodeList.php

Spacing +6 added lines, -6 removed lines

@@ -64,7 +64,7 @@ 
                 && !($child instanceof Directive)
                 && !($child instanceof Blank)
                 && !($child instanceof Docstart
-                && is_null($child->value)) ) return true;
+                && is_null($child->value))) return true;
         }
         return false;
     }
@@ -72,12 +72,12 @@ 
     public function push($node)
     {
         $type = null;
-        if     ($node instanceof Item )    $type = self::SEQUENCE;
+        if ($node instanceof Item)    $type = self::SEQUENCE;
         elseif ($node instanceof Key)      $type = self::MAPPING;
         elseif ($node instanceof SetKey
              || $node instanceof SetValue) {
             $type = self::SET;
-        } elseif ($node instanceof Scalar ){
+        } elseif ($node instanceof Scalar) {
             $type = self::MULTILINE;
         }
         if (!is_null($type) && $this->checkTypeCoherence($type)) {
@@ -139,7 +139,7 @@ 
             $output = trim($first->raw);
             foreach ($list as $child) {
                 if ($child instanceof Scalar) {
-                    $separator = isset($output[-1])  && $output[-1] === "\n" ? '' : ' ';
+                    $separator = isset($output[-1]) && $output[-1] === "\n" ? '' : ' ';
                     $output .= $separator.trim($child->raw);
                 } elseif ($child instanceof Blank) {
                     $output .= "\n";
@@ -165,10 +165,10 @@ 
             if ($child instanceof Comment) {
                 // $child->build();
             } else {
-                if($child->value instanceof Comment) {
+                if ($child->value instanceof Comment) {
                     // $child->value->build();
                     // $child->value = null;
-                } elseif($child->value instanceof NodeList) {
+                } elseif ($child->value instanceof NodeList) {
                     $child->value = $child->value->filterComment();
                 }
                 $out->push($child);

Braces +11 added lines, -5 removed lines

@@ -50,7 +50,9 @@ 
         $tmp->rewind();
         $fqn = __NAMESPACE__."\\Nodes\\$nodeType";
         foreach ($tmp as $child) {
-            if ($child instanceof $fqn) return true;
+            if ($child instanceof $fqn) {
+                return true;
+            }
         }
         return false;
     }
@@ -64,7 +66,9 @@ 
                 && !($child instanceof Directive)
                 && !($child instanceof Blank)
                 && !($child instanceof Docstart
-                && is_null($child->value)) ) return true;
+                && is_null($child->value)) ) {
+                return true;
+            }
         }
         return false;
     }
@@ -72,9 +76,11 @@ 
     public function push($node)
     {
         $type = null;
-        if     ($node instanceof Item )    $type = self::SEQUENCE;
-        elseif ($node instanceof Key)      $type = self::MAPPING;
-        elseif ($node instanceof SetKey
+        if     ($node instanceof Item ) {
+            $type = self::SEQUENCE;
+        } elseif ($node instanceof Key) {
+            $type = self::MAPPING;
+        } elseif ($node instanceof SetKey
              || $node instanceof SetValue) {
             $type = self::SET;
         } elseif ($node instanceof Scalar ){

sources/Dumper.php

Spacing +1 added lines, -1 removed lines

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

Braces +3 added lines, -1 removed lines

@@ -44,7 +44,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;
         $dumpHandler = new DumperHandlers($options);
         if (is_scalar($dataType)) {

sources/nodes/Comment.php

Indentation +6 added lines, -6 removed lines

@@ -10,17 +10,17 @@
  */
 class Comment extends NodeGeneric
 {
-   public function specialProcess(NodeGeneric &$previous, array &$emptyLines):bool
-   {
+    public function specialProcess(NodeGeneric &$previous, array &$emptyLines):bool
+    {
         $previous->getRoot()->add($this);
         return true;
-   }
+    }
 
-   public function build(&$parent = null)
-   {
+    public function build(&$parent = null)
+    {
         $root = $this->getRoot();
         $yamlObject = $root->getYamlObject();
         $yamlObject->addComment($this->line, $this->raw);
         return null;
-   }
+    }
 }
\ No newline at end of file

sources/nodes/DocStart.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
             throw new \Exception(__METHOD__." expects a YamlObject as parent", 1);
         }
         if (!is_null($this->value)) {
-            if ($this->value instanceof Tag){
+            if ($this->value instanceof Tag) {
                 $parent->addTag($this->value->tag);
                 $this->value->build($parent);
             } else {