Completed
Pull Request — develop (#349)
by ANTHONIUS
06:14
created
module/Core/src/Core/Form/Element/Phone.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,10 +14,10 @@
 block discarded – undo
14 14
     protected $validator;
15 15
 
16 16
     /**
17
-    * Get a validator if none has been set.
18
-    * https://github.com/posabsolute/jQuery-Validation-Engine/issues/265
19
-    * @return RegexValidator
20
-    */
17
+     * Get a validator if none has been set.
18
+     * https://github.com/posabsolute/jQuery-Validation-Engine/issues/265
19
+     * @return RegexValidator
20
+     */
21 21
     public function getValidator()
22 22
     {
23 23
         if (null === $this->validator) {
Please login to merge, or discard this patch.
module/Geo/src/Geo/Controller/Plugin/Photon.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
     /**
18 18
      * @param string $par Query Parameter
19 19
      * @param string $geoCoderUrl Url of the geo location service
20
-     * @param string $land language
20
+     * @param string $lang language
21 21
      *
22 22
      * @return array|mixed|string
23 23
      */
Please login to merge, or discard this patch.
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -51,16 +51,16 @@
 block discarded – undo
51 51
         $r=[];
52 52
         foreach ($result as $key => $val) {
53 53
             $row=['name' => (property_exists($val->properties, 'name') ? $val->properties->name:''),
54
-                  'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''),
55
-                  'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''),
56
-                  'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''),
57
-                  'state' => (property_exists($val->properties, 'state') ? $val->properties->state : ''),
58
-                  'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''),
59
-                  'coordinates' => implode(":", $val->geometry->coordinates),
60
-                  'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''),
61
-                  'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''),
62
-                  'osm_id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : ''),
63
-                  'data' => json_encode($val),
54
+                    'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''),
55
+                    'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''),
56
+                    'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''),
57
+                    'state' => (property_exists($val->properties, 'state') ? $val->properties->state : ''),
58
+                    'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''),
59
+                    'coordinates' => implode(":", $val->geometry->coordinates),
60
+                    'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''),
61
+                    'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''),
62
+                    'osm_id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : ''),
63
+                    'data' => json_encode($val),
64 64
             ];
65 65
             $r[]=$row;
66 66
         }
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -27,11 +27,11 @@  discard block
 block discarded – undo
27 27
         $client->setMethod('GET');
28 28
 
29 29
         $osmTags = [
30
-            'tourism','aeroway','railway', 'amenity', 'historic', 'tunnel', 'mountain_pass',
30
+            'tourism', 'aeroway', 'railway', 'amenity', 'historic', 'tunnel', 'mountain_pass',
31 31
             'leisure', 'natural', 'bridge', 'waterway'
32 32
         ];
33 33
 
34
-        $osmTags = array_map(function($i) { return urlencode('!' . $i); }, $osmTags);
34
+        $osmTags = array_map(function($i) { return urlencode('!'.$i); }, $osmTags);
35 35
 
36 36
         $uri = sprintf(
37 37
             '%s?q=%s&lang=%s&osm_tag=%s',
@@ -48,11 +48,11 @@  discard block
 block discarded – undo
48 48
         $result = $response->getBody();
49 49
         $result = json_decode($result);
50 50
         $result = $result->features;
51
-        $r=[];
51
+        $r = [];
52 52
         foreach ($result as $key => $val) {
53
-            $row=['name' => (property_exists($val->properties, 'name') ? $val->properties->name:''),
54
-                  'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''),
55
-                  'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''),
53
+            $row = ['name' => (property_exists($val->properties, 'name') ? $val->properties->name : ''),
54
+                  'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode : ''),
55
+                  'city' =>(property_exists($val->properties, 'city') ? $val->properties->city : ''),
56 56
                   'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''),
57 57
                   'state' => (property_exists($val->properties, 'state') ? $val->properties->state : ''),
58 58
                   'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''),
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
                   'osm_id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : ''),
63 63
                   'data' => json_encode($val),
64 64
             ];
65
-            $r[]=$row;
65
+            $r[] = $row;
66 66
         }
67 67
         return $r;
68 68
     }
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/CreatePaginatorService.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
      * @param array $defaultParams
31 31
      * @param bool  $usePostParams
32 32
      *
33
-     * @return mixed
33
+     * @return ZendPaginator
34 34
      */
35 35
     public function __invoke($paginatorName, $defaultParams = array(), $usePostParams = false)
36 36
     {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,11 +61,11 @@
 block discarded – undo
61 61
         $paginatorManager = $this->serviceManager->get('Core/PaginatorService');
62 62
         $paginator = $paginatorManager->get($paginatorName);
63 63
         if (!isset($paginator) || !$paginator instanceof ZendPaginator) {
64
-            throw new \RuntimeException('Could not create paginator ' . $paginatorName);
64
+            throw new \RuntimeException('Could not create paginator '.$paginatorName);
65 65
         }
66 66
         $adapter = $paginator->getAdapter();
67 67
         if (!isset($adapter) || !$adapter instanceof AdapterInterface) {
68
-            throw new \RuntimeException('Paginator ' . $paginatorName . ' has no Adapter');
68
+            throw new \RuntimeException('Paginator '.$paginatorName.' has no Adapter');
69 69
         }
70 70
 
71 71
         $params     = $usePostParams
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
 
82 82
         $adapter->setParams($params);
83 83
         $paginator->setCurrentPageNumber($params->get('page', 1))
84
-                  ->setItemCountPerPage($params->get('count', 10));
84
+                    ->setItemCountPerPage($params->get('count', 10));
85 85
 
86 86
         return $paginator;
87 87
     }
Please login to merge, or discard this patch.
module/Core/src/Core/Form/Form.php 3 patches
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,6 +77,7 @@  discard block
 block discarded – undo
77 77
 
78 78
     /**
79 79
      * @param string $description
80
+     * @param double[] $params
80 81
      *
81 82
      * @return $this
82 83
      */
@@ -258,7 +259,7 @@  discard block
 block discarded – undo
258 259
     }
259 260
 
260 261
     /**
261
-     * @param $spec
262
+     * @param string $spec
262 263
      *
263 264
      * @return $this
264 265
      */
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
      *
81 81
      * @return $this
82 82
      */
83
-    public function setDescription($description,$params = null)
83
+    public function setDescription($description, $params = null)
84 84
     {
85 85
         $this->options['description'] = $description;
86 86
         $this->options['description_params'] = $params;
@@ -350,9 +350,9 @@  discard block
 block discarded – undo
350 350
                 if (!$inputExists && $required) {
351 351
                     $fieldsetName = '';
352 352
                     if ($fieldset->hasAttribute('name')) {
353
-                        $fieldsetName = 'in Fieldset "' . $fieldset->getAttribute('name') . '" ';
353
+                        $fieldsetName = 'in Fieldset "'.$fieldset->getAttribute('name').'" ';
354 354
                     }
355
-                    throw new \RuntimeException('input for "' . $name . '" ' . $fieldsetName . 'is required but a input-field with this name is not defined');
355
+                    throw new \RuntimeException('input for "'.$name.'" '.$fieldsetName.'is required but a input-field with this name is not defined');
356 356
                 }
357 357
             }
358 358
         }
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@
 block discarded – undo
24 24
  * @author Mathias Gelhausen <[email protected]>
25 25
  */
26 26
 class Form extends ZendForm implements DescriptionAwareFormInterface,
27
-                                       DisableElementsCapableInterface,
28
-                                       FormParentInterface
27
+                                        DisableElementsCapableInterface,
28
+                                        FormParentInterface
29 29
 {
30 30
     
31 31
     use EventManagerAwareTrait, HydratorStrategyAwareTrait;
Please login to merge, or discard this patch.
src/Organizations/Entity/Hydrator/Strategy/HttploadStrategy.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,6 @@
 block discarded – undo
32 32
     }
33 33
 
34 34
     /**
35
-     * @param mixed $value$organizationImageEntity
36 35
      *
37 36
      * @return mixed
38 37
      */
Please login to merge, or discard this patch.
module/Organizations/src/Organizations/Entity/Template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
      */
82 82
     public function setLabelQualifications($labelQualifications)
83 83
     {
84
-        $this->labelQualifications=$labelQualifications;
84
+        $this->labelQualifications = $labelQualifications;
85 85
         return $this;
86 86
     }
87 87
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
      */
105 105
     public function setLabelBenefits($labelBenefits)
106 106
     {
107
-        $this->labelBenefits=$labelBenefits;
107
+        $this->labelBenefits = $labelBenefits;
108 108
         return $this;
109 109
     }
110 110
 
Please login to merge, or discard this patch.
module/Core/src/Core/Form/View/Helper/FormEditor.php 3 patches
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.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -134,8 +134,8 @@
 block discarded – undo
134 134
             $elementOptions = $element->getOptions();
135 135
             if (array_key_exists('placeholder', $elementOptions) && !empty($elementOptions['placeholder'])) {
136 136
                 $placeHolder = '<div id="placeholder-' . $name . '" style="border: 0 none; position: relative; top: 0ex; left: 10px; color: #aaa; height: 0px; overflow: visible;' .
137
-                               (empty($content)?'':'display:none;') .
138
-                               '">' . $this->translator->translate($elementOptions['placeholder']) . '</div>';
137
+                                (empty($content)?'':'display:none;') .
138
+                                '">' . $this->translator->translate($elementOptions['placeholder']) . '</div>';
139 139
             }
140 140
             return
141 141
                 $placeHolder
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
      *
44 44
      * @var string
45 45
      */
46
-    protected $language="de";
46
+    protected $language = "de";
47 47
 
48 48
     /**
49 49
      * @var
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
      */
58 58
     public function render(ElementInterface $element)
59 59
     {
60
-        $name   = $element->getName();
60
+        $name = $element->getName();
61 61
         if (empty($name) && $name !== 0) {
62 62
             throw new \DomainException(
63 63
                 sprintf(
@@ -78,10 +78,10 @@  discard block
 block discarded – undo
78 78
         $headscript->prependFile($basepath('/assets/jquery/jquery.min.js'));
79 79
 
80 80
         $headscript->offsetSetScript(
81
-            '1000_tinymce_' . $this->getTheme(),
81
+            '1000_tinymce_'.$this->getTheme(),
82 82
             '
83 83
             $(document).ready(function() {
84
-            tinyMCE.init({' . $this->additionalOptions() . ',
84
+            tinyMCE.init({' . $this->additionalOptions().',
85 85
                  setup:  function(editor) {
86 86
                     setPlaceHolder = function(editor, show) {
87 87
                         placeHolder = $("#placeholder-" + editor.id);
@@ -127,15 +127,15 @@  discard block
 block discarded – undo
127 127
         }
128 128
         if (is_string($content)) {
129 129
 
130
-            $class = array_key_exists('class', $attributes)?$attributes['class']:'';
131
-            $class .= (empty($class)?:' ') . ' tinymce_' . $this->getTheme();
130
+            $class = array_key_exists('class', $attributes) ? $attributes['class'] : '';
131
+            $class .= (empty($class) ?: ' ').' tinymce_'.$this->getTheme();
132 132
             $attributes['class'] = $class;
133 133
             $placeHolder = '';
134 134
             $elementOptions = $element->getOptions();
135 135
             if (array_key_exists('placeholder', $elementOptions) && !empty($elementOptions['placeholder'])) {
136
-                $placeHolder = '<div id="placeholder-' . $name . '" style="border: 0 none; position: relative; top: 0ex; left: 10px; color: #aaa; height: 0px; overflow: visible;' .
137
-                               (empty($content)?'':'display:none;') .
138
-                               '">' . $this->translator->translate($elementOptions['placeholder']) . '</div>';
136
+                $placeHolder = '<div id="placeholder-'.$name.'" style="border: 0 none; position: relative; top: 0ex; left: 10px; color: #aaa; height: 0px; overflow: visible;'.
137
+                               (empty($content) ? '' : 'display:none;').
138
+                               '">'.$this->translator->translate($elementOptions['placeholder']).'</div>';
139 139
             }
140 140
             return
141 141
                 $placeHolder
@@ -162,9 +162,9 @@  discard block
 block discarded – undo
162 162
 
163 163
     protected function additionalOptions()
164 164
     {
165
-        $str = json_encode($this->options, ~JSON_HEX_QUOT & ~JSON_FORCE_OBJECT  );
166
-        $str = preg_replace('/"([a-zA-Z_]+[a-zA-Z0-9_]*)":/','$1:',$str);
167
-        return  trim($str,'{}');
165
+        $str = json_encode($this->options, ~JSON_HEX_QUOT & ~JSON_FORCE_OBJECT);
166
+        $str = preg_replace('/"([a-zA-Z_]+[a-zA-Z0-9_]*)":/', '$1:', $str);
167
+        return  trim($str, '{}');
168 168
     }
169 169
 
170 170
     /**
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
      * @param $language
174 174
      */
175 175
     public function setLanguage($language) {
176
-        $this->language=$language;
176
+        $this->language = $language;
177 177
     }
178 178
 
179 179
     /**
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
      * @param $languagePath
183 183
      */
184 184
     public function setLanguagePath($languagePath) {
185
-        $this->languagePath=$languagePath;
185
+        $this->languagePath = $languagePath;
186 186
     }
187 187
 
188 188
     /**
@@ -191,14 +191,14 @@  discard block
 block discarded – undo
191 191
      * @param $name
192 192
      * @param $value
193 193
      */
194
-    public function setOption($name,$value){
194
+    public function setOption($name, $value) {
195 195
         if (array_key_exists($name, $this->options)) {
196 196
             $this->options[$name] = $value;
197
-        }elseif ('language' == $name or 'language_url' == $name ) {
197
+        }elseif ('language' == $name or 'language_url' == $name) {
198 198
             $this->options[$name] = $value;
199 199
 
200
-        }else{
201
-            throw new \InvalidArgumentException('Unknown Option ' . $name . ' in ' .  __FILE__ . ' Line ' . __LINE__ );
200
+        } else {
201
+            throw new \InvalidArgumentException('Unknown Option '.$name.' in '.__FILE__.' Line '.__LINE__);
202 202
         }
203 203
     }
204 204
 
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
      */
210 210
     public function setOptions($options)
211 211
     {
212
-        foreach($options as $key => $val) {
212
+        foreach ($options as $key => $val) {
213 213
             $this->setOption($key, $val);
214 214
         }
215 215
     }
Please login to merge, or discard this patch.
module/Core/src/Core/Form/View/Helper/FormEditorLight.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,5 +19,5 @@
 block discarded – undo
19 19
 {
20 20
     protected $theme = 'light';
21 21
 
22
-    protected $languagePath="/js/tinymce-lang/";
22
+    protected $languagePath = "/js/tinymce-lang/";
23 23
 }
Please login to merge, or discard this patch.
module/Geo/src/Geo/Form/GeoText.php 3 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
     /**
71 71
      * Sets the converter
72 72
      *
73
-     * @param $converter
73
+     * @param Converter $converter
74 74
      *
75 75
      * @return $this
76 76
      */
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
     /**
156 156
      * Gets the data of an element
157 157
      *
158
-     * @return mixed
158
+     * @return Hidden
159 159
      */
160 160
     public function getDataElement()
161 161
     {
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
     /**
166 166
      * Gets the name of an element
167 167
      *
168
-     * @return mixed
168
+     * @return Text
169 169
      */
170 170
     public function getNameElement()
171 171
     {
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -144,12 +144,12 @@  discard block
 block discarded – undo
144 144
         $id = str_replace(array('[', ']'), array('-', ''), $name);
145 145
         $this->setAttribute('id', $id);
146 146
         $this->nameElement->setName($name . '[name]')
147
-                          ->setAttribute('id', $id . '-name')
148
-                          ->setAttribute('class', 'form-control geolocation');
147
+                            ->setAttribute('id', $id . '-name')
148
+                            ->setAttribute('class', 'form-control geolocation');
149 149
         $this->dataElement->setName($name . '[data]')
150
-                          ->setAttribute('id', $id . '-data');
150
+                            ->setAttribute('id', $id . '-data');
151 151
         $this->typeElement->setName($name . '[type]')
152
-                          ->setAttribute('id', $id . '-type');
152
+                            ->setAttribute('id', $id . '-type');
153 153
     }
154 154
 
155 155
     /**
@@ -215,8 +215,8 @@  discard block
 block discarded – undo
215 215
             $lon = $lat = 0;
216 216
             
217 217
             foreach($lonLat as $k=>$v) {
218
-                 list($lon,$lat) = explode(',', $v, 2);
219
-                 $latLon[]=$lat.','.$lon;
218
+                    list($lon,$lat) = explode(',', $v, 2);
219
+                    $latLon[]=$lat.','.$lon;
220 220
             }
221 221
 
222 222
             $value['data'] = [
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -143,13 +143,13 @@  discard block
 block discarded – undo
143 143
         $name = $this->getName();
144 144
         $id = str_replace(array('[', ']'), array('-', ''), $name);
145 145
         $this->setAttribute('id', $id);
146
-        $this->nameElement->setName($name . '[name]')
147
-                          ->setAttribute('id', $id . '-name')
146
+        $this->nameElement->setName($name.'[name]')
147
+                          ->setAttribute('id', $id.'-name')
148 148
                           ->setAttribute('class', 'form-control geolocation');
149
-        $this->dataElement->setName($name . '[data]')
150
-                          ->setAttribute('id', $id . '-data');
151
-        $this->typeElement->setName($name . '[type]')
152
-                          ->setAttribute('id', $id . '-type');
149
+        $this->dataElement->setName($name.'[data]')
150
+                          ->setAttribute('id', $id.'-data');
151
+        $this->typeElement->setName($name.'[type]')
152
+                          ->setAttribute('id', $id.'-type');
153 153
     }
154 154
 
155 155
     /**
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
      *
205 205
      * @return $this
206 206
      */
207
-    public function setValue($value, $type=null)
207
+    public function setValue($value, $type = null)
208 208
     {
209 209
         if ($value instanceOf LocationInterface) {
210 210
             $value = $this->getConverter()->toValue($value, $type ?: $this->typeElement->getValue());
@@ -221,9 +221,9 @@  discard block
 block discarded – undo
221 221
 
222 222
             $lon = $lat = 0;
223 223
             
224
-            foreach($lonLat as $k=>$v) {
225
-                 list($lon,$lat) = explode(',', $v, 2);
226
-                 $latLon[]=$lat.','.$lon;
224
+            foreach ($lonLat as $k=>$v) {
225
+                 list($lon, $lat) = explode(',', $v, 2);
226
+                 $latLon[] = $lat.','.$lon;
227 227
             }
228 228
 
229 229
             $value['data'] = [
@@ -232,8 +232,8 @@  discard block
 block discarded – undo
232 232
                     (float) $lon
233 233
                     ],
234 234
                 'type'=>'Point',
235
-                'city' => substr($value['name'],0,strrpos($value['name'], ',' )),
236
-                'region' =>  substr($value['name'],strrpos($value['name'], ',' )+2),
235
+                'city' => substr($value['name'], 0, strrpos($value['name'], ',')),
236
+                'region' =>  substr($value['name'], strrpos($value['name'], ',') + 2),
237 237
                 'postalcode' =>'',
238 238
                 'country' => 'DE'];
239 239
         }
Please login to merge, or discard this patch.