@@ -138,7 +138,7 @@ |
||
138 | 138 | $prefix = $this->context->get_key(MIDCOM_CONTEXT_ANCHORPREFIX); |
139 | 139 | |
140 | 140 | // Check if we need to start up a plugin. |
141 | - if ( count($argv) > 1 |
|
141 | + if (count($argv) > 1 |
|
142 | 142 | && $config = plugin::get_config($argv[0], $argv[1])) { |
143 | 143 | $namespace = array_shift($argv); |
144 | 144 | $name = array_shift($argv); |
@@ -69,7 +69,8 @@ discard block |
||
69 | 69 | |
70 | 70 | try { |
71 | 71 | $result = $router->match($url); |
72 | - } catch (ResourceNotFoundException $e) { |
|
72 | + } |
|
73 | + catch (ResourceNotFoundException $e) { |
|
73 | 74 | throw new midcom_error_notfound('This URL method is unknown.'); |
74 | 75 | } |
75 | 76 | $this->request->attributes->add($result); |
@@ -151,11 +152,13 @@ discard block |
||
151 | 152 | |
152 | 153 | try { |
153 | 154 | $result = $router->match($url); |
154 | - } catch (ResourceNotFoundException $e) { |
|
155 | + } |
|
156 | + catch (ResourceNotFoundException $e) { |
|
155 | 157 | // No match |
156 | 158 | debug_add("Component {$viewer->_component} in {$viewer->_topic->name} declared unable to handle request.", MIDCOM_LOG_INFO); |
157 | 159 | throw new midcom_error_notfound("This page is not available on this server."); |
158 | - } catch (MethodNotAllowedException $e) { |
|
160 | + } |
|
161 | + catch (MethodNotAllowedException $e) { |
|
159 | 162 | debug_add("Component {$viewer->_component} in {$viewer->_topic->name} declared unable to handle request (method not allowed).", MIDCOM_LOG_INFO); |
160 | 163 | throw new midcom_error_forbidden($e->getMessage(), Response::HTTP_METHOD_NOT_ALLOWED); |
161 | 164 | } |
@@ -80,7 +80,8 @@ |
||
80 | 80 | |
81 | 81 | try { |
82 | 82 | require $basedir . $file; |
83 | - } catch (\midcom_error_forbidden $e) { |
|
83 | + } |
|
84 | + catch (\midcom_error_forbidden $e) { |
|
84 | 85 | $dialog = $this->getHelperSet()->get('question'); |
85 | 86 | $this->login($dialog, $input, $output); |
86 | 87 | require $basedir . $file; |
@@ -33,7 +33,7 @@ |
||
33 | 33 | public function _on_loaded() |
34 | 34 | { |
35 | 35 | // if we are missing the component, use the nullcomponent. |
36 | - if ( !$this->component |
|
36 | + if (!$this->component |
|
37 | 37 | || !midcom::get()->componentloader->is_installed($this->component)) { |
38 | 38 | debug_add("Topic {$this->id} has no component assigned to it, using 'midcom.core.nullcomponent'.", |
39 | 39 | MIDCOM_LOG_INFO); |
@@ -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 | } |