Completed
Pull Request — develop (#329)
by Carsten
07:08
created
config/config.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,8 +40,7 @@
 block discarded – undo
40 40
             if (strpos($addModule, '-') === 0) {
41 41
                 $remove = substr($addModule,1);
42 42
                 $modules = array_filter($modules, function ($elem) use ($remove) { return strcasecmp($elem,$remove); });
43
-            }
44
-            else {
43
+            } else {
45 44
                 if (!in_array($addModule, $modules)) {
46 45
                     $modules[] = $addModule;
47 46
                 }
Please login to merge, or discard this patch.
module/Core/src/Core/Form/View/Helper/FormEditor.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -197,10 +197,10 @@
 block discarded – undo
197 197
     public function setOption($name,$value){
198 198
         if (array_key_exists($name, $this->options)) {
199 199
             $this->options[$name] = $value;
200
-        }elseif ('language' == $name or 'language_url' == $name ) {
200
+        } elseif ('language' == $name or 'language_url' == $name ) {
201 201
             $this->options[$name] = $value;
202 202
 
203
-        }else{
203
+        } else{
204 204
             throw new \InvalidArgumentException('Unknown Option ' . $name . ' in ' .  __FILE__ . ' Line ' . __LINE__ );
205 205
         }
206 206
     }
Please login to merge, or discard this patch.
module/Core/src/Core/Mail/HTMLTemplateMessage.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
             if ($this->value['params']['status'] != 'all'){
63 63
                 $queryBuilder->field('status.name')->equals($this->value['params']['status']);
64 64
             }
65
-        }else{
65
+        } else{
66 66
             $queryBuilder->field('status.name')->equals(Status::CREATED);
67 67
         }
68 68
 
Please login to merge, or discard this patch.
module/Core/src/Core/Factory/EventManager/EventManagerAbstractFactory.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,8 +54,7 @@
 block discarded – undo
54 54
         if (method_exists($events, 'setEventPrototype')) {
55 55
             $event = $serviceLocator->has($config['event']) ? $serviceLocator->get($config['event']) : new $config['event']();
56 56
             $events->setEventPrototype($event);
57
-        }
58
-        else {
57
+        } else {
59 58
             $events->setEventClass($config['event']);
60 59
         }
61 60
 
Please login to merge, or discard this patch.
module/Settings/src/Settings/Form/SettingsFieldset.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
              */
78 78
             if (isset($this->value['params']['by']) && 'me' == $this->value['params']['by']) {
79 79
                 $queryBuilder->field('user')->equals($this->user->id);
80
-            }else{
80
+            } else{
81 81
                 $queryBuilder->field('permissions.view')->equals($this->user->id);
82 82
             }
83 83
             if (
Please login to merge, or discard this patch.
module/Auth/src/Auth/Controller/ManageController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -96,8 +96,7 @@
 block discarded – undo
96 96
                     'content' => $content,
97 97
                     )
98 98
                 );
99
-            }
100
-            elseif ($postProfiles) {
99
+            } elseif ($postProfiles) {
101 100
                 $formSocialProfiles->setData($this->params()->fromPost());
102 101
                 
103 102
                 if ($formSocialProfiles->isValid()) {
Please login to merge, or discard this patch.
module/Auth/src/Auth/Controller/IndexController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -411,8 +411,7 @@
 block discarded – undo
411 411
                     } else {
412 412
                         $notFoundUsers[] = $grp_member . $loginSuffix;
413 413
                     }
414
-                }
415
-                catch (\Auth\Exception\UserDeactivatedException $e)
414
+                } catch (\Auth\Exception\UserDeactivatedException $e)
416 415
                 {
417 416
                     $notFoundUsers[] = $grp_member . $loginSuffix;
418 417
                 }
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Controller/TemplateController.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
             $this->auth()->isAdmin()
72 72
         ) {
73 73
             $applicationViewModel->setTemplate('iframe/iFrameInjection');
74
-        }elseif(Status::EXPIRED == $job->getStatus() or  Status::INACTIVE == $job->getStatus()) {
74
+        } elseif(Status::EXPIRED == $job->getStatus() or  Status::INACTIVE == $job->getStatus()) {
75 75
             $this->response->setStatusCode(Response::STATUS_CODE_410);
76 76
             $model->setTemplate('jobs/error/expired');
77 77
             $model->setVariables(
Please login to merge, or discard this patch.
module/Core/src/Core/Form/View/Helper/FormCollectionContainer.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,10 +60,12 @@
 block discarded – undo
60 60
             %s
61 61
         </div>';
62 62
         
63
-        foreach ($container as $form) /* @var $form \Zend\Form\Form */
63
+        foreach ($container as $form) {
64
+            /* @var $form \Zend\Form\Form */
64 65
         {
65 66
             $formsMarkup .= sprintf($formTemplateWrapper, $formContainerHelper->renderElement($form, $layout, $parameter));
66 67
         }
68
+        }
67 69
         
68 70
         $templateForm = $container->getTemplateForm();
69 71
 		$templateMarkup = sprintf(
Please login to merge, or discard this patch.