@@ -23,8 +23,9 @@ discard block |
||
23 | 23 | */ |
24 | 24 | public static function serialize($data, $compact = true) |
25 | 25 | { |
26 | - if ($compact) |
|
27 | - $data = self::compact($data); |
|
26 | + if ($compact) { |
|
27 | + $data = self::compact($data); |
|
28 | + } |
|
28 | 29 | |
29 | 30 | $data = serialize($data); |
30 | 31 | $data = self::compress($data); |
@@ -39,19 +40,22 @@ discard block |
||
39 | 40 | */ |
40 | 41 | public static function unserialize($data) |
41 | 42 | { |
42 | - if (is_resource($data)) |
|
43 | - // For some databases (like Postgres) binary columns return as a resource, fetch the content first |
|
43 | + if (is_resource($data)) { |
|
44 | + // For some databases (like Postgres) binary columns return as a resource, fetch the content first |
|
44 | 45 | $data = stream_get_contents($data, -1, 0); |
46 | + } |
|
45 | 47 | |
46 | 48 | $originalData = $data; |
47 | 49 | $data = self::uncompress($data); |
48 | 50 | |
49 | - if ($data === false) |
|
50 | - $data = $originalData; |
|
51 | + if ($data === false) { |
|
52 | + $data = $originalData; |
|
53 | + } |
|
51 | 54 | |
52 | 55 | $data = @unserialize($data); |
53 | - if ($data === false) |
|
54 | - $data = $originalData; |
|
56 | + if ($data === false) { |
|
57 | + $data = $originalData; |
|
58 | + } |
|
55 | 59 | |
56 | 60 | return $data; |
57 | 61 | } |
@@ -63,8 +67,9 @@ discard block |
||
63 | 67 | */ |
64 | 68 | public static function compress($data) |
65 | 69 | { |
66 | - if (Audit::getInstance()->compressData) |
|
67 | - $data = gzcompress($data); |
|
70 | + if (Audit::getInstance()->compressData) { |
|
71 | + $data = gzcompress($data); |
|
72 | + } |
|
68 | 73 | return $data; |
69 | 74 | } |
70 | 75 | |
@@ -90,15 +95,17 @@ discard block |
||
90 | 95 | public static function compact($data, $simplify = false, $threshold = 512) |
91 | 96 | { |
92 | 97 | $data = ArrayHelper::toArray($data); |
93 | - if ($simplify) |
|
94 | - array_walk($data, function (&$value) { |
|
98 | + if ($simplify) { |
|
99 | + array_walk($data, function (&$value) { |
|
95 | 100 | if (is_array($value) && count($value) == 1) $value = reset($value); |
101 | + } |
|
96 | 102 | }); |
97 | 103 | |
98 | 104 | $tooBig = []; |
99 | - foreach ($data as $index => $value) |
|
100 | - if (strlen(serialize($value)) > $threshold) |
|
105 | + foreach ($data as $index => $value) { |
|
106 | + if (strlen(serialize($value)) > $threshold) |
|
101 | 107 | $tooBig[] = $index; |
108 | + } |
|
102 | 109 | |
103 | 110 | if (count($tooBig)) { |
104 | 111 | $data = array_diff_key($data, array_flip($tooBig)); |
@@ -117,8 +124,9 @@ discard block |
||
117 | 124 | { |
118 | 125 | $trace = debug_backtrace(); |
119 | 126 | array_pop($trace); // remove the last trace since it would be the entry script, not very useful |
120 | - if ($skip > 0) |
|
121 | - $trace = array_slice($trace, $skip); |
|
127 | + if ($skip > 0) { |
|
128 | + $trace = array_slice($trace, $skip); |
|
129 | + } |
|
122 | 130 | return self::cleanupTrace($trace); |
123 | 131 | } |
124 | 132 | |
@@ -130,8 +138,9 @@ discard block |
||
130 | 138 | */ |
131 | 139 | public static function cleanupTrace($trace) |
132 | 140 | { |
133 | - if (!is_array($trace)) |
|
134 | - return []; |
|
141 | + if (!is_array($trace)) { |
|
142 | + return []; |
|
143 | + } |
|
135 | 144 | |
136 | 145 | foreach ($trace as $n => $call) { |
137 | 146 | $call['file'] = isset($call['file']) ? $call['file'] : 'unknown'; |
@@ -140,14 +149,18 @@ discard block |
||
140 | 149 | $call['file'] = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $call['file']); |
141 | 150 | |
142 | 151 | // XDebug |
143 | - if (isset($call['params'])) unset($call['params']); |
|
152 | + if (isset($call['params'])) { |
|
153 | + unset($call['params']); |
|
154 | + } |
|
144 | 155 | |
145 | 156 | // Trace entry contains the class instance, also compact and include this |
146 | - if (isset($call['object'])) |
|
147 | - $call['object'] = current(self::cleanupTraceArguments([$call['object']])); |
|
157 | + if (isset($call['object'])) { |
|
158 | + $call['object'] = current(self::cleanupTraceArguments([$call['object']])); |
|
159 | + } |
|
148 | 160 | |
149 | - if (isset($call['args'])) |
|
150 | - $call['args'] = self::cleanupTraceArguments($call['args']); |
|
161 | + if (isset($call['args'])) { |
|
162 | + $call['args'] = self::cleanupTraceArguments($call['args']); |
|
163 | + } |
|
151 | 164 | |
152 | 165 | $trace[$n] = $call; |
153 | 166 | } |
@@ -176,10 +189,11 @@ discard block |
||
176 | 189 | $args[$name] = $object; |
177 | 190 | } |
178 | 191 | } else if (is_array($value)) { |
179 | - if ($recurseDepth > 0) |
|
180 | - $args[$name] = self::cleanupTraceArguments($value, $recurseDepth - 1); |
|
181 | - else |
|
182 | - $args[$name] = 'Array'; |
|
192 | + if ($recurseDepth > 0) { |
|
193 | + $args[$name] = self::cleanupTraceArguments($value, $recurseDepth - 1); |
|
194 | + } else { |
|
195 | + $args[$name] = 'Array'; |
|
196 | + } |
|
183 | 197 | } |
184 | 198 | } |
185 | 199 | return $args; |
@@ -212,8 +226,9 @@ discard block |
||
212 | 226 | public static function formatAsQuery($data) |
213 | 227 | { |
214 | 228 | $data = rawurldecode($data); |
215 | - if (!preg_match('/^([\w\d\-\[\]]+(=[^&]*)?(&[\w\d\-\[\]]+(=[^&]*)?)*)?$/', $data)) |
|
216 | - return null; |
|
229 | + if (!preg_match('/^([\w\d\-\[\]]+(=[^&]*)?(&[\w\d\-\[\]]+(=[^&]*)?)*)?$/', $data)) { |
|
230 | + return null; |
|
231 | + } |
|
217 | 232 | |
218 | 233 | $result = []; |
219 | 234 | parse_str($data, $result); |
@@ -241,8 +256,9 @@ discard block |
||
241 | 256 | $doc = new \DOMDocument('1.0'); |
242 | 257 | $doc->preserveWhiteSpace = false; |
243 | 258 | $doc->formatOutput = true; |
244 | - if (@$doc->loadXML($data)) |
|
245 | - return htmlentities($doc->saveXML(), ENT_COMPAT, 'UTF-8'); |
|
259 | + if (@$doc->loadXML($data)) { |
|
260 | + return htmlentities($doc->saveXML(), ENT_COMPAT, 'UTF-8'); |
|
261 | + } |
|
246 | 262 | return null; |
247 | 263 | } |
248 | 264 | |
@@ -253,14 +269,16 @@ discard block |
||
253 | 269 | */ |
254 | 270 | public static function formatAsHTML($data) |
255 | 271 | { |
256 | - if ($data == strip_tags($data) || strtolower(substr(ltrim($data), 0, 5)) == '<?xml') |
|
257 | - return null; |
|
272 | + if ($data == strip_tags($data) || strtolower(substr(ltrim($data), 0, 5)) == '<?xml') { |
|
273 | + return null; |
|
274 | + } |
|
258 | 275 | |
259 | 276 | $doc = new \DOMDocument('1.0'); |
260 | 277 | $doc->preserveWhiteSpace = false; |
261 | 278 | $doc->formatOutput = true; |
262 | - if (@$doc->loadHTML($data)) |
|
263 | - return htmlentities($doc->saveHTML(), ENT_COMPAT, 'UTF-8'); |
|
279 | + if (@$doc->loadHTML($data)) { |
|
280 | + return htmlentities($doc->saveHTML(), ENT_COMPAT, 'UTF-8'); |
|
281 | + } |
|
264 | 282 | return null; |
265 | 283 | } |
266 | 284 | } |