Completed
Branch master (44c6e4)
by stéphane
02:06
created
yaml/YamlObject.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
     public function __call($funcName, $arguments)
33 33
     {
34 34
         $reflectAPI = new \ReflectionClass(get_class($this->__yaml__object__api));
35
-        $getName = function ($o) { return $o->name; };
35
+        $getName = function($o) { return $o->name; };
36 36
         $publicApi  = array_map($getName, $reflectAPI->getMethods(\ReflectionMethod::IS_PUBLIC));
37 37
         $privateApi = array_map($getName, $reflectAPI->getMethods(\ReflectionMethod::IS_PRIVATE));
38 38
         if (!in_array($funcName, $publicApi) && !in_array($funcName, $privateApi)) {
Please login to merge, or discard this patch.
yaml/Node.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
             return;
190 190
         }
191 191
         // Note : php don't like '?' as an array key -_-'
192
-        if(in_array($first, ['?', ':'])) {
192
+        if (in_array($first, ['?', ':'])) {
193 193
             $this->type = $first === '?' ? Y::SET_KEY : Y::SET_VALUE;
194 194
             if (!empty(trim($v))) {
195 195
                 $this->value = new NodeList;
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
             $this->onHyphen($nodeValue);
202 202
             return;
203 203
         }
204
-        $characters = [ '#' =>  [Y::COMMENT, ltrim($v)],
204
+        $characters = ['#' =>  [Y::COMMENT, ltrim($v)],
205 205
                         '%' =>  [Y::DIRECTIVE, ltrim($v)],
206 206
                         '>' =>  [Y::LITT_FOLDED, null],
207 207
                         '|' =>  [Y::LITT, null]
@@ -254,28 +254,28 @@  discard block
 block discarded – undo
254 254
     private function onCompact($value)
255 255
     {
256 256
         $this->value = json_decode($value, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
257
-        if (json_last_error() === JSON_ERROR_NONE){
257
+        if (json_last_error() === JSON_ERROR_NONE) {
258 258
             $this->type = Y::JSON;
259 259
             return;
260 260
         }
261 261
         $this->value = new NodeList();
262
-        if (preg_match(R::MAPPING, $value)){
262
+        if (preg_match(R::MAPPING, $value)) {
263 263
             $this->type = Y::COMPACT_MAPPING;
264 264
             $this->value->type = Y::COMPACT_MAPPING;
265
-            preg_match_all(R::MAPPING_VALUES, trim(substr($value, 1,-1)), $matches);
265
+            preg_match_all(R::MAPPING_VALUES, trim(substr($value, 1, -1)), $matches);
266 266
             foreach ($matches['k'] as $index => $property) {
267 267
                 $n = new Node('', $this->line);
268 268
                 $n->type = Y::KEY;
269
-                $n->identifier = trim($property, '"\' ');//TODO : maybe check for proper quoting first ?
269
+                $n->identifier = trim($property, '"\' '); //TODO : maybe check for proper quoting first ?
270 270
                 $n->value = new Node($matches['v'][$index], $this->line);
271 271
                 $this->value->push($n);
272 272
             }
273 273
             return;
274 274
         }
275
-        if (preg_match(R::SEQUENCE, $value)){
275
+        if (preg_match(R::SEQUENCE, $value)) {
276 276
             $this->type = Y::COMPACT_SEQUENCE;
277 277
             $this->value->type = Y::COMPACT_SEQUENCE;
278
-            $count = preg_match_all(R::SEQUENCE_VALUES, trim(substr($value, 1,-1)), $matches);
278
+            $count = preg_match_all(R::SEQUENCE_VALUES, trim(substr($value, 1, -1)), $matches);
279 279
             foreach ($matches['item'] as $key => $item) {
280 280
                 $i = new Node('', $this->line);
281 281
                 $i->type = Y::ITEM;
Please login to merge, or discard this patch.
example.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,13 +6,13 @@
 block discarded – undo
6 6
 /**
7 7
  * Display some use cases for Yaml library
8 8
  */
9
-const JSON_OPTIONS = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_LINE_TERMINATORS | JSON_UNESCAPED_UNICODE | JSON_PRESERVE_ZERO_FRACTION | JSON_PARTIAL_OUTPUT_ON_ERROR;
9
+const JSON_OPTIONS = JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_LINE_TERMINATORS|JSON_UNESCAPED_UNICODE|JSON_PRESERVE_ZERO_FRACTION|JSON_PARTIAL_OUTPUT_ON_ERROR;
10 10
 
11 11
 /* USE CASE 1
12 12
 * load and parse if file exists
13 13
 */
14 14
 ini_set("auto_detect_line_endings", 1);
15
-$content = file_get_contents('./tests/cases/parsing/multiline_quoted_with_blank.yml');//var_dump($content);
15
+$content = file_get_contents('./tests/cases/parsing/multiline_quoted_with_blank.yml'); //var_dump($content);
16 16
 // $content = file_get_contents('./tests/cases/examples/Example_2_17.yml');//var_dump($content);
17 17
 $yaml = Y::parse($content, null, 3);
18 18
 // $yaml = Y::parseFile('./references/Example 2.27.yml', null, 1);
Please login to merge, or discard this patch.
yaml/Loader.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,17 +19,17 @@  discard block
 block discarded – undo
19 19
     /* @var null|string */
20 20
     public static $error;
21 21
 
22
-    public const EXCLUDE_DIRECTIVES = 1;//DONT include_directive
23
-    public const IGNORE_COMMENTS    = 2;//DONT include_comments
24
-    public const NO_PARSING_EXCEPTIONS = 4;//THROW Exception on parsing Errors
25
-    public const NO_OBJECT_FOR_DATE = 8;//DONT import date strings as dateTime Object
22
+    public const EXCLUDE_DIRECTIVES = 1; //DONT include_directive
23
+    public const IGNORE_COMMENTS    = 2; //DONT include_comments
24
+    public const NO_PARSING_EXCEPTIONS = 4; //THROW Exception on parsing Errors
25
+    public const NO_OBJECT_FOR_DATE = 8; //DONT import date strings as dateTime Object
26 26
     //privates
27 27
     /* @var null|false|array| */
28 28
     private $content;
29 29
     /* @var null|string */
30 30
     private $filePath;
31 31
     /* @var integer */
32
-    private $debug = 0;///TODO: determine levels
32
+    private $debug = 0; ///TODO: determine levels
33 33
     /* @var integer */
34 34
     private $options = 0;
35 35
     //Exceptions messages
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
         $previous = $root = new Node();
93 93
         $emptyLines = [];
94 94
         try { //var_dump($source);
95
-            $gen = function () use($source) {
95
+            $gen = function() use($source) {
96 96
                 foreach ($source as $key => $value) {
97 97
                     yield ++$key => $value;
98 98
                 }
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
                     case 0:
117 117
                         if ($n->type & Y::KEY && $n->indent === 0) {
118 118
                             $target = $root;
119
-                        } elseif($n->type & Y::ITEM && $deepest->type & Y::KEY && is_null($deepest->value)) {
119
+                        } elseif ($n->type & Y::ITEM && $deepest->type & Y::KEY && is_null($deepest->value)) {
120 120
                             $target = $deepest;
121 121
                         } else {
122 122
                             $target = $previous->getParent();
Please login to merge, or discard this patch.
yaml/Dumper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
         foreach ($array as $key => $item) {
117 117
             $lineStart = current($refKeys) === $key ? "- " : "- $key: ";
118 118
             if (is_scalar($item)) {
119
-                self::add($lineStart.self::dump($item,0), $indent);
119
+                self::add($lineStart.self::dump($item, 0), $indent);
120 120
             } else {
121 121
                 self::add($lineStart, $indent);
122 122
                 self::dump($item, $indent + self::INDENT);
@@ -163,10 +163,10 @@  discard block
 block discarded – undo
163 163
         if (is_array($subject) || $subject instanceof \ArrayIterator) {
164 164
             $max = count($subject);
165 165
             $objectAsArray = is_array($subject) ? $subject : $subject->getArrayCopy();
166
-            if(array_keys($objectAsArray) !== range(0, $max)) {
166
+            if (array_keys($objectAsArray) !== range(0, $max)) {
167 167
                 $pairs = $objectAsArray;
168 168
             } else {
169
-                $valuesList = array_map(self::dump, $objectAsArray, array_fill( 0 , $max , $indent ));
169
+                $valuesList = array_map(self::dump, $objectAsArray, array_fill(0, $max, $indent));
170 170
                 return '['.implode(', ', $valuesList).']';
171 171
             }
172 172
         } else {
Please login to merge, or discard this patch.
yaml/NodeList.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -40,18 +40,18 @@
 block discarded – undo
40 40
     public function forceType()
41 41
     {
42 42
         if (is_null($this->type)) {
43
-            $childTypes  = $this->getTypes();
44
-            if ($childTypes & (Y::KEY|Y::SET_KEY)) {
45
-                if ($childTypes & Y::ITEM) {
43
+            $childTypes = $this->getTypes();
44
+            if ($childTypes&(Y::KEY|Y::SET_KEY)) {
45
+                if ($childTypes&Y::ITEM) {
46 46
                     // TODO: replace the document index in HERE ----------v
47 47
                     throw new \ParseError(self::class.": Error conflicting types found");
48 48
                 } else {
49 49
                     $this->type = Y::MAPPING;
50 50
                 }
51 51
             } else {
52
-                if ($childTypes & Y::ITEM) {
52
+                if ($childTypes&Y::ITEM) {
53 53
                     $this->type = Y::SEQUENCE;
54
-                } elseif (!($childTypes & Y::COMMENT)) {
54
+                } elseif (!($childTypes&Y::COMMENT)) {
55 55
                     $this->type = Y::LITT_FOLDED;
56 56
                 }
57 57
             }
Please login to merge, or discard this patch.
yaml/Builder.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
             $q = new NodeList;
38 38
             $q->push($_root->value);
39 39
             self::$_root = new YamlObject;
40
-            $tmp =  self::buildNodeList($q, self::$_root);
40
+            $tmp = self::buildNodeList($q, self::$_root);
41 41
             return $tmp;
42 42
         }
43 43
         $_root->value instanceof NodeList && $_root->value->setIteratorMode(NodeList::IT_MODE_DELETE);
@@ -82,13 +82,13 @@  discard block
 block discarded – undo
82 82
      *
83 83
      * @return mixed    The parent (object|array) or a string representing the NodeList.
84 84
      */
85
-    private static function buildNodeList(NodeList $node, &$parent=null)
85
+    private static function buildNodeList(NodeList $node, &$parent = null)
86 86
     {
87 87
         $node->forceType();
88
-        if ($node->type & (Y::RAW | Y::LITTERALS)) {
88
+        if ($node->type & (Y::RAW|Y::LITTERALS)) {
89 89
             return self::buildLitteral($node, (int) $node->type);
90 90
         }
91
-        $action = function ($child, &$parent, &$out) {
91
+        $action = function($child, &$parent, &$out) {
92 92
             self::build($child, $out);
93 93
         };
94 94
         if ($node->type & (Y::COMPACT_MAPPING|Y::MAPPING|Y::SET)) {
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
             $out = $parent ?? [];
98 98
         } else {
99 99
             $out = '';
100
-            $action = function ($child, &$parent, &$out) {
100
+            $action = function($child, &$parent, &$out) {
101 101
                 if ($child->type & (Y::SCALAR|Y::QUOTED)) {
102 102
                     if ($parent) {
103 103
                         $parent->setText(self::build($child));
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
     private static function buildNode(Node $node, &$parent)
128 128
     {
129 129
         extract((array) $node, EXTR_REFS);
130
-        if ($type & (Y::REF_DEF | Y::REF_CALL)) {
130
+        if ($type&(Y::REF_DEF|Y::REF_CALL)) {
131 131
             if (is_object($value)) {
132 132
                 $tmp = self::build($value, $parent) ?? $parent;
133 133
             } else {
@@ -136,10 +136,10 @@  discard block
 block discarded – undo
136 136
             if ($type === Y::REF_DEF) self::$_root->addReference($identifier, $tmp);
137 137
             return self::$_root->getReference($identifier);
138 138
         }
139
-        if ($type & (Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) {
139
+        if ($type&(Y::COMPACT_MAPPING|Y::COMPACT_SEQUENCE)) {
140 140
             return self::buildNodeList($node->value, $parent);
141 141
         }
142
-        if ($type & Y::COMMENT) self::$_root->addComment($node->line, $node->value);
142
+        if ($type&Y::COMMENT) self::$_root->addComment($node->line, $node->value);
143 143
         $typesActions = [Y::DIRECTIVE => 'buildDirective',
144 144
                          Y::ITEM      => 'buildItem',
145 145
                          Y::KEY       => 'buildKey',
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
      * @throws \ParseError if Key has no name(identifier) Note: empty string is allowed
163 163
      * @return null
164 164
      */
165
-    private static function buildKey(Node $node, &$parent=null)
165
+    private static function buildKey(Node $node, &$parent = null)
166 166
     {
167 167
         extract((array) $node, EXTR_REFS);
168 168
         if (is_null($identifier)) {
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
             }
181 181
             if ($value instanceof NodeList) {
182 182
                 $childTypes = $value->getTypes();
183
-                if (is_null($value->type) && $childTypes & Y::SCALAR && !($childTypes & Y::COMMENT)) {
183
+                if (is_null($value->type) && $childTypes&Y::SCALAR && !($childTypes&Y::COMMENT)) {
184 184
                     $result = self::buildLitteral($value, Y::LITT_FOLDED);
185 185
                 } else {
186 186
                     $result = self::buildNodeList($value);
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
      */
210 210
     private static function buildItem(Node $node, &$parent)
211 211
     {
212
-        extract((array) $node, EXTR_REFS);//var_dump(__METHOD__);
212
+        extract((array) $node, EXTR_REFS); //var_dump(__METHOD__);
213 213
         if (!is_array($parent) && !($parent instanceof \ArrayIterator)) {
214 214
             throw new \Exception("parent must be an Iterable not ".(is_object($parent) ? get_class($parent) : gettype($parent)), 1);
215 215
         }
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
         $numKeys = array_filter(array_keys($ref), 'is_int');
218 218
         $key = count($numKeys) > 0 ? max($numKeys) + 1 : 0;
219 219
         if ($value instanceof Node) {
220
-            if($value->type & Y::KEY) {
220
+            if ($value->type & Y::KEY) {
221 221
                 self::buildKey($node->value, $parent);
222 222
                 return;
223 223
             } elseif ($value->type & Y::ITEM) {
@@ -254,14 +254,14 @@  discard block
 block discarded – undo
254 254
         }
255 255
         $result = '';
256 256
         $separator = '';
257
-        if ($type & Y::LITT)         $separator = "\n";
258
-        if ($type & Y::LITT_FOLDED)  $separator = ' ';
257
+        if ($type&Y::LITT)         $separator = "\n";
258
+        if ($type&Y::LITT_FOLDED)  $separator = ' ';
259 259
         foreach ($list as $child) {
260 260
             if ($child->value instanceof NodeList) {
261 261
                 $result .= self::buildLitteral($child->value, $type).$separator;
262 262
             } else {
263 263
                 $val = $child->type & (Y::SCALAR|Y::BLANK) ? $child->value : substr($child->raw, $refIndent);
264
-                if ($type & Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) {
264
+                if ($type&Y::LITT_FOLDED && ($child->indent > $refIndent || ($child->type & Y::BLANK))) {
265 265
                     if ($result[-1] === $separator)
266 266
                         $result[-1] = "\n";
267 267
                     if ($result[-1] === "\n")
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
     private function buildSetKey(Node $node, &$parent)
286 286
     {
287 287
         $built = is_object($node->value) ? self::build($node->value) : null;
288
-        $stringKey = is_string($built) && Regex::isProperlyQuoted($built) ? trim($built, '\'" '): $built;
288
+        $stringKey = is_string($built) && Regex::isProperlyQuoted($built) ? trim($built, '\'" ') : $built;
289 289
         $key = json_encode($stringKey, JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
290 290
         // if (empty($key)) throw new \Exception("Cant serialize complex key: ".var_export($node->value, true), 1);
291 291
         $parent->{trim($key, '\'" ')} = null;
Please login to merge, or discard this patch.