Completed
Push — master ( 7cc354...d81ab2 )
by stéphane
03:28
created
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/NodeList.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -79,12 +79,12 @@
 block discarded – undo
79 79
      */
80 80
     public function checkTypeCoherence($estimatedType):bool
81 81
     {
82
-       // if ($this->type === self::MAPPING) {
83
-       //     if ($estimatedType === self::SEQUENCE) {
84
-       //         throw new \ParseError("Error : no coherence in types", 1);
85
-       //     }
86
-       // }
87
-       return (bool) $estimatedType;
82
+        // if ($this->type === self::MAPPING) {
83
+        //     if ($estimatedType === self::SEQUENCE) {
84
+        //         throw new \ParseError("Error : no coherence in types", 1);
85
+        //     }
86
+        // }
87
+        return (bool) $estimatedType;
88 88
     }
89 89
 
90 90
     public function build(&$parent = null)
Please login to merge, or discard this patch.
Braces   +11 added lines, -5 removed lines patch added patch discarded remove patch
@@ -50,7 +50,9 @@  discard block
 block discarded – undo
50 50
         $tmp->rewind();
51 51
         $fqn = __NAMESPACE__."\\Nodes\\$nodeType";
52 52
         foreach ($tmp as $child) {
53
-            if ($child instanceof $fqn) return true;
53
+            if ($child instanceof $fqn) {
54
+                return true;
55
+            }
54 56
         }
55 57
         return false;
56 58
     }
@@ -64,7 +66,9 @@  discard block
 block discarded – undo
64 66
                 && !($child instanceof Directive)
65 67
                 && !($child instanceof Blank)
66 68
                 && !($child instanceof Docstart
67
-                && is_null($child->value)) ) return true;
69
+                && is_null($child->value)) ) {
70
+                return true;
71
+            }
68 72
         }
69 73
         return false;
70 74
     }
@@ -72,9 +76,11 @@  discard block
 block discarded – undo
72 76
     public function push($node)
73 77
     {
74 78
         $type = null;
75
-        if     ($node instanceof Item )    $type = self::SEQUENCE;
76
-        elseif ($node instanceof Key)      $type = self::MAPPING;
77
-        elseif ($node instanceof SetKey
79
+        if     ($node instanceof Item ) {
80
+            $type = self::SEQUENCE;
81
+        } elseif ($node instanceof Key) {
82
+            $type = self::MAPPING;
83
+        } elseif ($node instanceof SetKey
78 84
              || $node instanceof SetValue) {
79 85
             $type = self::SET;
80 86
         } elseif ($node instanceof Scalar ){
Please login to merge, or discard this patch.
sources/Builder.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -92,13 +92,13 @@
 block discarded – undo
92 92
         if (Regex::isDate($v))   return self::$dateAsObject && !$onlyScalar ? date_create($v) : $v;
93 93
         if (Regex::isNumber($v)) return self::getNumber($v);
94 94
         $types = ['yes'   => true,
95
-                  'no'    => false,
96
-                  'true'  => true,
97
-                  'false' => false,
98
-                  'null'  => null,
99
-                  '.inf'  => \INF,
100
-                  '-.inf' => -\INF,
101
-                  '.nan'  => \NAN
95
+                    'no'    => false,
96
+                    'true'  => true,
97
+                    'false' => false,
98
+                    'null'  => null,
99
+                    '.inf'  => \INF,
100
+                    '-.inf' => -\INF,
101
+                    '.nan'  => \NAN
102 102
         ];
103 103
         return array_key_exists(strtolower($v), $types) ? $types[strtolower($v)] : $v;
104 104
     }
Please login to merge, or discard this 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.
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/NodeFactory.php 1 patch
Braces   +19 added lines, -11 removed lines patch added patch discarded remove patch
@@ -22,10 +22,13 @@  discard block
 block discarded – undo
22 22
     final public static function get($nodeString = null, $line = 0):NodeGeneric
23 23
     {
24 24
         $trimmed = ltrim($nodeString);
25
-        if ($trimmed === '')                                return new Nodes\Blank($nodeString, $line);
26
-        elseif (substr($trimmed, 0, 3) === '...')           return new Nodes\DocEnd($nodeString, $line);
27
-        elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) return new Nodes\Key($nodeString, $line, $matches);
28
-        else {
25
+        if ($trimmed === '') {
26
+            return new Nodes\Blank($nodeString, $line);
27
+        } elseif (substr($trimmed, 0, 3) === '...') {
28
+            return new Nodes\DocEnd($nodeString, $line);
29
+        } elseif ((bool) preg_match(Regex::KEY, $trimmed, $matches)) {
30
+            return new Nodes\Key($nodeString, $line, $matches);
31
+        } else {
29 32
             $first = $trimmed[0];
30 33
             $stringGroups = ["-" ,'>|' ,'"\'',"#%" ,"{[" ,":?" ,'*&!'];
31 34
             $methodGroups = ['Hyphen','Literal','Quoted','Special','Compact','SetElement','NodeAction'];
@@ -96,10 +99,13 @@  discard block
 block discarded – undo
96 99
     final private static function onCompact(string $first, string $nodeString, int $line):NodeGeneric
97 100
     {
98 101
         json_decode($nodeString, false, 512, self::JSON_OPTIONS);
99
-        if (json_last_error() === \JSON_ERROR_NONE)             return new Nodes\JSON($nodeString, $line);
100
-        elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString)))  return new Nodes\CompactMapping($nodeString, $line);
101
-        elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) return new Nodes\CompactSequence($nodeString, $line);
102
-        else {
102
+        if (json_last_error() === \JSON_ERROR_NONE) {
103
+            return new Nodes\JSON($nodeString, $line);
104
+        } elseif ((bool) preg_match(Regex::MAPPING, trim($nodeString))) {
105
+            return new Nodes\CompactMapping($nodeString, $line);
106
+        } elseif ((bool) preg_match(Regex::SEQUENCE, trim($nodeString))) {
107
+            return new Nodes\CompactSequence($nodeString, $line);
108
+        } else {
103 109
             return new Nodes\Partial($nodeString, $line);
104 110
         }
105 111
     }
@@ -114,9 +120,11 @@  discard block
 block discarded – undo
114 120
      */
115 121
     final private static function onHyphen(string $first, string $nodeString, int $line):NodeGeneric
116 122
     {
117
-        if (substr($nodeString, 0, 3) === '---')              return new Nodes\DocStart($nodeString, $line);
118
-        elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString)))  return new Nodes\Item($nodeString, $line);
119
-        else {
123
+        if (substr($nodeString, 0, 3) === '---') {
124
+            return new Nodes\DocStart($nodeString, $line);
125
+        } elseif ((bool) preg_match(Regex::ITEM, ltrim($nodeString))) {
126
+            return new Nodes\Item($nodeString, $line);
127
+        } else {
120 128
             return new Nodes\Scalar($nodeString, $line);
121 129
         }
122 130
     }
Please login to merge, or discard this patch.
sources/Dumper.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,9 @@
 block discarded – undo
44 44
      */
45 45
     public static function toString($dataType, int $options = null):string
46 46
     {
47
-        if (empty($dataType)) throw new \Exception(self::class.": No content to convert to Yaml");
47
+        if (empty($dataType)) {
48
+            throw new \Exception(self::class.": No content to convert to Yaml");
49
+        }
48 50
         self::$options = is_int($options) ? $options : self::OPTIONS;
49 51
         $dumpHandler = new DumperHandlers($options);
50 52
         if (is_scalar($dataType)) {
Please login to merge, or discard this patch.
sources/nodes/Comment.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -10,17 +10,17 @@
 block discarded – undo
10 10
  */
11 11
 class Comment extends NodeGeneric
12 12
 {
13
-   public function specialProcess(NodeGeneric &$previous, array &$emptyLines):bool
14
-   {
13
+    public function specialProcess(NodeGeneric &$previous, array &$emptyLines):bool
14
+    {
15 15
         $previous->getRoot()->add($this);
16 16
         return true;
17
-   }
17
+    }
18 18
 
19
-   public function build(&$parent = null)
20
-   {
19
+    public function build(&$parent = null)
20
+    {
21 21
         $root = $this->getRoot();
22 22
         $yamlObject = $root->getYamlObject();
23 23
         $yamlObject->addComment($this->line, $this->raw);
24 24
         return null;
25
-   }
25
+    }
26 26
 }
27 27
\ No newline at end of file
Please login to merge, or discard this patch.
sources/nodes/abstract/NodeGeneric.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
         return false;
154 154
     }
155 155
 
156
-   /**
156
+    /**
157 157
      * Find parent target when current Node indentation is lesser than previous node indentation
158 158
      *
159 159
      * @param NodeGeneric $node
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
         return $this->getParent();
190 190
     }
191 191
 
192
-   /**
192
+    /**
193 193
      * Find parent target when current Node indentation is superior than previous node indentation
194 194
      *
195 195
      * @param NodeGeneric $node
Please login to merge, or discard this patch.
Braces   +18 added lines, -6 removed lines patch added patch discarded remove patch
@@ -226,7 +226,9 @@  discard block
 block discarded – undo
226 226
     {
227 227
         foreach ($classNameList as $className) {
228 228
             $fqn = __NAMESPACE__."\\$className";
229
-            if ($this instanceof $fqn) return true;
229
+            if ($this instanceof $fqn) {
230
+                return true;
231
+            }
230 232
         }
231 233
         return false;
232 234
     }
@@ -240,13 +242,23 @@  discard block
 block discarded – undo
240 242
     {
241 243
         $props = [];
242 244
         $props['line->indent'] = "$this->line -> $this->indent";
243
-        if ($this->identifier) $props['identifier'] = "($this->identifier)";
244
-        if ($this->anchor)     $props['anchor']     = "($this->anchor)";
245
-        if ($this->tag)        $props['tag']        = "($this->tag)";
246
-        if ($this->value)      $props['value']      = $this->value;
245
+        if ($this->identifier) {
246
+            $props['identifier'] = "($this->identifier)";
247
+        }
248
+        if ($this->anchor) {
249
+            $props['anchor']     = "($this->anchor)";
250
+        }
251
+        if ($this->tag) {
252
+            $props['tag']        = "($this->tag)";
253
+        }
254
+        if ($this->value) {
255
+            $props['value']      = $this->value;
256
+        }
247 257
         // $props['value'] = $this->value;
248 258
         $props['raw']   = $this->raw;
249
-        if (!$this->_parent)  $props['parent'] = 'NO PARENT!!!';
259
+        if (!$this->_parent) {
260
+            $props['parent'] = 'NO PARENT!!!';
261
+        }
250 262
         return $props;
251 263
     }
252 264
 }
Please login to merge, or discard this patch.
sources/nodes/Literal.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
         $result = '';
18 18
         $list = $list->filterComment();
19 19
         if ($this->identifier !== '+') {
20
-             self::litteralStripTrailing($list);
20
+                self::litteralStripTrailing($list);
21 21
         }
22 22
         if ($list->count()) {
23 23
             $list->setIteratorMode(NodeList::IT_MODE_DELETE);
Please login to merge, or discard this patch.