@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $self = $this; |
88 | 88 | |
89 | 89 | $this->addInitializer( |
90 | - function ($instance) use ($self) { |
|
90 | + function($instance) use ($self) { |
|
91 | 91 | if ($instance instanceof TranslatorAwareInterface) { |
92 | 92 | $translator = $self->getServiceLocator()->get('translator'); |
93 | 93 | $instance->setTranslator($translator); |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | false |
101 | 101 | ); |
102 | 102 | $this->addInitializer( |
103 | - function ($instance) { |
|
103 | + function($instance) { |
|
104 | 104 | if (method_exists($instance, 'setServiceLocator')) { |
105 | 105 | $instance->setServiceLocator($this); |
106 | 106 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | false |
109 | 109 | ); |
110 | 110 | $this->addInitializer( |
111 | - function ($instance) { |
|
111 | + function($instance) { |
|
112 | 112 | if (method_exists($instance, 'init')) { |
113 | 113 | $instance->init(); |
114 | 114 | } |
@@ -199,11 +199,11 @@ discard block |
||
199 | 199 | if ($this->overrideRecipient instanceof AddressList) { |
200 | 200 | $originalRecipient = $headers->get('to')->toString(); |
201 | 201 | if ($headers->has('cc')) { |
202 | - $originalRecipient .= '; ' . $headers->get('cc')->toString(); |
|
202 | + $originalRecipient .= '; '.$headers->get('cc')->toString(); |
|
203 | 203 | $headers->removeHeader('cc'); |
204 | 204 | } |
205 | 205 | if ($headers->has('bcc')) { |
206 | - $originalRecipient .= '; ' . $headers->get('bcc')->toString(); |
|
206 | + $originalRecipient .= '; '.$headers->get('bcc')->toString(); |
|
207 | 207 | $headers->removeHeader('bcc'); |
208 | 208 | } |
209 | 209 | $headers->addHeaderLine('X-Original-Recipients', $originalRecipient); |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | } |
230 | 230 | |
231 | 231 | /* @var \Zend\Mvc\View\Http\ViewManager $viewManager */ |
232 | - $viewManager = $this->serviceManager->get('viewManager'); |
|
232 | + $viewManager = $this->serviceManager->get('viewManager'); |
|
233 | 233 | $resolver = $this->serviceManager->get('viewResolver'); |
234 | 234 | |
235 | 235 | /* @var \Zend\Mvc\MvcEvent $event */ |
@@ -237,13 +237,13 @@ discard block |
||
237 | 237 | $lang = $event->getRouteMatch()->getParam('lang'); |
238 | 238 | |
239 | 239 | |
240 | - if ($resolver->resolve($this->getTemplate() . '.' . $lang)) { |
|
241 | - $viewModel->setTemplate($this->getTemplate() . '.' . $lang); |
|
242 | - }else{ |
|
240 | + if ($resolver->resolve($this->getTemplate().'.'.$lang)) { |
|
241 | + $viewModel->setTemplate($this->getTemplate().'.'.$lang); |
|
242 | + } else { |
|
243 | 243 | $viewModel->setTemplate($this->getTemplate()); |
244 | 244 | } |
245 | 245 | |
246 | - $view = $viewManager->getView(); |
|
246 | + $view = $viewManager->getView(); |
|
247 | 247 | |
248 | 248 | $viewModel->setVariables($this->getVariables()); |
249 | 249 | $view->setResponse($response); |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | * |
125 | 125 | * @param string $name |
126 | 126 | * @param mixed $value |
127 | - * @return ViewModel |
|
127 | + * @return HTMLTemplateMessage |
|
128 | 128 | */ |
129 | 129 | public function setVariable($name, $value) |
130 | 130 | { |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | * |
186 | 186 | * Resets the internal variable container to an empty container. |
187 | 187 | * |
188 | - * @return ViewModel |
|
188 | + * @return HTMLTemplateMessage |
|
189 | 189 | */ |
190 | 190 | public function clearVariables() |
191 | 191 | { |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | |
196 | 196 | /** |
197 | 197 | * |
198 | - * @param $template |
|
198 | + * @param string $template |
|
199 | 199 | * |
200 | 200 | * @return self |
201 | 201 | */ |
@@ -205,6 +205,9 @@ discard block |
||
205 | 205 | return $this; |
206 | 206 | } |
207 | 207 | |
208 | + /** |
|
209 | + * @return string |
|
210 | + */ |
|
208 | 211 | public function getTemplate() |
209 | 212 | { |
210 | 213 | return $this->template; |
@@ -235,7 +235,7 @@ |
||
235 | 235 | |
236 | 236 | if ($resolver->resolve($this->getTemplate() . '.' . $lang)) { |
237 | 237 | $viewModel->setTemplate($this->getTemplate() . '.' . $lang); |
238 | - }else{ |
|
238 | + } else{ |
|
239 | 239 | $viewModel->setTemplate($this->getTemplate()); |
240 | 240 | } |
241 | 241 |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | $response = $this->getResponse(); |
51 | 51 | |
52 | 52 | try { |
53 | - $repository = $this->serviceLocator->get('repositories')->get($module . '/' . $entityName); |
|
53 | + $repository = $this->serviceLocator->get('repositories')->get($module.'/'.$entityName); |
|
54 | 54 | } catch (\Exception $e) { |
55 | 55 | $response->setStatusCode(404); |
56 | 56 | $this->getEvent()->setParam('exception', $e); |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | $this->acl($file); |
86 | 86 | |
87 | - $headers=$response->getHeaders(); |
|
87 | + $headers = $response->getHeaders(); |
|
88 | 88 | |
89 | 89 | $headers->addHeaderline('Content-Type', $file->getType()) |
90 | 90 | ->addHeaderline('Content-Length', $file->getLength()); |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | } elseif (isset($this->config['templateHalf'])) { |
169 | 169 | $template = $this->config['templateHalf']; |
170 | 170 | } else { |
171 | - throw new \InvalidArgumentException('Not template provided for Mail.'); |
|
171 | + throw new \InvalidArgumentException('Not template provided for Mail.'); |
|
172 | 172 | } |
173 | 173 | return $template; |
174 | 174 | } |
@@ -181,19 +181,19 @@ discard block |
||
181 | 181 | $from = $this->config['from']; |
182 | 182 | } else { |
183 | 183 | $log->err('A from email address must be provided (Variable $from) in Template: ' . $template); |
184 | - throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: ' . $template); |
|
184 | + throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: ' . $template); |
|
185 | 185 | } |
186 | 186 | if (isset($this->config['fromName'])) { |
187 | 187 | $fromName = $this->config['fromName']; |
188 | 188 | } else { |
189 | 189 | $log->err('A from name must be provided (Variable $fromName) in Template: ' . $template); |
190 | - throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: ' . $template); |
|
190 | + throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: ' . $template); |
|
191 | 191 | } |
192 | 192 | if (isset($this->config['subject'])) { |
193 | 193 | $subject = $this->config['subject']; |
194 | 194 | } else { |
195 | 195 | $log->err('A subject must be provided (Variable $subject) in Template: ' . $template); |
196 | - throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: ' . $template); |
|
196 | + throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: ' . $template); |
|
197 | 197 | } |
198 | 198 | $this->setFrom($from, $fromName); |
199 | 199 | $this->setSubject($subject); |
@@ -72,6 +72,9 @@ discard block |
||
72 | 72 | return $this; |
73 | 73 | } |
74 | 74 | |
75 | + /** |
|
76 | + * @param AddressList $header |
|
77 | + */ |
|
75 | 78 | protected function stringFromMailHeader($header) |
76 | 79 | { |
77 | 80 | $erg = ''; |
@@ -160,6 +163,9 @@ discard block |
||
160 | 163 | } |
161 | 164 | } |
162 | 165 | |
166 | + /** |
|
167 | + * @return string |
|
168 | + */ |
|
163 | 169 | protected function getTemplate() |
164 | 170 | { |
165 | 171 | $template = null; |
@@ -96,18 +96,18 @@ discard block |
||
96 | 96 | $replyTo = $this->stringFromMailHeader($this->getReplyTo()); |
97 | 97 | |
98 | 98 | return str_pad($template, 30) |
99 | - . 'to: ' . str_pad($to, 50) |
|
100 | - . 'cc: ' . str_pad($cc, 50) |
|
101 | - . 'bcc: ' . str_pad($bcc, 50) |
|
102 | - . 'from: ' . str_pad($from, 50) |
|
103 | - . 'replyTo: ' . str_pad($replyTo, 50) |
|
99 | + . 'to: '.str_pad($to, 50) |
|
100 | + . 'cc: '.str_pad($cc, 50) |
|
101 | + . 'bcc: '.str_pad($bcc, 50) |
|
102 | + . 'from: '.str_pad($from, 50) |
|
103 | + . 'replyTo: '.str_pad($replyTo, 50) |
|
104 | 104 | //. str_pad(implode(',', ArrayUtils::iteratorToArray($this->getSender())),50) |
105 | - . 'subject: ' . str_pad($this->getSubject(), 50); |
|
105 | + . 'subject: '.str_pad($this->getSubject(), 50); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | public function template($template) |
109 | 109 | { |
110 | - $controller = get_class($this->controller); |
|
110 | + $controller = get_class($this->controller); |
|
111 | 111 | $services = $this->serviceManager; |
112 | 112 | |
113 | 113 | $event = new Event(); |
@@ -124,11 +124,11 @@ discard block |
||
124 | 124 | $controllerIdentifier = strtolower(substr($controller, 0, strpos($controller, '\\'))); |
125 | 125 | $viewResolver = $this->serviceManager->get('ViewResolver'); |
126 | 126 | |
127 | - $templateHalf = 'mail/' . $template; |
|
127 | + $templateHalf = 'mail/'.$template; |
|
128 | 128 | $resource = $viewResolver->resolve($templateHalf); |
129 | 129 | |
130 | 130 | if (empty($resource)) { |
131 | - $templateFull = $controllerIdentifier . '/mail/' . $template; |
|
131 | + $templateFull = $controllerIdentifier.'/mail/'.$template; |
|
132 | 132 | $resource = $viewResolver->resolve($templateFull); |
133 | 133 | } |
134 | 134 | |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | unset($__vars[$key]); |
156 | 156 | } |
157 | 157 | } |
158 | - unset($__vars['content'],$__vars['controllerIdentifier'],$__vars['controller'],$__vars['resource'],$__vars['template'],$__vars['viewResolver']); |
|
158 | + unset($__vars['content'], $__vars['controllerIdentifier'], $__vars['controller'], $__vars['resource'], $__vars['template'], $__vars['viewResolver']); |
|
159 | 159 | $this->config = $__vars; |
160 | 160 | } |
161 | 161 | } |
@@ -180,20 +180,20 @@ discard block |
||
180 | 180 | if (isset($this->config['from'])) { |
181 | 181 | $from = $this->config['from']; |
182 | 182 | } else { |
183 | - $log->err('A from email address must be provided (Variable $from) in Template: ' . $template); |
|
184 | - throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: ' . $template); |
|
183 | + $log->err('A from email address must be provided (Variable $from) in Template: '.$template); |
|
184 | + throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: '.$template); |
|
185 | 185 | } |
186 | 186 | if (isset($this->config['fromName'])) { |
187 | 187 | $fromName = $this->config['fromName']; |
188 | 188 | } else { |
189 | - $log->err('A from name must be provided (Variable $fromName) in Template: ' . $template); |
|
190 | - throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: ' . $template); |
|
189 | + $log->err('A from name must be provided (Variable $fromName) in Template: '.$template); |
|
190 | + throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: '.$template); |
|
191 | 191 | } |
192 | 192 | if (isset($this->config['subject'])) { |
193 | 193 | $subject = $this->config['subject']; |
194 | 194 | } else { |
195 | - $log->err('A subject must be provided (Variable $subject) in Template: ' . $template); |
|
196 | - throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: ' . $template); |
|
195 | + $log->err('A subject must be provided (Variable $subject) in Template: '.$template); |
|
196 | + throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: '.$template); |
|
197 | 197 | } |
198 | 198 | $this->setFrom($from, $fromName); |
199 | 199 | $this->setSubject($subject); |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | $erg = true; |
216 | 216 | $log->info($this); |
217 | 217 | } catch (\Exception $e) { |
218 | - $log->err('Mail failure ' . $e->getMessage()); |
|
218 | + $log->err('Mail failure '.$e->getMessage()); |
|
219 | 219 | //$this->serviceManager->get('Core/Log')->warn('Mail failure ' . $e->getMessage()); |
220 | 220 | } |
221 | 221 | //} |
@@ -56,7 +56,7 @@ |
||
56 | 56 | */ |
57 | 57 | public function postDispatch(MvcEvent $e) |
58 | 58 | { |
59 | - // $view = $this->serviceLocator->get('view'); |
|
59 | + // $view = $this->serviceLocator->get('view'); |
|
60 | 60 | |
61 | 61 | } |
62 | 62 |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | public function __call($method, $args) |
215 | 215 | { |
216 | 216 | if (0 !== strpos($method, 'do')) { |
217 | - throw new \BadMethodCallException('Unknown method "' . $method . '"'); |
|
217 | + throw new \BadMethodCallException('Unknown method "'.$method.'"'); |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | $name = substr($method, 2); |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | } |
249 | 249 | |
250 | 250 | if ($method && method_exists($listener, $method)) { |
251 | - return call_user_func_array([ $listener, $method ], $args); |
|
251 | + return call_user_func_array([$listener, $method], $args); |
|
252 | 252 | } |
253 | 253 | |
254 | 254 | if (is_callable($listener)) { |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | |
258 | 258 | throw new \UnexpectedValueException(sprintf( |
259 | 259 | 'Deferred listener %s%s is not callable.', |
260 | - get_class($listener), $method ? ' has no method "' . $method . '" and ' : '' |
|
260 | + get_class($listener), $method ? ' has no method "'.$method.'" and ' : '' |
|
261 | 261 | )); |
262 | 262 | } |
263 | 263 |
@@ -31,7 +31,7 @@ |
||
31 | 31 | */ |
32 | 32 | public function __construct(LoginFilterService $loginFilter) |
33 | 33 | { |
34 | - $this->loginFilter = $loginFilter;; |
|
34 | + $this->loginFilter = $loginFilter; ; |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | /** |
@@ -56,6 +56,6 @@ |
||
56 | 56 | $form = new static(); |
57 | 57 | $form->forms = $forms; |
58 | 58 | |
59 | - return $form; |
|
59 | + return $form; |
|
60 | 60 | } |
61 | 61 | } |
@@ -57,7 +57,7 @@ |
||
57 | 57 | protected function filterArrayStrings($array, $search, $replace) |
58 | 58 | { |
59 | 59 | $return = array(); |
60 | - foreach ((array)$array as $key => $value) { |
|
60 | + foreach ((array) $array as $key => $value) { |
|
61 | 61 | $key = str_replace($search, $replace, $key); |
62 | 62 | $value = is_array($value) |
63 | 63 | ? $this->filterArrayStrings($value, $search, $replace) |