Completed
Push — master ( 5b71e4...f50740 )
by stéphane
02:26
created
yaml/Yaml.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
     public static function getName($typeInteger)
55 55
     {
56 56
         if (is_null(self::$TYPE_NAMES)) {
57
-            $f = function ($v) { return str_replace('Dallgoot\Yaml\\', '', $v);};
57
+            $f = function($v) { return str_replace('Dallgoot\Yaml\\', '', $v); };
58 58
             self::$TYPE_NAMES = array_map($f, array_flip(get_defined_constants(true)['user']));
59 59
         }
60 60
         return self::$TYPE_NAMES[$typeInteger];
Please login to merge, or discard this patch.
yaml/Loader.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,17 +10,17 @@  discard block
 block discarded – undo
10 10
     //public
11 11
     public $errors = [];
12 12
 
13
-    public const EXCLUDE_DIRECTIVES = 1;//DONT include_directive
14
-    public const IGNORE_COMMENTS    = 2;//DONT include_comments
15
-    public const NO_PARSING_EXCEPTIONS = 4;//THROW Exception on parsing Errors
16
-    public const NO_OBJECT_FOR_DATE = 8;//DONT import date strings as dateTime Object
13
+    public const EXCLUDE_DIRECTIVES = 1; //DONT include_directive
14
+    public const IGNORE_COMMENTS    = 2; //DONT include_comments
15
+    public const NO_PARSING_EXCEPTIONS = 4; //THROW Exception on parsing Errors
16
+    public const NO_OBJECT_FOR_DATE = 8; //DONT import date strings as dateTime Object
17 17
     //privates
18 18
     /* @var null|string */
19 19
     private $content;
20 20
     /* @var null|string */
21 21
     private $filePath;
22 22
     /* @var int */
23
-    private $debug = 0;///TODO: determine levels
23
+    private $debug = 0; ///TODO: determine levels
24 24
     /* @var int */
25 25
     private $options = 0;
26 26
     //Exceptions messages
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
                     }
106 106
                     $emptyLines = [];
107 107
                     switch ($n->indent <=> $previous->indent) {
108
-                        case -1: $previous->getParent($n->indent)->add($n);break;
109
-                        case 0: $previous->getParent()->add($n);break;
108
+                        case -1: $previous->getParent($n->indent)->add($n); break;
109
+                        case 0: $previous->getParent()->add($n); break;
110 110
                         default:
111 111
                             if ($this->onDeepestType($n, $previous, $lineString)) continue 2;
112 112
                             $previous->add($n);
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
         // // if ($previous->type & Y\ITEM && $n->type & Y\KEY) {
170 170
         // //     $previous
171 171
         // // }
172
-        if ($deepest->type & (Y\BLANK | Y\SCALAR)) {//|| ($previous->type & (Y\ITEM | Y\SET_KEY))) {
172
+        if ($deepest->type & (Y\BLANK|Y\SCALAR)) {//|| ($previous->type & (Y\ITEM | Y\SET_KEY))) {
173 173
                 $previous = $deepest->getParent();
174 174
         //     // if ($n->type === Y\SCALAR && ($deepest->getParent()->type & Y\LITTERALS)) {
175 175
         //     //     // $deepest->type = Y\SCALAR;
Please login to merge, or discard this patch.
Braces   +15 added lines, -5 removed lines patch added patch discarded remove patch
@@ -78,9 +78,13 @@  discard block
 block discarded – undo
78 78
     public function parse($strContent = null)
79 79
     {
80 80
         $source = $this->content;
81
-        if (is_null($source)) $source = preg_split("/([^\n\r]+)/um", $strContent, 0, PREG_SPLIT_DELIM_CAPTURE);
81
+        if (is_null($source)) {
82
+            $source = preg_split("/([^\n\r]+)/um", $strContent, 0, PREG_SPLIT_DELIM_CAPTURE);
83
+        }
82 84
         //TODO : be more permissive on $strContent values
83
-        if (!is_array($source)) throw new \Exception(self::EXCEPTION_LINE_SPLIT);
85
+        if (!is_array($source)) {
86
+            throw new \Exception(self::EXCEPTION_LINE_SPLIT);
87
+        }
84 88
         $previous = $root = new Node();
85 89
         $emptyLines = [];
86 90
         $specialTypes = Y\LITTERALS|Y\BLANK;
@@ -108,7 +112,9 @@  discard block
 block discarded – undo
108 112
                         case -1: $previous->getParent($n->indent)->add($n);break;
109 113
                         case 0: $previous->getParent()->add($n);break;
110 114
                         default:
111
-                            if ($this->onDeepestType($n, $previous, $lineString)) continue 2;
115
+                            if ($this->onDeepestType($n, $previous, $lineString)) {
116
+                                continue 2;
117
+                            }
112 118
                             $previous->add($n);
113 119
                     }
114 120
                     $previous = $n;
@@ -147,8 +153,12 @@  discard block
 block discarded – undo
147 153
             }
148 154
         }
149 155
         if ($n->type & Y\BLANK) {
150
-            if ($previous->type & Y\SCALAR) $emptyLines[] = $n->setParent($previous->getParent());
151
-            if ($deepest->type & Y\LITTERALS) $emptyLines[] = $n->setParent($deepest);
156
+            if ($previous->type & Y\SCALAR) {
157
+                $emptyLines[] = $n->setParent($previous->getParent());
158
+            }
159
+            if ($deepest->type & Y\LITTERALS) {
160
+                $emptyLines[] = $n->setParent($deepest);
161
+            }
152 162
             return true;
153 163
         }
154 164
         return false;
Please login to merge, or discard this patch.
yaml/Dumper.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,9 @@  discard block
 block discarded – undo
21 21
 
22 22
     public function __construct(int $options = null)
23 23
     {
24
-        if (is_int($options)) self::$options = $options;
24
+        if (is_int($options)) {
25
+            self::$options = $options;
26
+        }
25 27
     }
26 28
 
27 29
     /**
@@ -36,7 +38,9 @@  discard block
 block discarded – undo
36 38
      */
37 39
     public static function toString($dataType, int $options = null):string
38 40
     {
39
-        if (is_null($dataType)) throw new \Exception(self::class.": No content to convert to Yaml", 1);
41
+        if (is_null($dataType)) {
42
+            throw new \Exception(self::class.": No content to convert to Yaml", 1);
43
+        }
40 44
         self::$options = is_int($options) ? $options : self::OPTIONS;
41 45
         self::$result = new DLL;
42 46
         self::$result->setIteratorMode(DLL::IT_MODE_FIFO|DLL::IT_MODE_DELETE);
@@ -74,8 +78,12 @@  discard block
 block discarded – undo
74 78
         if (is_scalar($dataType)) {
75 79
             switch (gettype($dataType)) {
76 80
                 case 'boolean': return $dataType ? 'true' : 'false';
77
-                case 'float': if (is_infinite((float) $dataType)) return $dataType > 0 ? '.inf' : '-.inf';
78
-                case 'double': if (is_nan((float) $dataType)) return '.nan';
81
+                case 'float': if (is_infinite((float) $dataType)) {
82
+                    return $dataType > 0 ? '.inf' : '-.inf';
83
+                }
84
+                case 'double': if (is_nan((float) $dataType)) {
85
+                    return '.nan';
86
+                }
79 87
                 default:
80 88
                     return $dataType;
81 89
             }
Please login to merge, or discard this patch.
yaml/Builder.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -175,8 +175,8 @@  discard block
 block discarded – undo
175 175
             throw new \ParseError(sprintf(self::INVALID_DOCUMENT, $key));
176 176
         } else {
177 177
             switch (true) {
178
-                case $isSequence: $list->type = Y\SEQUENCE;break;
179
-                case $isSet:      $list->type = Y\SET;break;
178
+                case $isSequence: $list->type = Y\SEQUENCE; break;
179
+                case $isSet:      $list->type = Y\SET; break;
180 180
                 default:          $list->type = Y\MAPPING;
181 181
             }
182 182
         }
@@ -198,10 +198,10 @@  discard block
 block discarded – undo
198 198
         $children->rewind();
199 199
         $refIndent = $children->current()->indent;
200 200
         $separator = $type === Y\RAW ? '' : "\n";
201
-        $action = function ($c) { return $c->value; };
202
-        if ($type & Y\LITT_FOLDED) {
201
+        $action = function($c) { return $c->value; };
202
+        if ($type&Y\LITT_FOLDED) {
203 203
             $separator = ' ';
204
-            $action = function ($c) use ($refIndent) {
204
+            $action = function($c) use ($refIndent) {
205 205
                 return $c->indent > $refIndent || ($c->type & Y\BLANK) ? "\n".$c->value : $c->value;
206 206
             };
207 207
         }
Please login to merge, or discard this patch.
Braces   +20 added lines, -8 removed lines patch added patch discarded remove patch
@@ -18,7 +18,9 @@  discard block
 block discarded – undo
18 18
 
19 19
     private static function build(object $node, &$parent = null)
20 20
     {
21
-        if ($node instanceof NodeList) return self::buildNodeList($node, $parent);
21
+        if ($node instanceof NodeList) {
22
+            return self::buildNodeList($node, $parent);
23
+        }
22 24
         return self::buildNode($node, $parent);
23 25
     }
24 26
 
@@ -60,12 +62,15 @@  discard block
 block discarded – undo
60 62
             case Y\REF_DEF: //fall through
61 63
             case Y\REF_CALL://TODO: self::build returns what ?
62 64
                 $tmp = is_object($value) ? self::build($value, $parent) : $node->getPhpValue();
63
-                if ($type === Y\REF_DEF) self::$_root->addReference($identifier, $tmp);
65
+                if ($type === Y\REF_DEF) {
66
+                    self::$_root->addReference($identifier, $tmp);
67
+                }
64 68
                 return self::$_root->getReference($identifier);
65 69
             case Y\SET_KEY:
66 70
                 $key = json_encode(self::build($value, $parent), JSON_PARTIAL_OUTPUT_ON_ERROR|JSON_UNESCAPED_SLASHES);
67
-                if (empty($key))
68
-                    throw new \Exception("Cant serialize complex key: ".var_export($value, true), 1);
71
+                if (empty($key)) {
72
+                                    throw new \Exception("Cant serialize complex key: ".var_export($value, true), 1);
73
+                }
69 74
                 $parent->{$key} = null;
70 75
                 return;
71 76
             case Y\SET_VALUE:
@@ -84,8 +89,11 @@  discard block
 block discarded – undo
84 89
                     $parent->addTag($identifier); return;
85 90
                 } else {//TODO: have somewhere a list of common tags and their treatment
86 91
                     if (in_array($identifier, ['!binary', '!str'])) {
87
-                        if ($value->value instanceof NodeList) $value->value->type = Y\RAW;
88
-                        else $value->type = Y\RAW;
92
+                        if ($value->value instanceof NodeList) {
93
+                            $value->value->type = Y\RAW;
94
+                        } else {
95
+                            $value->type = Y\RAW;
96
+                        }
89 97
                     }
90 98
                     $val = is_null($value) ? null : self::build($value, $node);
91 99
                     return new Tag($identifier, $val);
@@ -153,10 +161,14 @@  discard block
 block discarded – undo
153 161
         }
154 162
         $_root->value->setIteratorMode(NodeList::IT_MODE_DELETE);
155 163
         foreach ($_root->value as $child) {
156
-            if ($child->type & Y\DOC_START) $totalDocStart++;
164
+            if ($child->type & Y\DOC_START) {
165
+                $totalDocStart++;
166
+            }
157 167
             //if 0 or 1 DOC_START = we are still in first document
158 168
             $currentDoc = $totalDocStart > 1 ? $totalDocStart - 1 : 0;
159
-            if (!isset($documents[$currentDoc])) $documents[$currentDoc] = new NodeList();
169
+            if (!isset($documents[$currentDoc])) {
170
+                $documents[$currentDoc] = new NodeList();
171
+            }
160 172
             $documents[$currentDoc]->push($child);
161 173
         }
162 174
         // $_debug >= 2 && var_dump($documents);//var_dump($documents);die("documents");
Please login to merge, or discard this patch.