@@ -559,7 +559,7 @@ |
||
559 | 559 | } |
560 | 560 | $data = urldecode($data); |
561 | 561 | |
562 | - $data = preg_replace_callback('/(?:^|(?<=&))[^=[]+/', function ($match) { |
|
562 | + $data = preg_replace_callback('/(?:^|(?<=&))[^=[]+/', function($match) { |
|
563 | 563 | return bin2hex(urldecode($match[0])); |
564 | 564 | }, $data); |
565 | 565 |
@@ -155,7 +155,7 @@ |
||
155 | 155 | 'max_age' => 1800, |
156 | 156 | 'endpoints' => [[ |
157 | 157 | 'url' => $this->getReportURI(), |
158 | - ],], |
|
158 | + ], ], |
|
159 | 159 | 'include_subdomains' => $this->getIncludeSubdomains(), |
160 | 160 | ]; |
161 | 161 | return json_encode($header); |
@@ -143,7 +143,7 @@ |
||
143 | 143 | // Firefox doesn't report the disposition. |
144 | 144 | return 'unknown'; |
145 | 145 | } |
146 | - return ; |
|
146 | + return; |
|
147 | 147 | case self::BLOCKED_URI: |
148 | 148 | return $cspReport['blocked-uri']; |
149 | 149 | case self::EFFECTIVE_DIRECTIVE: |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | ], |
100 | 100 | ], |
101 | 101 | ], |
102 | - function () use ($testURI) { |
|
102 | + function() use ($testURI) { |
|
103 | 103 | $defaultUri = Director::absoluteURL(SecurityHeaderMiddleware::config()->get('report_uri')); |
104 | 104 | $response = $this->getResponse(); |
105 | 105 | $csp = $response->getHeader('Content-Security-Policy'); |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | 'use_report_to' => true, |
130 | 130 | ], |
131 | 131 | ], |
132 | - function () { |
|
132 | + function() { |
|
133 | 133 | $response = $this->getResponse(); |
134 | 134 | $csp = $response->getHeader('Content-Security-Policy'); |
135 | 135 | $reportHeaderExists = $response->getHeader('Report-To') !== null; |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | 'use_report_to' => true, |
175 | 175 | ], |
176 | 176 | ], |
177 | - function () { |
|
177 | + function() { |
|
178 | 178 | $defaultEndpoint = SecurityHeaderMiddleware::config()->get('report_to_group'); |
179 | 179 | $defaultUri = Director::absoluteURL(SecurityHeaderMiddleware::config()->get('report_uri')); |
180 | 180 | $response = $this->getResponse(); |
@@ -56,8 +56,7 @@ |
||
56 | 56 | $report->delete(); |
57 | 57 | $delta++; |
58 | 58 | } |
59 | - } |
|
60 | - finally { |
|
59 | + } finally { |
|
61 | 60 | DB::get_conn()->transactionEnd(); |
62 | 61 | } |
63 | 62 |
@@ -49,8 +49,7 @@ |
||
49 | 49 | } |
50 | 50 | ++$delta; |
51 | 51 | } |
52 | - } |
|
53 | - finally { |
|
52 | + } finally { |
|
54 | 53 | DB::get_conn()->transactionEnd(); |
55 | 54 | } |
56 | 55 |
@@ -59,8 +59,7 @@ |
||
59 | 59 | if (count($duration_parts) > 1) { |
60 | 60 | $last = array_pop($duration_parts); |
61 | 61 | $duration_string = implode(', ', $duration_parts) . ' and ' . $last; |
62 | - } |
|
63 | - else { |
|
62 | + } else { |
|
64 | 63 | $duration_string = reset($duration_parts); |
65 | 64 | } |
66 | 65 |