@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | if ($isArray) { |
248 | 248 | $actualKey -= $removedOffset; |
249 | 249 | } |
250 | - $this->path .= '/' . JsonPointer::escapeSegment($actualKey, $this->options & self::JSON_URI_FRAGMENT_ID); |
|
250 | + $this->path .= '/'.JsonPointer::escapeSegment($actualKey, $this->options & self::JSON_URI_FRAGMENT_ID); |
|
251 | 251 | $this->pathItems[] = $actualKey; |
252 | 252 | |
253 | 253 | if (array_key_exists($key, $newArray)) { |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | return null; |
279 | 279 | } |
280 | 280 | $newOrdered[$key] = $value; |
281 | - $path = $this->path . '/' . JsonPointer::escapeSegment($key, $this->options & self::JSON_URI_FRAGMENT_ID); |
|
281 | + $path = $this->path.'/'.JsonPointer::escapeSegment($key, $this->options & self::JSON_URI_FRAGMENT_ID); |
|
282 | 282 | $pathItems = $this->pathItems; |
283 | 283 | $pathItems[] = $key; |
284 | 284 | JsonPointer::add($this->added, $pathItems, $value); |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | |
289 | 289 | } |
290 | 290 | |
291 | - return is_array($new) ? $newOrdered : (object)$newOrdered; |
|
291 | + return is_array($new) ? $newOrdered : (object) $newOrdered; |
|
292 | 292 | } |
293 | 293 | |
294 | 294 | private function rearrangeArray(array $original, array $new) |
@@ -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 | } |
@@ -87,7 +87,9 @@ |
||
87 | 87 | throw new Exception('Non-existent path item: ' . $key); |
88 | 88 | } |
89 | 89 | } else { |
90 | - if ($recursively && $ref === null) $ref = array(); |
|
90 | + if ($recursively && $ref === null) { |
|
91 | + $ref = array(); |
|
92 | + } |
|
91 | 93 | if ('-' === $key) { |
92 | 94 | $ref = &$ref[]; |
93 | 95 | } else { |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | { |
29 | 29 | $result = $isURIFragmentId ? '#' : ''; |
30 | 30 | foreach ($pathItems as $pathItem) { |
31 | - $result .= '/' . self::escapeSegment($pathItem, $isURIFragmentId); |
|
31 | + $result .= '/'.self::escapeSegment($pathItem, $isURIFragmentId); |
|
32 | 32 | } |
33 | 33 | return $result; |
34 | 34 | } |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | return self::splitPathURIFragment($pathItems); |
47 | 47 | } else { |
48 | 48 | if ($first !== '') { |
49 | - throw new Exception('Path must start with "/": ' . $path); |
|
49 | + throw new Exception('Path must start with "/": '.$path); |
|
50 | 50 | } |
51 | 51 | return self::splitPathJsonString($pathItems); |
52 | 52 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | $ref = &$ref->$key; |
94 | 94 | } else { |
95 | 95 | if (!isset($ref->$key) && count($pathItems)) { |
96 | - throw new Exception('Non-existent path item: ' . $key); |
|
96 | + throw new Exception('Non-existent path item: '.$key); |
|
97 | 97 | } else { |
98 | 98 | $ref = &$ref->$key; |
99 | 99 | } |
@@ -101,12 +101,12 @@ discard block |
||
101 | 101 | } else { // null or array |
102 | 102 | $intKey = filter_var($key, FILTER_VALIDATE_INT); |
103 | 103 | if ($ref === null && (false === $intKey || $intKey !== 0)) { |
104 | - $key = (string)$key; |
|
104 | + $key = (string) $key; |
|
105 | 105 | if ($recursively) { |
106 | 106 | $ref = new \stdClass(); |
107 | 107 | $ref = &$ref->{$key}; |
108 | 108 | } else { |
109 | - throw new Exception('Non-existent path item: ' . $key); |
|
109 | + throw new Exception('Non-existent path item: '.$key); |
|
110 | 110 | } |
111 | 111 | } else { |
112 | 112 | if ($recursively && $ref === null) $ref = array(); |
@@ -138,9 +138,9 @@ discard block |
||
138 | 138 | if (array_key_exists($key, $a)) { |
139 | 139 | return true; |
140 | 140 | } |
141 | - $key = (string)$key; |
|
141 | + $key = (string) $key; |
|
142 | 142 | foreach ($a as $k => $v) { |
143 | - if ((string)$k === $key) { |
|
143 | + if ((string) $k === $key) { |
|
144 | 144 | return true; |
145 | 145 | } |
146 | 146 | } |
@@ -149,9 +149,9 @@ discard block |
||
149 | 149 | |
150 | 150 | private static function arrayGet($key, array $a) |
151 | 151 | { |
152 | - $key = (string)$key; |
|
152 | + $key = (string) $key; |
|
153 | 153 | foreach ($a as $k => $v) { |
154 | - if ((string)$k === $key) { |
|
154 | + if ((string) $k === $key) { |
|
155 | 155 | return $v; |
156 | 156 | } |
157 | 157 | } |
@@ -175,20 +175,20 @@ discard block |
||
175 | 175 | Exception::EMPTY_PROPERTY_NAME_UNSUPPORTED); |
176 | 176 | } |
177 | 177 | |
178 | - $vars = (array)$ref; |
|
178 | + $vars = (array) $ref; |
|
179 | 179 | if (self::arrayKeyExists($key, $vars)) { |
180 | 180 | $ref = self::arrayGet($key, $vars); |
181 | 181 | } else { |
182 | - throw new Exception('Key not found: ' . $key); |
|
182 | + throw new Exception('Key not found: '.$key); |
|
183 | 183 | } |
184 | 184 | } elseif (is_array($ref)) { |
185 | 185 | if (self::arrayKeyExists($key, $ref)) { |
186 | 186 | $ref = $ref[$key]; |
187 | 187 | } else { |
188 | - throw new Exception('Key not found: ' . $key); |
|
188 | + throw new Exception('Key not found: '.$key); |
|
189 | 189 | } |
190 | 190 | } else { |
191 | - throw new Exception('Key not found: ' . $key); |
|
191 | + throw new Exception('Key not found: '.$key); |
|
192 | 192 | } |
193 | 193 | } |
194 | 194 | return $ref; |
@@ -221,13 +221,13 @@ discard block |
||
221 | 221 | if (property_exists($ref, $key)) { |
222 | 222 | $ref = &$ref->$key; |
223 | 223 | } else { |
224 | - throw new Exception('Key not found: ' . $key); |
|
224 | + throw new Exception('Key not found: '.$key); |
|
225 | 225 | } |
226 | 226 | } else { |
227 | 227 | if (array_key_exists($key, $ref)) { |
228 | 228 | $ref = &$ref[$key]; |
229 | 229 | } else { |
230 | - throw new Exception('Key not found: ' . $key); |
|
230 | + throw new Exception('Key not found: '.$key); |
|
231 | 231 | } |
232 | 232 | } |
233 | 233 | } |