dallgoot / yaml

sources/API.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
             return $this->_anchors[$name];
         }
         throw new \UnexpectedValueException(sprintf(self::UNKNOWN_REFERENCE,
-                                                    $name, implode(',',array_keys($this->_anchors)))
+                                                    $name, implode(',', array_keys($this->_anchors)))
                                                 );
     }
 

sources/types/YamlObject.php

Spacing +2 added lines, -2 removed lines

@@ -46,9 +46,9 @@
     public function __call($funcName, $arguments)
     {
         $reflectAPI = new \ReflectionClass(get_class($this->__yaml__object__api));
-        $getName    = function ($o) { return $o->name; };
+        $getName    = function($o) { return $o->name; };
         $publicApi  = array_map($getName, $reflectAPI->getMethods(\ReflectionMethod::IS_PUBLIC));
-        if (!in_array($funcName, $publicApi) ) {
+        if (!in_array($funcName, $publicApi)) {
             throw new \BadMethodCallException(sprintf(self::UNDEFINED_METHOD, $funcName, implode(",", $publicApi)));
         }
         return call_user_func_array([$this->__yaml__object__api, $funcName], $arguments);

Braces +6 added lines, -2 removed lines

@@ -74,8 +74,12 @@
     {
         $prop = get_object_vars($this);
         unset($prop["__yaml__object__api"]);
-        if (count($prop) > 0) return $prop;
-        if (count($this) > 0) return iterator_to_array($this);
+        if (count($prop) > 0) {
+            return $prop;
+        }
+        if (count($this) > 0) {
+            return iterator_to_array($this);
+        }
         return $this->__yaml__object__api->value ?? "_Empty YamlObject_";
     }
 }

sources/NodeList.php

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)

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/Builder.php

Indentation +7 added lines, -7 removed lines

@@ -92,13 +92,13 @@
         if (Regex::isDate($v))   return self::$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)] : $v;
     }

Spacing +1 added lines, -1 removed lines

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

Braces +12 added lines, -4 removed lines

@@ -112,8 +112,12 @@ 
  \.nan | \.NaN | \.NAN   tag:yaml.org,2002:float (Not a number)
  *   tag:yaml.org,2002:str (Default)
  */
-        if (Regex::isDate($v))   return self::$dateAsObject && !$onlyScalar ? date_create($v) : $v;
-        if (Regex::isNumber($v)) return self::getNumber($v);
+        if (Regex::isDate($v)) {
+            return self::$dateAsObject && !$onlyScalar ? date_create($v) : $v;
+        }
+        if (Regex::isNumber($v)) {
+            return self::getNumber($v);
+        }
         $types = ['yes'   => true,
                   'no'    => false,
                   'true'  => true,
@@ -136,8 +140,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);
     }
 

sources/Loader.php

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);

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;

examples/write.php

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';
+}

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?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};
@@ -14,9 +14,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);
 

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));

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);
 

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);
         }
     }