dallgoot / yaml

sources/Dumper.php

Spacing +2 added lines, -2 removed lines

@@ -143,7 +143,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);
@@ -213,7 +213,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 +18 added lines, -6 removed lines

@@ -41,7 +41,9 @@ 
      */
     public static function toString($dataType, int $options = null):string
     {
-        if (is_null($dataType)) throw new \Exception(self::class.": No content to convert to Yaml");
+        if (is_null($dataType)) {
+            throw new \Exception(self::class.": No content to convert to Yaml");
+        }
         self::$options = is_int($options) ? $options : self::OPTIONS;
         self::$result = new DLL;
         if ($dataType instanceof YamlObject) {
@@ -83,8 +85,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
@@ -106,7 +112,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);
@@ -182,9 +190,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) {

examples/load_modify_save.php

Spacing +2 added lines, -2 removed lines

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

sources/Loader.php

Spacing +7 added lines, -7 removed lines

@@ -15,10 +15,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|false|array */
@@ -26,7 +26,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;
     /* @var array */
@@ -173,8 +173,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

@@ -93,7 +93,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);
+        }
         foreach ($source as $key => $value) {
             yield ++$key => $value;
         }
@@ -116,7 +118,9 @@ 
         try {
             foreach ($generator as $lineNb => $lineString) {
                 $node = NodeFactory::get($lineString, $lineNb);
-                if ($this->needsSpecialProcess($node, $previous)) continue;
+                if ($this->needsSpecialProcess($node, $previous)) {
+                    continue;
+                }
                 $this->attachBlankLines($previous);
                 switch ($node->indent <=> $previous->indent) {
                     case -1: $target = $previous->getTargetOnLessIndent($node);

sources/NodeList.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
         foreach ($tmp as $child) {
             if (!($child instanceof NodeComment)
                 && !($child instanceof NodeDirective)
-                && !($child instanceof NodeDocstart && is_null($child->value)) ) return true;
+                && !($child instanceof NodeDocstart && is_null($child->value))) return true;
         }
         return false;
     }
@@ -55,12 +55,12 @@ 
     public function push($node)
     {
         $type = null;
-        if     ($node instanceof NodeItem )    $type = self::SEQUENCE;
+        if ($node instanceof NodeItem)    $type = self::SEQUENCE;
         elseif ($node instanceof NodeKey)      $type = self::MAPPING;
         elseif ($node instanceof NodeSetKey
              || $node instanceof NodeSetValue) {
             $type = self::SET;
-        } elseif ($node instanceof NodeScalar ){
+        } elseif ($node instanceof NodeScalar) {
             $type = self::MULTILINE;
         }
         if (!is_null($type) && $this->checkTypeCoherence($type)) {
@@ -143,10 +143,10 @@ 
             if ($child instanceof NodeComment) {
                 $child->build();
             } else {
-                if($child->value instanceof NodeComment) {
+                if ($child->value instanceof NodeComment) {
                     $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

@@ -35,7 +35,9 @@ 
         $tmp->rewind();
         $fqn = __NAMESPACE__."\\$nodeType";
         foreach ($tmp as $child) {
-            if ($child instanceof $fqn) return true;
+            if ($child instanceof $fqn) {
+                return true;
+            }
         }
         return false;
     }
@@ -47,7 +49,9 @@ 
         foreach ($tmp as $child) {
             if (!($child instanceof NodeComment)
                 && !($child instanceof NodeDirective)
-                && !($child instanceof NodeDocstart && is_null($child->value)) ) return true;
+                && !($child instanceof NodeDocstart && is_null($child->value)) ) {
+                return true;
+            }
         }
         return false;
     }
@@ -55,9 +59,11 @@ 
     public function push($node)
     {
         $type = null;
-        if     ($node instanceof NodeItem )    $type = self::SEQUENCE;
-        elseif ($node instanceof NodeKey)      $type = self::MAPPING;
-        elseif ($node instanceof NodeSetKey
+        if     ($node instanceof NodeItem ) {
+            $type = self::SEQUENCE;
+        } elseif ($node instanceof NodeKey) {
+            $type = self::MAPPING;
+        } elseif ($node instanceof NodeSetKey
              || $node instanceof NodeSetValue) {
             $type = self::SET;
         } elseif ($node instanceof NodeScalar ){

Indentation +6 added lines, -6 removed lines

@@ -79,12 +79,12 @@
      */
     public function checkTypeCoherence($estimatedType):bool
     {
-       // if ($this->type === self::MAPPING) {
-       //     if ($estimatedType === self::SEQUENCE) {
-       //         throw new \ParseError("Error : no coherence in types", 1);
-       //     }
-       // }
-       return (bool) $estimatedType;
+        // if ($this->type === self::MAPPING) {
+        //     if ($estimatedType === self::SEQUENCE) {
+        //         throw new \ParseError("Error : no coherence in types", 1);
+        //     }
+        // }
+        return (bool) $estimatedType;
     }
 
     public function build(&$parent = null)

sources/TagFactory.php

Indentation +6 added lines, -6 removed lines

@@ -15,12 +15,12 @@
     private const NO_NAME = '%s Error: a tag MUST have a name';
     private const WRONG_VALUE = "Error : cannot transform tag '%s' for type '%s'";
     private 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',
+                                        ];
 
     public static $registeredHandlers = [];
 

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,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();
         }
@@ -103,7 +103,7 @@ 
             foreach ($node as $key => $child) {
                 $list[] = self::strHandler($child)->raw;
             }
-            return new NodeScalar(implode('',$list), 0);
+            return new NodeScalar(implode('', $list), 0);
         }
     }
 
@@ -170,7 +170,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/nodes/NodeItem.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         if ($value instanceof NodeKey && $child instanceof NodeKey) {
             if ($value->indent === $child->indent) {
                 return parent::add($child);
-            } elseif ($value->isAwaitingChild($child)){
+            } elseif ($value->isAwaitingChild($child)) {
                 return $value->add($child);
             } else {
                 throw new \ParseError('key ('.$value->identifier.')@'.$value->line.' has already a value', 1);

sources/nodes/NodeComment.php

Indentation +6 added lines, -6 removed lines

@@ -10,16 +10,16 @@
  */
 class NodeComment extends Node
 {
-   public function specialProcess(Node &$previous, array &$emptyLines):bool
-   {
+    public function specialProcess(Node &$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);
-   }
+    }
 }
\ No newline at end of file

sources/nodes/NodeDocStart.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         if (is_null($this->value)) {
             return null;
         } else {
-            if ($this->value instanceof NodeTag){
+            if ($this->value instanceof NodeTag) {
                 $parent->addTag($this->value->_tag);
                 $this->value->build($parent);
             } else {

sources/nodes/NodeCompactSequence.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     public function __construct(string $nodeString, int $line)
     {
         parent::__construct($nodeString, $line);
-        preg_match_all(Regex::SEQUENCE_VALUES, trim(substr(trim($nodeString), 1,-1)), $matches);
+        preg_match_all(Regex::SEQUENCE_VALUES, trim(substr(trim($nodeString), 1, -1)), $matches);
         foreach ($matches['item'] as $key => $item) {
             $i = new NodeItem('', $line);
             $i->indent = null;