@@ -16,7 +16,7 @@ |
||
| 16 | 16 | if (is_null($tagName)) { |
| 17 | 17 | throw new \Exception(self::class.": a tag MUST have a name", 1); |
| 18 | 18 | } |
| 19 | - $this->tagName = $tagName; |
|
| 19 | + $this->tagName = $tagName; |
|
| 20 | 20 | $this->value = $value; |
| 21 | 21 | } |
| 22 | 22 | |
@@ -32,10 +32,10 @@ |
||
| 32 | 32 | { |
| 33 | 33 | $d = "\\d{4}([-\\/])\\d{2}\\1\\d{2}"; |
| 34 | 34 | $h = "\\d{2}(:)\\d{2}\\2\\d{2}"; |
| 35 | - $date = "/^$d$/";// 2002-12-14, 2002/12/14 |
|
| 36 | - $canonical = "/^$d(?:t| )$h\\.\\dz?$/im";// 2001-12-15T02:59:43.1Z |
|
| 37 | - $spaced = "/^$d(?:t| )$h\\.\\d{2} [-+]\\d$/im";// 2001-12-14 21:59:43.10 -5 |
|
| 38 | - $iso8601 = "/^$d(?:t| )$h\\.\\d{2}[-+]\\d{2}\\2\\d{2}/im";// 2001-12-14t21:59:43.10-05:00 |
|
| 35 | + $date = "/^$d$/"; // 2002-12-14, 2002/12/14 |
|
| 36 | + $canonical = "/^$d(?:t| )$h\\.\\dz?$/im"; // 2001-12-15T02:59:43.1Z |
|
| 37 | + $spaced = "/^$d(?:t| )$h\\.\\d{2} [-+]\\d$/im"; // 2001-12-14 21:59:43.10 -5 |
|
| 38 | + $iso8601 = "/^$d(?:t| )$h\\.\\d{2}[-+]\\d{2}\\2\\d{2}/im"; // 2001-12-14t21:59:43.10-05:00 |
|
| 39 | 39 | $matchDate = preg_match($date, $v); |
| 40 | 40 | $matchCanonical = preg_match($canonical, $v); |
| 41 | 41 | $matchSpaced = preg_match($spaced, $v); |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | public function __construct() |
| 22 | 22 | { |
| 23 | - parent::__construct([], 1);//1 = Array indices can be accessed as properties in read/write. |
|
| 23 | + parent::__construct([], 1); //1 = Array indices can be accessed as properties in read/write. |
|
| 24 | 24 | $this->__yaml__object__api = new API(); |
| 25 | 25 | } |
| 26 | 26 | |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | public function __call($funcName, $arguments) |
| 29 | 29 | { |
| 30 | 30 | $reflectAPI = new \ReflectionClass(get_class($this->__yaml__object__api)); |
| 31 | - $getName = function ($o) { return $o->name; }; |
|
| 31 | + $getName = function($o) { return $o->name; }; |
|
| 32 | 32 | $publicApi = array_map($getName, $reflectAPI->getMethods(\ReflectionMethod::IS_PUBLIC)); |
| 33 | 33 | $privateApi = array_map($getName, $reflectAPI->getMethods(\ReflectionMethod::IS_PRIVATE)); |
| 34 | 34 | if (!in_array($funcName, $publicApi) && !in_array($funcName, $privateApi)) { |
@@ -1,5 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . '/vendor/autoload.php'; |
|
| 2 | +require_once __DIR__.'/vendor/autoload.php'; |
|
| 3 | 3 | |
| 4 | 4 | use \Dallgoot\Yaml as Y; |
| 5 | 5 | |
@@ -89,8 +89,8 @@ discard block |
||
| 89 | 89 | //modify type according to child |
| 90 | 90 | switch ($child->type) { |
| 91 | 91 | case Y\COMMENT: //fall through |
| 92 | - case Y\KEY: $this->value->type = Y\MAPPING;break; |
|
| 93 | - case Y\ITEM: $this->value->type = Y\SEQUENCE;break; |
|
| 92 | + case Y\KEY: $this->value->type = Y\MAPPING; break; |
|
| 93 | + case Y\ITEM: $this->value->type = Y\SEQUENCE; break; |
|
| 94 | 94 | // case Y\COMMENT: $this->value->type = Y\RAW;break; |
| 95 | 95 | } |
| 96 | 96 | } |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | */ |
| 116 | 116 | public function parse(string $nodeString):Node |
| 117 | 117 | { |
| 118 | - $nodeValue = preg_replace("/^\t+/m", " ", $nodeString);//permissive to tabs but replacement |
|
| 118 | + $nodeValue = preg_replace("/^\t+/m", " ", $nodeString); //permissive to tabs but replacement |
|
| 119 | 119 | $this->indent = strspn($nodeValue, ' '); |
| 120 | 120 | $nodeValue = ltrim($nodeValue); |
| 121 | 121 | if ($nodeValue === '') { |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | case '#': return [Y\COMMENT, ltrim($v)]; |
| 153 | 153 | case "-": return $this->onHyphen($nodeValue); |
| 154 | 154 | case '%': return [Y\DIRECTIVE, ltrim($v)]; |
| 155 | - case '?': return [Y\SET_KEY, empty($v) ? null : new Node(ltrim($v), $this->line)]; |
|
| 155 | + case '?': return [Y\SET_KEY, empty($v) ? null : new Node(ltrim($v), $this->line)]; |
|
| 156 | 156 | case ':': return [Y\SET_VALUE, empty($v) ? null : new Node(ltrim($v), $this->line)]; |
| 157 | 157 | case '>': return [Y\LITT_FOLDED, null]; |
| 158 | 158 | case '|': return [Y\LITT, null]; |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | if (!is_bool($hasComment)) { |
| 178 | 178 | $tmpNode = new Node(trim(substr($keyValue, 0, $hasComment)), $this->line); |
| 179 | 179 | if ($tmpNode->type !== Y\PARTIAL) { |
| 180 | - $comment = new Node(trim(substr($keyValue, $hasComment+1)), $this->line); |
|
| 180 | + $comment = new Node(trim(substr($keyValue, $hasComment + 1)), $this->line); |
|
| 181 | 181 | //TODO: modify "identifier" to specify if fullline comment or not |
| 182 | 182 | $this->add($comment); |
| 183 | 183 | $n = $tmpNode; |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | $type = ['!' => Y\TAG, '&' => Y\REF_DEF, '*' => Y\REF_CALL][$nodeValue[0]]; |
| 247 | 247 | $pos = strpos($v, ' '); |
| 248 | 248 | $this->identifier = is_bool($pos) ? $v : strstr($v, ' ', true); |
| 249 | - $n = is_bool($pos) ? null : (new Node(trim(substr($nodeValue, $pos+1)), $this->line))->setParent($this); |
|
| 249 | + $n = is_bool($pos) ? null : (new Node(trim(substr($nodeValue, $pos + 1)), $this->line))->setParent($this); |
|
| 250 | 250 | return [$type, $n]; |
| 251 | 251 | } |
| 252 | 252 | |
@@ -260,8 +260,8 @@ discard block |
||
| 260 | 260 | { |
| 261 | 261 | $v = $this->value; |
| 262 | 262 | if (is_null($v)) return null; |
| 263 | - if ($this->type & (Y\REF_CALL | Y\SCALAR)) return self::getScalar($v); |
|
| 264 | - if ($this->type & (Y\COMPACT_MAPPING | Y\COMPACT_SEQUENCE)) return self::getCompact(substr($v, 1, -1), $this->type); |
|
| 263 | + if ($this->type & (Y\REF_CALL|Y\SCALAR)) return self::getScalar($v); |
|
| 264 | + if ($this->type & (Y\COMPACT_MAPPING|Y\COMPACT_SEQUENCE)) return self::getCompact(substr($v, 1, -1), $this->type); |
|
| 265 | 265 | switch ($this->type) { |
| 266 | 266 | case Y\JSON: return json_decode($v, false, 512, JSON_PARTIAL_OUTPUT_ON_ERROR); |
| 267 | 267 | case Y\QUOTED: return substr($v, 1, -1); |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | { |
| 318 | 318 | $out = new Compact(); |
| 319 | 319 | if ($type === Y\COMPACT_SEQUENCE) { |
| 320 | - $f = function ($e) { return self::getScalar(trim($e));}; |
|
| 320 | + $f = function($e) { return self::getScalar(trim($e)); }; |
|
| 321 | 321 | //TODO : that's not robust enough, improve it |
| 322 | 322 | foreach (array_map($f, explode(",", $mappingOrSeqString)) as $key => $value) { |
| 323 | 323 | $out[$key] = $value; |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | 'COMPACT_SEQUENCE', |
| 18 | 18 | 'PARTIAL', |
| 19 | 19 | 'LITT', //litteral |
| 20 | - 'LITT_FOLDED',//litteral |
|
| 20 | + 'LITT_FOLDED', //litteral |
|
| 21 | 21 | 'SCALAR', |
| 22 | 22 | 'TAG', |
| 23 | 23 | 'JSON', |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | define(__NAMESPACE__."\\$name", 2**$power); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | -const LITTERALS = Y\LITT | Y\LITT_FOLDED; |
|
| 37 | +const LITTERALS = Y\LITT|Y\LITT_FOLDED; |
|
| 38 | 38 | // print_r(get_defined_constants(true)['user']); |
| 39 | 39 | |
| 40 | 40 | namespace Dallgoot; |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | public static function getName($typeInteger) |
| 54 | 54 | { |
| 55 | 55 | if (is_null(self::$TYPE_NAMES)) { |
| 56 | - $f = function ($v) { return str_replace('Dallgoot\Yaml\\', '', $v);}; |
|
| 56 | + $f = function($v) { return str_replace('Dallgoot\Yaml\\', '', $v); }; |
|
| 57 | 57 | self::$TYPE_NAMES = array_map($f, array_flip(get_defined_constants(true)['user'])); |
| 58 | 58 | } |
| 59 | 59 | return self::$TYPE_NAMES[$typeInteger]; |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | // |
| 22 | 22 | public function __construct() |
| 23 | 23 | { |
| 24 | - parent::__construct([], 1);//1 = Array indices can be accessed as properties in read/write. |
|
| 24 | + parent::__construct([], 1); //1 = Array indices can be accessed as properties in read/write. |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | public function jsonSerialize() |
@@ -15,6 +15,6 @@ |
||
| 15 | 15 | |
| 16 | 16 | public function __debugInfo():array |
| 17 | 17 | { |
| 18 | - return ['type' => Y::getName($this->type) , "dllist" => $this->dllist]; |
|
| 18 | + return ['type' => Y::getName($this->type), "dllist" => $this->dllist]; |
|
| 19 | 19 | } |
| 20 | 20 | } |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | if (is_null($dataType)) throw new \Exception(self::class.": No content to convert to Yaml", 1); |
| 40 | 40 | self::$options = is_int($options) ? $options : self::OPTIONS; |
| 41 | 41 | self::$result = new DLL; |
| 42 | - self::$result->setIteratorMode(DLL::IT_MODE_FIFO | DLL::IT_MODE_DELETE); |
|
| 42 | + self::$result->setIteratorMode(DLL::IT_MODE_FIFO|DLL::IT_MODE_DELETE); |
|
| 43 | 43 | if ($dataType instanceof YamlObject) { |
| 44 | 44 | self::dumpYamlObject($dataType); |
| 45 | 45 | } elseif (is_array($dataType) && $dataType[0] instanceof YamlObject) { |