Completed
Pull Request — develop (#359)
by Mathias
23:51
created
module/Core/src/Core/Entity/AbstractLocation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@
 block discarded – undo
85 85
             if (!$value) { continue; }
86 86
 
87 87
             if ('coordinates' == $key) {
88
-                $class = '\\Geo\\Entity\\Geometry\\' . $value['type'];
88
+                $class = '\\Geo\\Entity\\Geometry\\'.$value['type'];
89 89
                 $value = new $class($value['coordinates']);
90 90
             }
91 91
 
Please login to merge, or discard this patch.
module/Core/src/Core/Form/View/Helper/SummaryForm.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         $renderer->headscript()->appendFile($renderer->basePath('Core/js/jquery.summary-form.js'));
68 68
         
69 69
         $label = $form->getLabel();
70
-        $labelContent = $label ? '<div class="sf-headline"><h3>' . $this->getView()->translate($label) . '</h3></div>' : '';
70
+        $labelContent = $label ? '<div class="sf-headline"><h3>'.$this->getView()->translate($label).'</h3></div>' : '';
71 71
         $formContent  = $this->renderForm($form, $layout, $parameter);
72 72
         $summaryContent = $this->renderSummary($form);
73 73
         
@@ -131,8 +131,8 @@  discard block
 block discarded – undo
131 131
     public function renderForm(SummaryFormInterface $form, $layout = Form::LAYOUT_HORIZONTAL, $parameter = array())
132 132
     {
133 133
                                                     /* @var $form SummaryFormInterface|\Core\Form\SummaryForm */
134
-        $renderer     = $this->getView();           /* @var $renderer \Zend\View\Renderer\PhpRenderer */
135
-        $formHelper   = $renderer->plugin('form');  /* @var $formHelper \Core\Form\View\Helper\Form */
134
+        $renderer     = $this->getView(); /* @var $renderer \Zend\View\Renderer\PhpRenderer */
135
+        $formHelper   = $renderer->plugin('form'); /* @var $formHelper \Core\Form\View\Helper\Form */
136 136
         $fieldset     = $form->getBaseFieldset();
137 137
         $resetPartial = false;
138 138
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
         $form->prepare();
167 167
         $baseFieldset = $form->getBaseFieldset();
168 168
         if (!isset($baseFieldset)) {
169
-            throw new \InvalidArgumentException('For the Form ' . get_class($form) . ' there is no Basefieldset');
169
+            throw new \InvalidArgumentException('For the Form '.get_class($form).' there is no Basefieldset');
170 170
         }
171 171
 
172 172
         $dataAttributesMarkup = '';
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
             }
180 180
         }
181 181
         
182
-        $markup = '<div class="panel panel-default" style="min-height: 100px;"' . $dataAttributesMarkup . '>
182
+        $markup = '<div class="panel panel-default" style="min-height: 100px;"'.$dataAttributesMarkup.'>
183 183
                     <div class="panel-body"><div class="sf-controls">%s</div>%s</div></div>';
184 184
 
185 185
         $view = $this->getView();
@@ -192,9 +192,9 @@  discard block
 block discarded – undo
192 192
         
193 193
         if (($controlButtons = $form->getOption('control_buttons')) !== null)
194 194
         {
195
-            $buttonMarkup .= PHP_EOL . implode(PHP_EOL, array_map(function (array $buttonSpec) use ($view) {
196
-                return '<button type="button" class="btn btn-default btn-xs' . (isset($buttonSpec['class']) ? ' ' . $buttonSpec['class'] : '') . '">'
197
-                    . (isset($buttonSpec['icon']) ? '<span class="yk-icon yk-icon-' . $buttonSpec['icon'] . '"></span> ' : '')
195
+            $buttonMarkup .= PHP_EOL.implode(PHP_EOL, array_map(function(array $buttonSpec) use ($view) {
196
+                return '<button type="button" class="btn btn-default btn-xs'.(isset($buttonSpec['class']) ? ' '.$buttonSpec['class'] : '').'">'
197
+                    . (isset($buttonSpec['icon']) ? '<span class="yk-icon yk-icon-'.$buttonSpec['icon'].'"></span> ' : '')
198 198
                     . $view->translate($buttonSpec['label'])
199 199
                     . '</button>';
200 200
             }, $controlButtons));
@@ -234,10 +234,10 @@  discard block
 block discarded – undo
234 234
         }
235 235
 
236 236
         if ($element instanceof ViewPartialProviderInterface) {
237
-            $renderer    = $this->getView();                 /* @var $renderer \Zend\View\Renderer\PhpRenderer */
237
+            $renderer    = $this->getView(); /* @var $renderer \Zend\View\Renderer\PhpRenderer */
238 238
             $origPartial = $element->getViewPartial();
239 239
             $partial     = "$origPartial.view";
240
-            $partialParams  = array(
240
+            $partialParams = array(
241 241
                 'element' => $element
242 242
             );
243 243
             if (!$renderer->resolver($partial)) {
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
         
254 254
         if ($element instanceof FieldsetInterface) {
255 255
             if (!$element instanceof FormInterface && $label) {
256
-                $markup .= '<h4>' . $label . '</h4>';
256
+                $markup .= '<h4>'.$label.'</h4>';
257 257
             }
258 258
             foreach ($element as $el) {
259 259
                 $markup .= $this->renderSummaryElement($el);
@@ -284,11 +284,11 @@  discard block
 block discarded – undo
284 284
                             if (!is_array($optVal) || !array_key_exists($optionKey, $optVal['options'])) { continue; }
285 285
 
286 286
                             $optGroupLabel = isset($optVal['label']) ? $translator->translate($optVal['label']) : $optKey;
287
-                            $multiOptions[] = $optGroupLabel . ' | ' . $translator->translate($optVal['options'][$optionKey]);
287
+                            $multiOptions[] = $optGroupLabel.' | '.$translator->translate($optVal['options'][$optionKey]);
288 288
                         }
289 289
                     }
290 290
 
291
-                    $elementValue = '<ul><li>' . join('</li><li>' , $multiOptions) . '</li></ul>';
291
+                    $elementValue = '<ul><li>'.join('</li><li>', $multiOptions).'</li></ul>';
292 292
 
293 293
                 } else {
294 294
                     $elementValue = $translator->translate($options[$elementValue]);
@@ -303,10 +303,10 @@  discard block
 block discarded – undo
303 303
         $markup .= '<div class="row">';
304 304
         $col = 12;
305 305
         if ($label) {
306
-            $markup .= '<div class="col-md-3 yk-label"><label>' . $label . '</label></div>';
306
+            $markup .= '<div class="col-md-3 yk-label"><label>'.$label.'</label></div>';
307 307
             $col = 9;
308 308
         }
309
-        $markup .= '<div class="col-md-' . $col . '">' . $elementValue . '</div>'
309
+        $markup .= '<div class="col-md-'.$col.'">'.$elementValue.'</div>'
310 310
             . '</div>';
311 311
         return $markup;
312 312
     }
Please login to merge, or discard this patch.
module/Geo/src/Geo/Service/Geo.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
     {
41 41
         $result = json_decode($result, JSON_OBJECT_AS_ARRAY);
42 42
 
43
-        $r=[];
43
+        $r = [];
44 44
         foreach ($result["result"] as $val) {
45 45
             $coords = $this->queryCoords($val);
46 46
             if (false !== strpos($val, ',')) {
Please login to merge, or discard this patch.
module/Geo/src/Geo/Form/GeoSelectHydratorStrategy.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,10 +72,10 @@
 block discarded – undo
72 72
         if (0 === strpos($value, '{')) {
73 73
             return $value;
74 74
         }
75
-        if ($value){
75
+        if ($value) {
76 76
             $data = $this->geoClient->queryOne($value);
77 77
             return $data['id'];
78
-        }else{
78
+        } else {
79 79
             return;
80 80
         }
81 81
     }
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Controller/Plugin/InitializeJob.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
43 43
 
44 44
     public function __construct(RepositoryService $repositoryService, AuthenticationService $auth, Acl $acl)
45 45
     {
46
-        $this->repositoryService=$repositoryService;
47
-        $this->auth=$auth;
48
-        $this->acl=$acl;
46
+        $this->repositoryService = $repositoryService;
47
+        $this->auth = $auth;
48
+        $this->acl = $acl;
49 49
     }
50 50
 
51 51
     public function __invoke()
@@ -64,12 +64,12 @@  discard block
 block discarded – undo
64 64
     public function get(Params $params, $allowDraft = false, $getSnapshot = false)
65 65
     {
66 66
         /* @var \Jobs\Repository\Job $jobRepository */
67
-        $jobRepository  = $this->repositoryService->get('Jobs/Job');
67
+        $jobRepository = $this->repositoryService->get('Jobs/Job');
68 68
         $idFromRoute   = $params('id', 0);
69 69
         $idFromQuery   = $params->fromQuery('id', 0);
70 70
         $idFromSubForm = $params->fromPost('job', 0);
71 71
 
72
-        $id = empty($idFromRoute)? (empty($idFromQuery)?$idFromSubForm:$idFromQuery) : $idFromRoute;
72
+        $id = empty($idFromRoute) ? (empty($idFromQuery) ? $idFromSubForm : $idFromQuery) : $idFromRoute;
73 73
         $snapshotId = $params->fromPost('snapshot') ?: ($params->fromQuery('snapshot') ?: null);
74 74
 
75 75
         if (empty($id) && empty($snapshotId) && $allowDraft) {
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/View/Helper/AdminEditLink.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,6 +65,6 @@
 block discarded – undo
65 65
                 'admin' => 1,
66 66
             ]],
67 67
             true
68
-        ) . '&return=' . $this->returnUrl;
68
+        ).'&return='.$this->returnUrl;
69 69
     }
70 70
 }
71 71
\ No newline at end of file
Please login to merge, or discard this patch.
module/Geo/src/Geo/Form/GeoSelectSimple.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
                 if (0 === strpos($value, '{')) {
63 63
                     return $value;
64 64
                 }
65
-                if ($value){
65
+                if ($value) {
66 66
                     foreach ($this->getValueOptions() as $optValue => $opt) {
67 67
                         if (false !== strpos($value, $opt)) {
68 68
                             return $optValue;
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
             },
76 76
 
77 77
             /* hydrate */
78
-            function ($value) {
78
+            function($value) {
79 79
                 if (empty($value) || 0 !== strpos($value, '{')) {
80 80
                     return null;
81 81
                 }
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Options/BaseFieldsetOptions.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 class BaseFieldsetOptions extends FieldsetCustomizationOptions
25 25
 {
26 26
 
27
-    const TITLE =  'title';
27
+    const TITLE = 'title';
28 28
     const LOCATION = 'geoLocation';
29 29
 
30 30
     /**
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
      *
33 33
      * @var array
34 34
      */
35
-   protected $fields=[
35
+   protected $fields = [
36 36
         self::TITLE => [
37 37
             'enabled' => true,
38 38
             'options' => [
Please login to merge, or discard this patch.
module/Core/src/Core/Form/View/Helper/SearchForm.php 1 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.