Completed
Push — develop ( 478992...e444cc )
by Mathias
36:14
created
module/Auth/src/Auth/Controller/UsersController.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -84,9 +84,9 @@
 block discarded – undo
84 84
         $imageStrategy = $infoContainer->getForm('info.image')
85 85
             ->getHydrator()
86 86
             ->getStrategy('image');
87
-		$fileEntity = $imageStrategy->getFileEntity();
88
-		$fileEntity->setUser($user);
89
-		$imageStrategy->setFileEntity($fileEntity);
87
+        $fileEntity = $imageStrategy->getFileEntity();
88
+        $fileEntity->setUser($user);
89
+        $imageStrategy->setFileEntity($fileEntity);
90 90
         
91 91
         if ($this->request->isPost()) {
92 92
             $formName = $params->fromQuery('form');
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
     /**
41 41
      * List users
42 42
      *
43
-     * @return \Zend\Http\Response|ViewModel
43
+     * @return \Core\Controller\Plugin\CreatePaginator
44 44
      */
45 45
     public function listAction()
46 46
     {
Please login to merge, or discard this patch.
module/Core/src/Core/Listener/LanguageRouteListener.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -215,8 +215,8 @@
 block discarded – undo
215 215
     }
216 216
 
217 217
     /**
218
-     * @param $response
219
-     * @param $uri
218
+     * @param \Zend\Stdlib\ResponseInterface $response
219
+     * @param string $uri
220 220
      *
221 221
      * @return mixed
222 222
      */
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -97,10 +97,10 @@  discard block
 block discarded – undo
97 97
         }
98 98
         
99 99
         $router = $e->getRouter();
100
-        $basePath=$router->getBaseUrl();
100
+        $basePath = $router->getBaseUrl();
101 101
         $match = [];
102 102
         
103
-        if (preg_match('~^' . $basePath . '/([a-z]{2})(?:/|$)~', $e->getRequest()->getRequestUri(), $match)) {
103
+        if (preg_match('~^'.$basePath.'/([a-z]{2})(?:/|$)~', $e->getRequest()->getRequestUri(), $match)) {
104 104
             /* It seems we have already a language in the URI
105 105
              * Now there are two possibilities:
106 106
              *
@@ -182,8 +182,8 @@  discard block
 block discarded – undo
182 182
         setlocale(
183 183
             LC_ALL,
184 184
             array(
185
-            $locale . ".utf8",
186
-            $locale . ".iso88591",
185
+            $locale.".utf8",
186
+            $locale.".iso88591",
187 187
             $locale,
188 188
             substr($locale, 0, 2),
189 189
             'de_DE.utf8',
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/Service/NotificationFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
         $notificationListener = $serviceLocator->getServiceLocator()->get('Core/Listener/Notification');
25 25
         $translator = $services->get('translator');
26 26
 
27
-        $notification   = new Notification($flashMessenger);
27
+        $notification = new Notification($flashMessenger);
28 28
         $notification->setListener($notificationListener);
29 29
         $notification->setTranslator($translator);
30 30
 
Please login to merge, or discard this patch.
Settings/src/Settings/Form/DisableElementsCapableFormSettingsFieldset.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
     
110 110
     /**
111 111
      * @param ServiceLocatorInterface $formManager
112
-     * @return AbstractSettingsForm
112
+     * @return DisableElementsCapableFormSettingsFieldset
113 113
      */
114 114
     public static function factory(ServiceLocatorInterface $formManager)
115 115
     {
Please login to merge, or discard this patch.
module/Core/src/Core/Mail/MailServiceFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 
40 40
         $config = new MailServiceConfig($configArray);
41 41
 
42
-        $service   = new MailService($serviceLocator, $config);
42
+        $service = new MailService($serviceLocator, $config);
43 43
 
44 44
         return $service;
45 45
 
Please login to merge, or discard this patch.
module/Core/src/Core/Mail/MailService.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/FileController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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());
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/Mail.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -72,6 +72,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
160 163
         }
161 164
     }
162 165
     
166
+    /**
167
+     * @return string
168
+     */
163 169
     protected function getTemplate()
164 170
     {
165 171
         $template = null;
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -96,18 +96,18 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
         //}
Please login to merge, or discard this patch.
module/Core/src/Core/Listener/DefaultListener.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
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
     
Please login to merge, or discard this patch.