Completed
Push — master ( 86484b...f97b0a )
by stéphane
05:27
created
sources/nodes/NodeSetKey.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,9 @@
 block discarded – undo
31 31
         $built = is_null($this->value) ? null : $this->value->build();
32 32
         $stringKey = is_string($built) && Regex::isProperlyQuoted($built) ? trim($built, '\'" '): $built;
33 33
         $key = json_encode($stringKey, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
34
-        if (empty($key)) throw new \Exception("Cant serialize complex key: ".var_export($this->value, true));
34
+        if (empty($key)) {
35
+            throw new \Exception("Cant serialize complex key: ".var_export($this->value, true));
36
+        }
35 37
         $parent->{trim($key, '\'" ')} = null;
36 38
     }
37 39
 
Please login to merge, or discard this patch.
sources/types/YamlObject.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,8 +74,12 @@
 block discarded – undo
74 74
     {
75 75
         $prop = get_object_vars($this);
76 76
         unset($prop["__yaml__object__api"]);
77
-        if (count($prop) > 0) return $prop;
78
-        if (count($this) > 0) return iterator_to_array($this);
77
+        if (count($prop) > 0) {
78
+            return $prop;
79
+        }
80
+        if (count($this) > 0) {
81
+            return iterator_to_array($this);
82
+        }
79 83
         return $this->__yaml__object__api->value ?? "_Empty YamlObject_";
80 84
     }
81 85
 }
Please login to merge, or discard this patch.
sources/Node.php 1 patch
Braces   +15 added lines, -5 removed lines patch added patch discarded remove patch
@@ -210,13 +210,23 @@
 block discarded – undo
210 210
     {
211 211
         $props = [];
212 212
         $props['line->indent'] = "$this->line -> $this->indent";
213
-        if ($this->identifier) $props['identifier'] = "($this->identifier)";
214
-        if ($this->anchor)     $props['anchor']     = "($this->anchor)";
215
-        if ($this->tag)        $props['tag']        = "($this->tag)";
216
-        if ($this->value)      $props['value']      = $this->value;
213
+        if ($this->identifier) {
214
+            $props['identifier'] = "($this->identifier)";
215
+        }
216
+        if ($this->anchor) {
217
+            $props['anchor']     = "($this->anchor)";
218
+        }
219
+        if ($this->tag) {
220
+            $props['tag']        = "($this->tag)";
221
+        }
222
+        if ($this->value) {
223
+            $props['value']      = $this->value;
224
+        }
217 225
         // $props['value'] = $this->value;
218 226
         $props['raw']   = $this->raw;
219
-        if (!$this->_parent)  $props['parent'] = 'NO PARENT!!!';
227
+        if (!$this->_parent) {
228
+            $props['parent'] = 'NO PARENT!!!';
229
+        }
220 230
         return $props;
221 231
     }
222 232
 }
Please login to merge, or discard this patch.
sources/nodes/NodeLiterals.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,9 @@
 block discarded – undo
25 25
 
26 26
     public function add(Node $child):Node
27 27
     {
28
-        if (is_null($this->value)) $this->value = new NodeList();
28
+        if (is_null($this->value)) {
29
+            $this->value = new NodeList();
30
+        }
29 31
         $candidate = $child;
30 32
         if (!Yaml::isOneOf($child, ['NodeScalar', 'NodeBlank', 'NodeComment', 'NodeQuoted'])) {
31 33
             $candidate = new NodeScalar((string) $child->raw, $child->line);
Please login to merge, or discard this patch.
sources/Yaml.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -107,7 +107,9 @@
 block discarded – undo
107 107
     {
108 108
         foreach ($comparison as $className) {
109 109
             $fqn = __NAMESPACE__."\\Yaml\\$className";
110
-            if ($subject instanceof $fqn) return true;
110
+            if ($subject instanceof $fqn) {
111
+                return true;
112
+            }
111 113
         }
112 114
         return false;
113 115
     }
Please login to merge, or discard this patch.
sources/NodeList.php 1 patch
Braces   +11 added lines, -5 removed lines patch added patch discarded remove patch
@@ -37,7 +37,9 @@  discard block
 block discarded – undo
37 37
         $tmp->rewind();
38 38
         $fqn = __NAMESPACE__."\\$nodeType";
39 39
         foreach ($tmp as $child) {
40
-            if ($child instanceof $fqn) return true;
40
+            if ($child instanceof $fqn) {
41
+                return true;
42
+            }
41 43
         }
42 44
         return false;
43 45
     }
@@ -51,7 +53,9 @@  discard block
 block discarded – undo
51 53
                 && !($child instanceof NodeDirective)
52 54
                 && !($child instanceof NodeBlank)
53 55
                 && !($child instanceof NodeDocstart
54
-                && is_null($child->value)) ) return true;
56
+                && is_null($child->value)) ) {
57
+                return true;
58
+            }
55 59
         }
56 60
         return false;
57 61
     }
@@ -59,9 +63,11 @@  discard block
 block discarded – undo
59 63
     public function push($node)
60 64
     {
61 65
         $type = null;
62
-        if     ($node instanceof NodeItem )    $type = self::SEQUENCE;
63
-        elseif ($node instanceof NodeKey)      $type = self::MAPPING;
64
-        elseif ($node instanceof NodeSetKey
66
+        if     ($node instanceof NodeItem ) {
67
+            $type = self::SEQUENCE;
68
+        } elseif ($node instanceof NodeKey) {
69
+            $type = self::MAPPING;
70
+        } elseif ($node instanceof NodeSetKey
65 71
              || $node instanceof NodeSetValue) {
66 72
             $type = self::SET;
67 73
         } elseif ($node instanceof NodeScalar ){
Please login to merge, or discard this patch.
sources/NodeFactory.php 1 patch
Braces   +19 added lines, -11 removed lines patch added patch discarded remove patch
@@ -16,10 +16,13 @@  discard block
 block discarded – undo
16 16
     final public static function get($nodeString = null, $line = 0):Node
17 17
     {
18 18
         $trimmed = ltrim($nodeString);
19
-        if ($trimmed === '')                                return new NodeBlank($nodeString, $line);
20
-        elseif (substr($trimmed, 0, 3) === '...')           return new NodeDocEnd($nodeString, $line);
21
-        elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) return new NodeKey($nodeString, $line, $matches);
22
-        else {
19
+        if ($trimmed === '') {
20
+            return new NodeBlank($nodeString, $line);
21
+        } elseif (substr($trimmed, 0, 3) === '...') {
22
+            return new NodeDocEnd($nodeString, $line);
23
+        } elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) {
24
+            return new NodeKey($nodeString, $line, $matches);
25
+        } else {
23 26
             $first = $trimmed[0];
24 27
             $stringGroups = ["-" ,'>|' ,'"\'',"#%" ,"{[" ,":?" ,'*&!'];
25 28
             $methodGroups = ['Hyphen','Literal','Quoted','Special','Compact','SetElement','NodeAction'];
@@ -90,10 +93,13 @@  discard block
 block discarded – undo
90 93
     final private static function onCompact(string $first, string $nodeString, int $line):Node
91 94
     {
92 95
         json_decode($nodeString, false, 512, self::JSON_OPTIONS);
93
-        if (json_last_error() === \JSON_ERROR_NONE)             return new NodeJSON($nodeString, $line);
94
-        elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString)))  return new NodeCompactMapping($nodeString, $line);
95
-        elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) return new NodeCompactSequence($nodeString, $line);
96
-        else {
96
+        if (json_last_error() === \JSON_ERROR_NONE) {
97
+            return new NodeJSON($nodeString, $line);
98
+        } elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString))) {
99
+            return new NodeCompactMapping($nodeString, $line);
100
+        } elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) {
101
+            return new NodeCompactSequence($nodeString, $line);
102
+        } else {
97 103
             return new NodePartial($nodeString, $line);
98 104
         }
99 105
     }
@@ -108,9 +114,11 @@  discard block
 block discarded – undo
108 114
      */
109 115
     final private static function onHyphen(string $first, string $nodeString, int $line):Node
110 116
     {
111
-        if (substr($nodeString, 0, 3) === '---')              return new NodeDocStart($nodeString, $line);
112
-        elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString)))  return new NodeItem($nodeString, $line);
113
-        else {
117
+        if (substr($nodeString, 0, 3) === '---') {
118
+            return new NodeDocStart($nodeString, $line);
119
+        } elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString))) {
120
+            return new NodeItem($nodeString, $line);
121
+        } else {
114 122
             return new NodeScalar($nodeString, $line);
115 123
         }
116 124
     }
Please login to merge, or discard this patch.
sources/Loader.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -129,8 +129,12 @@
 block discarded – undo
129 129
         try {
130 130
             foreach ($generator as $lineNb => $lineString) {
131 131
                 $node = NodeFactory::get($lineString, $lineNb);
132
-                if ($this->_debug === 1) echo get_class($node)."\n";
133
-                if ($this->needsSpecialProcess($node, $previous)) continue;
132
+                if ($this->_debug === 1) {
133
+                    echo get_class($node)."\n";
134
+                }
135
+                if ($this->needsSpecialProcess($node, $previous)) {
136
+                    continue;
137
+                }
134 138
                 $this->_attachBlankLines($previous);
135 139
                 switch ($node->indent <=> $previous->indent) {
136 140
                     case -1: $target = $previous->getTargetOnLessIndent($node);
Please login to merge, or discard this patch.
sources/Builder.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -112,8 +112,12 @@  discard block
 block discarded – undo
112 112
  \.nan | \.NaN | \.NAN   tag:yaml.org,2002:float (Not a number)
113 113
  *   tag:yaml.org,2002:str (Default)
114 114
  */
115
-        if (Regex::isDate($v))   return self::$dateAsObject && !$onlyScalar ? date_create($v) : $v;
116
-        if (Regex::isNumber($v)) return self::getNumber($v);
115
+        if (Regex::isDate($v)) {
116
+            return self::$dateAsObject && !$onlyScalar ? date_create($v) : $v;
117
+        }
118
+        if (Regex::isNumber($v)) {
119
+            return self::getNumber($v);
120
+        }
117 121
         $types = ['yes'   => true,
118 122
                   'no'    => false,
119 123
                   'true'  => true,
@@ -136,8 +140,12 @@  discard block
 block discarded – undo
136 140
      */
137 141
     private static function getNumber(string $v)
138 142
     {
139
-        if ((bool) preg_match(Regex::OCTAL_NUM, $v)) return intval(base_convert($v, 8, 10));
140
-        if ((bool) preg_match(Regex::HEX_NUM, $v))   return intval(base_convert($v, 16, 10));
143
+        if ((bool) preg_match(Regex::OCTAL_NUM, $v)) {
144
+            return intval(base_convert($v, 8, 10));
145
+        }
146
+        if ((bool) preg_match(Regex::HEX_NUM, $v)) {
147
+            return intval(base_convert($v, 16, 10));
148
+        }
141 149
         return is_bool(strpos($v, '.')) || substr_count($v, '.') > 1 ? intval($v) : floatval($v);
142 150
     }
143 151
 
Please login to merge, or discard this patch.