@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $path = $this->path; |
46 | 46 | $pathItems = $this->pathItems; |
47 | 47 | $actualKey = $key; |
48 | - $this->path .= '/' . JsonPointer::escapeSegment($actualKey); |
|
48 | + $this->path .= '/'.JsonPointer::escapeSegment($actualKey); |
|
49 | 49 | $this->pathItems[] = $actualKey; |
50 | 50 | |
51 | 51 | $result[$key] = $this->process($originalValue); |
@@ -54,6 +54,6 @@ discard block |
||
54 | 54 | $this->pathItems = $pathItems; |
55 | 55 | } |
56 | 56 | |
57 | - return $data instanceof \stdClass ? (object)$result : $result; |
|
57 | + return $data instanceof \stdClass ? (object) $result : $result; |
|
58 | 58 | } |
59 | 59 | } |
60 | 60 | \ No newline at end of file |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | foreach ($data as $operation) { |
34 | 34 | /** @var OpPath|OpPathValue|OpPathFrom $operation */ |
35 | 35 | if (is_array($operation)) { |
36 | - $operation = (object)$operation; |
|
36 | + $operation = (object) $operation; |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | if (!isset($operation->op)) { |
@@ -64,11 +64,11 @@ discard block |
||
64 | 64 | $op = new Test(); |
65 | 65 | break; |
66 | 66 | default: |
67 | - throw new Exception('Unknown "op": ' . $operation->op); |
|
67 | + throw new Exception('Unknown "op": '.$operation->op); |
|
68 | 68 | } |
69 | 69 | $op->path = $operation->path; |
70 | 70 | if ($op instanceof OpPathValue) { |
71 | - if (!array_key_exists('value', (array)$operation)) { |
|
71 | + if (!array_key_exists('value', (array) $operation)) { |
|
72 | 72 | throw new Exception('Missing "value" in operation data'); |
73 | 73 | } |
74 | 74 | $op->value = $operation->value; |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | { |
88 | 88 | $result = array(); |
89 | 89 | foreach ($patch->operations as $operation) { |
90 | - $result[] = (object)(array)$operation; |
|
90 | + $result[] = (object) (array) $operation; |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | return $result; |
@@ -144,8 +144,8 @@ discard block |
||
144 | 144 | $diff = new JsonDiff($operation->value, $value, |
145 | 145 | JsonDiff::STOP_ON_DIFF); |
146 | 146 | if ($diff->getDiffCnt() !== 0) { |
147 | - throw new Exception('Test operation ' . json_encode($operation, JSON_UNESCAPED_SLASHES) |
|
148 | - . ' failed: ' . json_encode($value)); |
|
147 | + throw new Exception('Test operation '.json_encode($operation, JSON_UNESCAPED_SLASHES) |
|
148 | + . ' failed: '.json_encode($value)); |
|
149 | 149 | } |
150 | 150 | break; |
151 | 151 | } |
@@ -122,7 +122,9 @@ |
||
122 | 122 | $ref = new \stdClass(); |
123 | 123 | $ref = &$ref->{$key}; |
124 | 124 | } else { |
125 | - if ($flags & self::RECURSIVE_KEY_CREATION && $ref === null) $ref = array(); |
|
125 | + if ($flags & self::RECURSIVE_KEY_CREATION && $ref === null) { |
|
126 | + $ref = array(); |
|
127 | + } |
|
126 | 128 | if ('-' === $key) { |
127 | 129 | $ref = &$ref[]; |
128 | 130 | } else { |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | { |
49 | 49 | $result = $isURIFragmentId ? '#' : ''; |
50 | 50 | foreach ($pathItems as $pathItem) { |
51 | - $result .= '/' . self::escapeSegment($pathItem, $isURIFragmentId); |
|
51 | + $result .= '/'.self::escapeSegment($pathItem, $isURIFragmentId); |
|
52 | 52 | } |
53 | 53 | return $result; |
54 | 54 | } |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | return self::splitPathURIFragment($pathItems); |
67 | 67 | } else { |
68 | 68 | if ($first !== '') { |
69 | - throw new Exception('Path must start with "/": ' . $path); |
|
69 | + throw new Exception('Path must start with "/": '.$path); |
|
70 | 70 | } |
71 | 71 | return self::splitPathJsonString($pathItems); |
72 | 72 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | $ref = &$ref->$key; |
114 | 114 | } else { |
115 | 115 | if (!isset($ref->$key) && count($pathItems)) { |
116 | - throw new Exception('Non-existent path item: ' . $key); |
|
116 | + throw new Exception('Non-existent path item: '.$key); |
|
117 | 117 | } else { |
118 | 118 | $ref = &$ref->$key; |
119 | 119 | } |
@@ -121,12 +121,12 @@ discard block |
||
121 | 121 | } else { // null or array |
122 | 122 | $intKey = filter_var($key, FILTER_VALIDATE_INT); |
123 | 123 | if ($ref === null && (false === $intKey || $intKey !== 0)) { |
124 | - $key = (string)$key; |
|
124 | + $key = (string) $key; |
|
125 | 125 | if ($flags & self::RECURSIVE_KEY_CREATION) { |
126 | 126 | $ref = new \stdClass(); |
127 | 127 | $ref = &$ref->{$key}; |
128 | 128 | } else { |
129 | - throw new Exception('Non-existent path item: ' . $key); |
|
129 | + throw new Exception('Non-existent path item: '.$key); |
|
130 | 130 | } |
131 | 131 | } elseif ([] === $ref && 0 === ($flags & self::STRICT_MODE) && false === $intKey && '-' !== $key) { |
132 | 132 | $ref = new \stdClass(); |
@@ -170,9 +170,9 @@ discard block |
||
170 | 170 | if (array_key_exists($key, $a)) { |
171 | 171 | return true; |
172 | 172 | } |
173 | - $key = (string)$key; |
|
173 | + $key = (string) $key; |
|
174 | 174 | foreach ($a as $k => $v) { |
175 | - if ((string)$k === $key) { |
|
175 | + if ((string) $k === $key) { |
|
176 | 176 | return true; |
177 | 177 | } |
178 | 178 | } |
@@ -181,9 +181,9 @@ discard block |
||
181 | 181 | |
182 | 182 | private static function arrayGet($key, array $a) |
183 | 183 | { |
184 | - $key = (string)$key; |
|
184 | + $key = (string) $key; |
|
185 | 185 | foreach ($a as $k => $v) { |
186 | - if ((string)$k === $key) { |
|
186 | + if ((string) $k === $key) { |
|
187 | 187 | return $v; |
188 | 188 | } |
189 | 189 | } |
@@ -207,26 +207,26 @@ discard block |
||
207 | 207 | Exception::EMPTY_PROPERTY_NAME_UNSUPPORTED); |
208 | 208 | } |
209 | 209 | |
210 | - $vars = (array)$ref; |
|
210 | + $vars = (array) $ref; |
|
211 | 211 | if (self::arrayKeyExists($key, $vars)) { |
212 | 212 | $ref = self::arrayGet($key, $vars); |
213 | 213 | } else { |
214 | - throw new Exception('Key not found: ' . $key); |
|
214 | + throw new Exception('Key not found: '.$key); |
|
215 | 215 | } |
216 | 216 | } elseif (is_array($ref)) { |
217 | 217 | if (self::arrayKeyExists($key, $ref)) { |
218 | 218 | $ref = $ref[$key]; |
219 | 219 | } else { |
220 | - throw new Exception('Key not found: ' . $key); |
|
220 | + throw new Exception('Key not found: '.$key); |
|
221 | 221 | } |
222 | 222 | } elseif (is_object($ref)) { |
223 | 223 | if (isset($ref->$key)) { |
224 | 224 | $ref = $ref->$key; |
225 | 225 | } else { |
226 | - throw new Exception('Key not found: ' . $key); |
|
226 | + throw new Exception('Key not found: '.$key); |
|
227 | 227 | } |
228 | 228 | } else { |
229 | - throw new Exception('Key not found: ' . $key); |
|
229 | + throw new Exception('Key not found: '.$key); |
|
230 | 230 | } |
231 | 231 | } |
232 | 232 | return $ref; |
@@ -260,19 +260,19 @@ discard block |
||
260 | 260 | if (property_exists($ref, $key)) { |
261 | 261 | $ref = &$ref->$key; |
262 | 262 | } else { |
263 | - throw new Exception('Key not found: ' . $key); |
|
263 | + throw new Exception('Key not found: '.$key); |
|
264 | 264 | } |
265 | 265 | } elseif (is_object($ref)) { |
266 | 266 | if (isset($ref->$key)) { |
267 | 267 | $ref = &$ref->$key; |
268 | 268 | } else { |
269 | - throw new Exception('Key not found: ' . $key); |
|
269 | + throw new Exception('Key not found: '.$key); |
|
270 | 270 | } |
271 | 271 | } else { |
272 | 272 | if (array_key_exists($key, $ref)) { |
273 | 273 | $ref = &$ref[$key]; |
274 | 274 | } else { |
275 | - throw new Exception('Key not found: ' . $key); |
|
275 | + throw new Exception('Key not found: '.$key); |
|
276 | 276 | } |
277 | 277 | } |
278 | 278 | } |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | } |
295 | 295 | |
296 | 296 | unset($parent[$refKey]); |
297 | - if (!$isAssociative && (int)$refKey !== count($parent)) { |
|
297 | + if (!$isAssociative && (int) $refKey !== count($parent)) { |
|
298 | 298 | $parent = array_values($parent); |
299 | 299 | } |
300 | 300 | } |
@@ -262,11 +262,11 @@ discard block |
||
262 | 262 | |
263 | 263 | if ($this->options & self::TOLERATE_ASSOCIATIVE_ARRAYS) { |
264 | 264 | if (is_array($original) && !empty($original) && !array_key_exists(0, $original)) { |
265 | - $original = (object)$original; |
|
265 | + $original = (object) $original; |
|
266 | 266 | } |
267 | 267 | |
268 | 268 | if (is_array($new) && !empty($new) && !array_key_exists(0, $new)) { |
269 | - $new = (object)$new; |
|
269 | + $new = (object) $new; |
|
270 | 270 | } |
271 | 271 | } |
272 | 272 | |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | JsonPointer::add($this->merge, $this->pathItems, $new); |
323 | 323 | } |
324 | 324 | |
325 | - $isUriFragment = (bool)($this->options & self::JSON_URI_FRAGMENT_ID); |
|
325 | + $isUriFragment = (bool) ($this->options & self::JSON_URI_FRAGMENT_ID); |
|
326 | 326 | foreach ($originalKeys as $key => $originalValue) { |
327 | 327 | if ($this->options & self::STOP_ON_DIFF) { |
328 | 328 | if ($this->modifiedCnt || $this->addedCnt || $this->removedCnt) { |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | if ($isArray && is_int($actualKey)) { |
337 | 337 | $actualKey -= $removedOffset; |
338 | 338 | } |
339 | - $this->path .= '/' . JsonPointer::escapeSegment((string)$actualKey, $isUriFragment); |
|
339 | + $this->path .= '/'.JsonPointer::escapeSegment((string) $actualKey, $isUriFragment); |
|
340 | 340 | $this->pathItems[] = $actualKey; |
341 | 341 | |
342 | 342 | if (array_key_exists($key, $newArray)) { |
@@ -373,7 +373,7 @@ discard block |
||
373 | 373 | return null; |
374 | 374 | } |
375 | 375 | $newOrdered[$key] = $value; |
376 | - $path = $this->path . '/' . JsonPointer::escapeSegment($key, $isUriFragment); |
|
376 | + $path = $this->path.'/'.JsonPointer::escapeSegment($key, $isUriFragment); |
|
377 | 377 | $pathItems = $this->pathItems; |
378 | 378 | $pathItems[] = $key; |
379 | 379 | JsonPointer::add($this->added, $pathItems, $value); |
@@ -389,7 +389,7 @@ discard block |
||
389 | 389 | |
390 | 390 | } |
391 | 391 | |
392 | - return is_array($new) ? $newOrdered : (object)$newOrdered; |
|
392 | + return is_array($new) ? $newOrdered : (object) $newOrdered; |
|
393 | 393 | } |
394 | 394 | |
395 | 395 | private function rearrangeArray(array $original, array $new) |