@@ -54,13 +54,13 @@ |
||
54 | 54 | { |
55 | 55 | $originalJson = file_get_contents($this->originalPath); |
56 | 56 | if (!$originalJson) { |
57 | - $this->response->error('Unable to read ' . $this->originalPath); |
|
57 | + $this->response->error('Unable to read '.$this->originalPath); |
|
58 | 58 | return; |
59 | 59 | } |
60 | 60 | |
61 | 61 | $newJson = file_get_contents($this->newPath); |
62 | 62 | if (!$newJson) { |
63 | - $this->response->error('Unable to read ' . $this->newPath); |
|
63 | + $this->response->error('Unable to read '.$this->newPath); |
|
64 | 64 | return; |
65 | 65 | } |
66 | 66 |
@@ -44,13 +44,13 @@ discard block |
||
44 | 44 | if (property_exists($ref, $key)) { |
45 | 45 | $ref = &$ref->$key; |
46 | 46 | } else { |
47 | - throw new Exception('Key not found: ' . $key); |
|
47 | + throw new Exception('Key not found: '.$key); |
|
48 | 48 | } |
49 | 49 | } else { |
50 | 50 | if (array_key_exists($key, $ref)) { |
51 | 51 | $ref = &$ref[$key]; |
52 | 52 | } else { |
53 | - throw new Exception('Key not found: ' . $key); |
|
53 | + throw new Exception('Key not found: '.$key); |
|
54 | 54 | } |
55 | 55 | } |
56 | 56 | } |
@@ -72,13 +72,13 @@ discard block |
||
72 | 72 | if (property_exists($ref, $key)) { |
73 | 73 | $ref = &$ref->$key; |
74 | 74 | } else { |
75 | - throw new Exception('Key not found: ' . $key); |
|
75 | + throw new Exception('Key not found: '.$key); |
|
76 | 76 | } |
77 | 77 | } else { |
78 | 78 | if (array_key_exists($key, $ref)) { |
79 | 79 | $ref = &$ref[$key]; |
80 | 80 | } else { |
81 | - throw new Exception('Key not found: ' . $key); |
|
81 | + throw new Exception('Key not found: '.$key); |
|
82 | 82 | } |
83 | 83 | } |
84 | 84 | } |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | |
176 | 176 | foreach ($originalKeys as $key => $originalValue) { |
177 | 177 | $path = $this->path; |
178 | - $this->path .= '/' . urlencode($key); |
|
178 | + $this->path .= '/'.urlencode($key); |
|
179 | 179 | |
180 | 180 | if (isset($newArray[$key])) { |
181 | 181 | $newOrdered[$key] = $this->process($originalValue, $newArray[$key]); |
@@ -191,13 +191,13 @@ discard block |
||
191 | 191 | // additions |
192 | 192 | foreach ($newArray as $key => $value) { |
193 | 193 | $newOrdered[$key] = $value; |
194 | - $path = $this->path . '/' . urlencode($key); |
|
194 | + $path = $this->path.'/'.urlencode($key); |
|
195 | 195 | JsonProcessor::pushByPath($this->added, $path, $value); |
196 | 196 | $this->addedCnt++; |
197 | 197 | $this->addedPaths [] = $path; |
198 | 198 | } |
199 | 199 | |
200 | - return is_array($new) ? $newOrdered : (object)$newOrdered; |
|
200 | + return is_array($new) ? $newOrdered : (object) $newOrdered; |
|
201 | 201 | } |
202 | 202 | |
203 | 203 | private function rearrangeArray(array $original, array $new) |