Completed
Pull Request — develop (#434)
by Carsten
06:27
created
module/Core/src/Core/Form/View/Helper/SearchForm.php 3 patches
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -83,6 +83,11 @@
 block discarded – undo
83 83
         return $content;
84 84
     }
85 85
 
86
+    /**
87
+     * @param FormInterface $form
88
+     *
89
+     * @return null|FormInterface
90
+     */
86 91
     public function renderElements($form, $colMap = null, $buttonsSpan = null)
87 92
     {
88 93
         if ($form instanceOf ViewPartialProviderInterface) {
Please login to merge, or discard this patch.
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
         $content = $this->renderElements($form, $colMap, $buttonsSpan);
67 67
 
68 68
         return $this->openTag($form)
69
-             . '<div class="row" style="padding: 0 15px;">'
70
-             . $content . '</div>' . $this->closeTag();
69
+                . '<div class="row" style="padding: 0 15px;">'
70
+                . $content . '</div>' . $this->closeTag();
71 71
 
72 72
     }
73 73
 
@@ -109,15 +109,15 @@  discard block
 block discarded – undo
109 109
 
110 110
             if ($element->getName() == $form->getButtonElement()) {
111 111
                 $content.='<div class="input-group col-md-' . $cols . '">'
112
-                              . $formElement($element)
113
-                              . '<div class="input-group-btn search-form-buttons" style="width: 1px;">'
114
-                              . $this->renderButtons($form->getButtons()) . '</div>'
115
-                              . '</div>';
112
+                                . $formElement($element)
113
+                                . '<div class="input-group-btn search-form-buttons" style="width: 1px;">'
114
+                                . $this->renderButtons($form->getButtons()) . '</div>'
115
+                                . '</div>';
116 116
                 $buttonsRendered = true;
117 117
             } else {
118 118
                 $content .= '<div class="input-group col-md-' . $cols . '">'
119
-                          . $formElement($element)
120
-                          . '</div>';
119
+                            . $formElement($element)
120
+                            . '</div>';
121 121
             }
122 122
 
123 123
             $i += 1;
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
                 $buttonsSpan = $form->getOption('buttons_span') ?: 12;
129 129
             }
130 130
             $content .= '<div class="input-group search-form-buttons col-md-' . $buttonsSpan . ' text-right">'
131
-                      . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>';
131
+                        . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>';
132 132
         }
133 133
 
134 134
         return $content;
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
      * @param array $colMap
35 35
      * @return Form|string
36 36
      */
37
-    public function __invoke(FormInterface $form = null, $colMap=null)
37
+    public function __invoke(FormInterface $form = null, $colMap = null)
38 38
     {
39 39
         if (!$form) {
40 40
             return $this;
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         return $this->render($form, $colMap);
44 44
     }
45 45
 
46
-    public function render(FormInterface $form, $colMap=null, $buttonsSpan = null)
46
+    public function render(FormInterface $form, $colMap = null, $buttonsSpan = null)
47 47
     {
48 48
         $headscript = $this->getView()->plugin('headscript');
49 49
         $basepath   = $this->getView()->plugin('basepath');
@@ -60,14 +60,14 @@  discard block
 block discarded – undo
60 60
         $form->prepare();
61 61
 
62 62
         if ($form instanceOf ViewPartialProviderInterface) {
63
-            return $this->getView()->partial($form->getViewPartial(), [ 'element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan ]);
63
+            return $this->getView()->partial($form->getViewPartial(), ['element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan]);
64 64
         }
65 65
 
66 66
         $content = $this->renderElements($form, $colMap, $buttonsSpan);
67 67
 
68 68
         return $this->openTag($form)
69 69
              . '<div class="row" style="padding: 0 15px;">'
70
-             . $content . '</div>' . $this->closeTag();
70
+             . $content.'</div>'.$this->closeTag();
71 71
 
72 72
     }
73 73
 
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 
78 78
         $content = '';
79 79
         foreach ($buttons as $button) {
80
-            $content.= $helper($button);
80
+            $content .= $helper($button);
81 81
         }
82 82
 
83 83
         return $content;
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     public function renderElements($form, $colMap = null, $buttonsSpan = null)
87 87
     {
88 88
         if ($form instanceOf ViewPartialProviderInterface) {
89
-            return $this->getView()->partial($form->getViewPartial(), [ 'element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan ]);
89
+            return $this->getView()->partial($form->getViewPartial(), ['element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan]);
90 90
         }
91 91
 
92 92
         if (null === $colMap) {
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
         }
95 95
 
96 96
         $formElement = $this->getView()->plugin('formElement');
97
-        $content = ''; $buttonsRendered = false; $i=0;
97
+        $content = ''; $buttonsRendered = false; $i = 0;
98 98
         foreach ($form as $element) {
99 99
 
100 100
             if (isset($colMap[$element->getName()])) {
@@ -108,14 +108,14 @@  discard block
 block discarded – undo
108 108
             }
109 109
 
110 110
             if ($element->getName() == $form->getButtonElement()) {
111
-                $content.='<div class="input-group col-md-' . $cols . '">'
111
+                $content .= '<div class="input-group col-md-'.$cols.'">'
112 112
                               . $formElement($element)
113 113
                               . '<div class="input-group-btn search-form-buttons" style="width: 1px;">'
114
-                              . $this->renderButtons($form->getButtons()) . '</div>'
114
+                              . $this->renderButtons($form->getButtons()).'</div>'
115 115
                               . '</div>';
116 116
                 $buttonsRendered = true;
117 117
             } else {
118
-                $content .= '<div class="input-group col-md-' . $cols . '">'
118
+                $content .= '<div class="input-group col-md-'.$cols.'">'
119 119
                           . $formElement($element)
120 120
                           . '</div>';
121 121
             }
@@ -127,8 +127,8 @@  discard block
 block discarded – undo
127 127
             if (null === $buttonsSpan) {
128 128
                 $buttonsSpan = $form->getOption('buttons_span') ?: 12;
129 129
             }
130
-            $content .= '<div class="input-group search-form-buttons col-md-' . $buttonsSpan . ' text-right">'
131
-                      . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>';
130
+            $content .= '<div class="input-group search-form-buttons col-md-'.$buttonsSpan.' text-right">'
131
+                      . '<div class="btn-group">'.$this->renderButtons($form->getButtons()).'</div></div>';
132 132
         }
133 133
 
134 134
         return $content;
Please login to merge, or discard this patch.
module/Core/src/Core/Form/SearchForm.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -167,7 +167,7 @@
 block discarded – undo
167 167
                     'label' => $label,
168 168
                 ],
169 169
                 'attributes' => [
170
-                    'class' => 'btn btn-' . ('submit' == $type ? 'primary' : 'default'),
170
+                    'class' => 'btn btn-'.('submit' == $type ? 'primary' : 'default'),
171 171
                     'type'  => $type,
172 172
                 ],
173 173
             ]
Please login to merge, or discard this patch.
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -47,6 +47,9 @@  discard block
 block discarded – undo
47 47
         $this->buttonsIterator->isLIFO(false);
48 48
     }
49 49
 
50
+    /**
51
+     * @param string $name
52
+     */
50 53
     public function setButtonElement($name)
51 54
     {
52 55
         return $this->setOption('button_element', $name);
@@ -182,6 +185,9 @@  discard block
 block discarded – undo
182 185
         return $this->buttonsIterator;
183 186
     }
184 187
 
188
+    /**
189
+     * @param string $name
190
+     */
185 191
     public function addButton($name, $priority = 0, $type = 'button')
186 192
     {
187 193
         if (is_array($name)) {
Please login to merge, or discard this patch.
module/Core/src/Core/Entity/Snapshot.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 {
24 24
     /**
25 25
      * @param $data
26
-     * @return mixed
26
+     * @return Snapshot
27 27
      * @ODM\PreUpdate
28 28
      */
29 29
     public function __invoke($data)
Please login to merge, or discard this patch.
module/Core/src/Core/Mail/HTMLTemplateMessage.php 4 patches
Doc Comments   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -239,7 +239,7 @@
 block discarded – undo
239 239
 
240 240
             if ($resolver->resolve($this->getTemplate() . '.' . $lang)) {
241 241
                 $viewModel->setTemplate($this->getTemplate() . '.' . $lang);
242
-            }else{
242
+            } else{
243 243
                 $viewModel->setTemplate($this->getTemplate());
244 244
             }
245 245
 
Please login to merge, or discard this patch.
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -38,15 +38,15 @@  discard block
 block discarded – undo
38 38
 
39 39
     protected $renderedBody;
40 40
 	
41
-	/**
42
-	 * HTMLTemplateMessage constructor.
43
-	 *
44
-	 * @param ContainerInterface $serviceManager
45
-	 * @param array $options
46
-	 */
41
+    /**
42
+     * HTMLTemplateMessage constructor.
43
+     *
44
+     * @param ContainerInterface $serviceManager
45
+     * @param array $options
46
+     */
47 47
     public function __construct(
48
-    	ContainerInterface $serviceManager,
49
-	    array $options = array()
48
+        ContainerInterface $serviceManager,
49
+        array $options = array()
50 50
     )
51 51
     {
52 52
         // @TODO make this multipart
@@ -266,11 +266,11 @@  discard block
 block discarded – undo
266 266
         return $this->renderedBody;
267 267
     }
268 268
 	
269
-	/**
270
-	 * @param ContainerInterface $container
271
-	 *
272
-	 * @return static
273
-	 */
269
+    /**
270
+     * @param ContainerInterface $container
271
+     *
272
+     * @return static
273
+     */
274 274
     public static function factory(ContainerInterface $container)
275 275
     {
276 276
         return new static($container);
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
      */
226 226
     public function renderBodyText($force = true, $forceLanguage = null)
227 227
     {
228
-        if (!$this->renderedBody || $force ) {
228
+        if (!$this->renderedBody || $force) {
229 229
             $viewModel    = new ViewModel();
230 230
             $response     = new Response();
231 231
             $body         = parent::getBodyText();
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
             }
235 235
 
236 236
             /* @var \Zend\Mvc\View\Http\ViewManager $viewManager */
237
-            $viewManager  = $this->serviceManager->get('ViewManager');
237
+            $viewManager = $this->serviceManager->get('ViewManager');
238 238
             $resolver = $this->serviceManager->get('ViewResolver');
239 239
 
240 240
             /* @var \Zend\Mvc\MvcEvent $event */
@@ -242,13 +242,13 @@  discard block
 block discarded – undo
242 242
             $lang = $forceLanguage ?: $event->getRouteMatch()->getParam('lang');
243 243
 
244 244
 
245
-            if ($resolver->resolve($this->getTemplate() . '.' . $lang)) {
246
-                $viewModel->setTemplate($this->getTemplate() . '.' . $lang);
247
-            }else{
245
+            if ($resolver->resolve($this->getTemplate().'.'.$lang)) {
246
+                $viewModel->setTemplate($this->getTemplate().'.'.$lang);
247
+            } else {
248 248
                 $viewModel->setTemplate($this->getTemplate());
249 249
             }
250 250
 
251
-            $view         = $viewManager->getView();
251
+            $view = $viewManager->getView();
252 252
 
253 253
             $viewModel->setVariables($this->getVariables());
254 254
             $viewModel->setVariable('mail', $this);
Please login to merge, or discard this patch.
module/Core/src/Core/Repository/AbstractRepository.php 3 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
     }
37 37
 
38 38
     /**
39
-     * @param $name
39
+     * @param string $name
40 40
      *
41 41
      * @return mixed
42 42
      */
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     /**
60 60
      * @param array $data
61 61
      *
62
-     * @return mixed
62
+     * @return EntityInterface
63 63
      */
64 64
     public function create(array $data = null, $persist = false)
65 65
     {
Please login to merge, or discard this patch.
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
      */
43 43
     public function getService($name)
44 44
     {
45
-    	/* @TODO: [ZF3] ->getServiceLocator() should be removed in future */
46
-    	$config = $this->dm->getConfiguration();
45
+        /* @TODO: [ZF3] ->getServiceLocator() should be removed in future */
46
+        $config = $this->dm->getConfiguration();
47 47
         return $this->dm->getConfiguration()->getServiceLocator()->get($name);
48 48
     }
49 49
 
@@ -126,9 +126,9 @@  discard block
 block discarded – undo
126 126
     {
127 127
         $this->checkEntityType($entity);
128 128
         $this->dm->remove($entity);
129
-		if($flush){
130
-			$this->dm->flush($entity);
131
-		}
129
+        if($flush){
130
+            $this->dm->flush($entity);
131
+        }
132 132
         return $this;
133 133
     }
134 134
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -122,11 +122,11 @@  discard block
 block discarded – undo
122 122
         return $this;
123 123
     }
124 124
 
125
-    public function remove($entity,$flush=false)
125
+    public function remove($entity, $flush = false)
126 126
     {
127 127
         $this->checkEntityType($entity);
128 128
         $this->dm->remove($entity);
129
-		if($flush){
129
+		if ($flush) {
130 130
 			$this->dm->flush($entity);
131 131
 		}
132 132
         return $this;
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 
135 135
     protected function checkEntityType($entity)
136 136
     {
137
-        if ( !($entity instanceOf $this->entityPrototype) ) {
137
+        if (!($entity instanceOf $this->entityPrototype)) {
138 138
             throw new \InvalidArgumentException(sprintf(
139 139
                                                     'Entity must be of type %s but recieved %s instead',
140 140
                                                     get_class($this->entityPrototype),
Please login to merge, or discard this patch.
module/Organizations/src/Organizations/Controller/IndexController.php 3 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -250,6 +250,9 @@
 block discarded – undo
250 250
         return $container;
251 251
     }
252 252
 
253
+    /**
254
+     * @param string $script
255
+     */
253 256
     protected function getErrorViewModel($script)
254 257
     {
255 258
         $this->getResponse()->setStatusCode(Response::STATUS_CODE_500);
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
         try {
125 125
             /* @var $handler \Organizations\Controller\Plugin\GetOrganizationHandler */
126 126
             $handler = $this->plugin('Organizations/GetOrganizationHandler');
127
-            $org  = $handler->process($this->params(), true);
127
+            $org = $handler->process($this->params(), true);
128 128
         } catch (MissingParentOrganizationException $e) {
129 129
             return $this->getErrorViewModel('no-parent');
130 130
         } catch (NotFoundException $e) {
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
             ];
136 136
         }
137 137
 
138
-        $container       = $this->getFormular($org);
138
+        $container = $this->getFormular($org);
139 139
 
140 140
         if (isset($formIdentifier) && $request->isPost()) {
141 141
             /* @var $form \Zend\Form\FormInterface */
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
             $form = $container->get($formIdentifier);
161 161
             $form->setData(array_merge($postData, $filesData));
162 162
             if (!isset($form)) {
163
-                throw new \RuntimeException('No form found for "' . $formIdentifier . '"');
163
+                throw new \RuntimeException('No form found for "'.$formIdentifier.'"');
164 164
             }
165 165
             $isValid = $form->isValid();
166 166
 
Please login to merge, or discard this patch.
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -56,33 +56,33 @@
 block discarded – undo
56 56
      */
57 57
     private $repository;
58 58
 	
59
-	/**
60
-	 * @var FormElementManagerV3Polyfill
61
-	 */
59
+    /**
60
+     * @var FormElementManagerV3Polyfill
61
+     */
62 62
     private $formManager;
63 63
     
64 64
     private $viewHelper;
65 65
 	
66
-	/**
67
-	 * @var TranslatorInterface
68
-	 */
66
+    /**
67
+     * @var TranslatorInterface
68
+     */
69 69
     private $translator;
70 70
 	
71
-	/**
72
-	 * Create new controller instance
73
-	 *
74
-	 * @param Form\Organizations $form
75
-	 * @param Repository\Organization $repository
76
-	 * @param TranslatorInterface $translator
77
-	 * @param $formManager
78
-	 * @param $viewHelper
79
-	 */
71
+    /**
72
+     * Create new controller instance
73
+     *
74
+     * @param Form\Organizations $form
75
+     * @param Repository\Organization $repository
76
+     * @param TranslatorInterface $translator
77
+     * @param $formManager
78
+     * @param $viewHelper
79
+     */
80 80
     public function __construct(
81
-    	Form\Organizations $form,
82
-	    Repository\Organization $repository,
83
-		TranslatorInterface $translator,
84
-		$formManager,
85
-		$viewHelper
81
+        Form\Organizations $form,
82
+        Repository\Organization $repository,
83
+        TranslatorInterface $translator,
84
+        $formManager,
85
+        $viewHelper
86 86
     )
87 87
     {
88 88
         $this->repository = $repository;
Please login to merge, or discard this patch.
module/Settings/src/Settings/Form/FormAbstract.php 1 patch
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -31,6 +31,11 @@  discard block
 block discarded – undo
31 31
         return $this->hydrator;
32 32
     }
33 33
     
34
+    /**
35
+     * @param string $name
36
+     *
37
+     * @return callable
38
+     */
34 39
     protected function getPlugin($name)
35 40
     {
36 41
         $plugin = null;
@@ -69,6 +74,9 @@  discard block
 block discarded – undo
69 74
         $this->add($this->formManager->get('DefaultButtonsFieldset'));
70 75
     }
71 76
     
77
+    /**
78
+     * @return string
79
+     */
72 80
     abstract public function getCoreFieldset();
73 81
     
74 82
     /**
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/AdminControllerEvent.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
      *
62 62
      * @return self
63 63
      */
64
-    public function addViewModel($name, $model, $priority=0)
64
+    public function addViewModel($name, $model, $priority = 0)
65 65
     {
66 66
         $this->models->insert($name, $model, $priority);
67 67
 
Please login to merge, or discard this patch.
module/Core/src/Core/Form/View/Helper/FormElement.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,5 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
-
4 3
  */
5 4
 
6 5
 namespace Core\Form\View\Helper;
Please login to merge, or discard this patch.