@@ -72,7 +72,8 @@ |
||
72 | 72 | $component = key($watch); |
73 | 73 | try { |
74 | 74 | $interface = $this->loader->get_interface_class($component); |
75 | - } catch (\midcom_error $e) { |
|
75 | + } |
|
76 | + catch (\midcom_error $e) { |
|
76 | 77 | debug_add("Failed to load the component {$component}: " . $e->getMessage(), MIDCOM_LOG_INFO); |
77 | 78 | continue; |
78 | 79 | } |
@@ -101,7 +101,7 @@ |
||
101 | 101 | $rawdata = base64_decode($request->cookies->get('midcom_services_i18n')); |
102 | 102 | $array = unserialize($rawdata); |
103 | 103 | |
104 | - if ( !array_key_exists('language', $array) |
|
104 | + if (!array_key_exists('language', $array) |
|
105 | 105 | || !array_key_exists('charset', $array)) { |
106 | 106 | debug_add("Rejecting cookie, it seems invalid."); |
107 | 107 | return false; |
@@ -155,7 +155,8 @@ discard block |
||
155 | 155 | { |
156 | 156 | try { |
157 | 157 | Locales::getName($lang); |
158 | - } catch (Exception $e) { |
|
158 | + } |
|
159 | + catch (Exception $e) { |
|
159 | 160 | debug_add("Language {$lang} not found:" . $e->getMessage(), MIDCOM_LOG_ERROR); |
160 | 161 | return false; |
161 | 162 | } |
@@ -236,7 +237,8 @@ discard block |
||
236 | 237 | { |
237 | 238 | try { |
238 | 239 | return $this->get_l10n($component)->get($stringid); |
239 | - } catch (midcom_error $e) { |
|
240 | + } |
|
241 | + catch (midcom_error $e) { |
|
240 | 242 | $e->log(MIDCOM_LOG_WARN); |
241 | 243 | return $stringid; |
242 | 244 | } |
@@ -99,7 +99,8 @@ |
||
99 | 99 | if ($request->request->has('midcom_helper_datamanager2_save')) { |
100 | 100 | try { |
101 | 101 | $rules = $this->_load_rules($request); |
102 | - } catch (midcom_error $e) { |
|
102 | + } |
|
103 | + catch (midcom_error $e) { |
|
103 | 104 | midcom::get()->uimessages->add('org.openpsa.directmarketing', $this->_l10n->get($e->getMessage()), 'error'); |
104 | 105 | return; |
105 | 106 | } |
@@ -97,7 +97,7 @@ |
||
97 | 97 | $loader->load($this->getProjectDir() . '/config/services.yml'); |
98 | 98 | } |
99 | 99 | if ($classes = midcom::get_registered_service_classes()) { |
100 | - $loader->load(function (ContainerBuilder $container) use ($classes) { |
|
100 | + $loader->load(function(ContainerBuilder $container) use ($classes) { |
|
101 | 101 | foreach ($classes as $id => $class) { |
102 | 102 | $container->findDefinition($id)->setClass($class); |
103 | 103 | } |
@@ -161,7 +161,8 @@ discard block |
||
161 | 161 | $response = $this->handle($request); |
162 | 162 | $response->send(); |
163 | 163 | $this->terminate($request, $response); |
164 | - } catch (Error $e) { |
|
164 | + } |
|
165 | + catch (Error $e) { |
|
165 | 166 | $this->getHttpKernel()->terminateWithException($e); |
166 | 167 | } |
167 | 168 | } |
@@ -218,11 +219,13 @@ discard block |
||
218 | 219 | $this->skip_page_style = true; |
219 | 220 | try { |
220 | 221 | $response = $this->handle($request, HttpKernelInterface::SUB_REQUEST, false); |
221 | - } catch (midcom_error_notfound | midcom_error_forbidden $e) { |
|
222 | + } |
|
223 | + catch (midcom_error_notfound | midcom_error_forbidden $e) { |
|
222 | 224 | $e->log(); |
223 | 225 | midcom_core_context::leave(); |
224 | 226 | return; |
225 | - } finally { |
|
227 | + } |
|
228 | + finally { |
|
226 | 229 | $this->skip_page_style = $backup; |
227 | 230 | } |
228 | 231 |
@@ -45,7 +45,8 @@ |
||
45 | 45 | break; |
46 | 46 | } |
47 | 47 | } |
48 | - } catch (midcom_error $e) { |
|
48 | + } |
|
49 | + catch (midcom_error $e) { |
|
49 | 50 | } |
50 | 51 | |
51 | 52 | $path_parts = array_reverse($path_parts); |
@@ -152,7 +152,7 @@ |
||
152 | 152 | $preparsed = midcom_helper_formatter::compile($style); |
153 | 153 | |
154 | 154 | if (midcom_core_context::get()->has_custom_key('request_data')) { |
155 | - $data =& midcom_core_context::get()->get_custom_key('request_data'); |
|
155 | + $data = & midcom_core_context::get()->get_custom_key('request_data'); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | try { |
@@ -136,7 +136,8 @@ |
||
136 | 136 | |
137 | 137 | try { |
138 | 138 | eval('?>' . $preparsed); |
139 | - } catch (ParseError $e) { |
|
139 | + } |
|
140 | + catch (ParseError $e) { |
|
140 | 141 | throw new midcom_error("Failed to parse style element '{$path}': " . $e->getMessage() . ' in line ' . $e->getLine()); |
141 | 142 | } |
142 | 143 | } |
@@ -196,7 +196,7 @@ |
||
196 | 196 | |
197 | 197 | private function resolve_includes(string $content) : string |
198 | 198 | { |
199 | - return preg_replace_callback("/<\\(([a-zA-Z0-9 _-]+)\\)>/", function (array $matches) { |
|
199 | + return preg_replace_callback("/<\\(([a-zA-Z0-9 _-]+)\\)>/", function(array $matches) { |
|
200 | 200 | $element = $matches[1]; |
201 | 201 | |
202 | 202 | switch ($element) { |
@@ -98,7 +98,7 @@ |
||
98 | 98 | { |
99 | 99 | if (!isset($this->_modules[$name])) { |
100 | 100 | $this->_modules[$name] = $module; |
101 | - $this->$name =& $this->_modules[$name]; |
|
101 | + $this->$name = & $this->_modules[$name]; |
|
102 | 102 | } |
103 | 103 | } |
104 | 104 |
@@ -98,8 +98,8 @@ discard block |
||
98 | 98 | if (!$this->_schemadb) { |
99 | 99 | $this->_schemadb = schemadb::from_path($this->_config->get('schemadb')); |
100 | 100 | |
101 | - if ( $this->_config->get('use_captcha') |
|
102 | - || ( !midcom::get()->auth->user |
|
101 | + if ($this->_config->get('use_captcha') |
|
102 | + || (!midcom::get()->auth->user |
|
103 | 103 | && $this->_config->get('use_captcha_if_anonymous'))) { |
104 | 104 | $fields = $this->_schemadb->get('comment')->get('fields'); |
105 | 105 | $fields['captcha'] = [ |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | $this->_schemadb->get('comment')->set('fields', $fields); |
113 | 113 | } |
114 | 114 | |
115 | - if ( $this->_config->get('ratings_enable') |
|
115 | + if ($this->_config->get('ratings_enable') |
|
116 | 116 | && $this->_schemadb->get('comment')->has_field('rating')) { |
117 | 117 | $this->_schemadb->get('comment')->get_field('rating')['hidden'] = false; |
118 | 118 | } |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | $this->_comments = $this->_comments->execute(); |
192 | 192 | } |
193 | 193 | |
194 | - if ( midcom::get()->auth->user |
|
194 | + if (midcom::get()->auth->user |
|
195 | 195 | || $this->_config->get('allow_anonymous')) { |
196 | 196 | $this->_init_post_controller($request); |
197 | 197 | if ($response = $this->_process_post($request)) { |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | */ |
223 | 223 | private function _process_post(Request $request) |
224 | 224 | { |
225 | - if ( !midcom::get()->auth->user |
|
225 | + if (!midcom::get()->auth->user |
|
226 | 226 | && !midcom::get()->auth->request_sudo('net.nehmer.comments')) { |
227 | 227 | throw new midcom_error('We were anonymous but could not acquire SUDO privileges, aborting'); |
228 | 228 | } |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | } |
236 | 236 | |
237 | 237 | $formdata = $this->_post_controller->get_form_values(); |
238 | - if ( $formdata['subscribe'] |
|
238 | + if ($formdata['subscribe'] |
|
239 | 239 | && midcom::get()->auth->user) { |
240 | 240 | // User wants to subscribe to receive notifications about this comments thread |
241 | 241 | |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | */ |
270 | 270 | private function _get_last_modified() : int |
271 | 271 | { |
272 | - return array_reduce($this->_comments, function ($carry, net_nehmer_comments_comment $item) { |
|
272 | + return array_reduce($this->_comments, function($carry, net_nehmer_comments_comment $item) { |
|
273 | 273 | return max($item->metadata->revised, $carry); |
274 | 274 | }, 0); |
275 | 275 | } |
@@ -291,8 +291,8 @@ discard block |
||
291 | 291 | $data['comment_toolbar'] = $this->populate_post_toolbar($comment); |
292 | 292 | midcom_show_style('comments-item'); |
293 | 293 | |
294 | - if ( midcom::get()->auth->admin |
|
295 | - || ( midcom::get()->auth->user |
|
294 | + if (midcom::get()->auth->admin |
|
295 | + || (midcom::get()->auth->user |
|
296 | 296 | && $comment->can_do('midgard:delete'))) { |
297 | 297 | midcom_show_style('comments-admintoolbar'); |
298 | 298 | } |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | midcom_show_style('comments-nonefound'); |
303 | 303 | } |
304 | 304 | |
305 | - if ( midcom::get()->auth->user |
|
305 | + if (midcom::get()->auth->user |
|
306 | 306 | || $this->_config->get('allow_anonymous')) { |
307 | 307 | midcom_show_style('post-comment'); |
308 | 308 | } else { |