@@ -46,10 +46,8 @@ |
||
46 | 46 | * |
47 | 47 | * Proxies to {@link get()} |
48 | 48 | * |
49 | - * @param string|array $elementsFieldset |
|
50 | - * @param null|string $buttonsFieldset |
|
51 | 49 | * |
52 | - * @return \Core\Form\TextSearchForm |
|
50 | + * @return \Core\Form\SearchForm |
|
53 | 51 | */ |
54 | 52 | public function __invoke($form, $options = null, $params = null) |
55 | 53 | { |
@@ -72,11 +72,11 @@ |
||
72 | 72 | public function get($form, $options = null, $params = null) |
73 | 73 | { |
74 | 74 | if (!is_object($form)) { |
75 | - $form = $this->formElementManager->get($form, $options); |
|
75 | + $form = $this->formElementManager->get($form, $options); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** @noinspection PhpUndefinedMethodInspection */ |
79 | - $params = $params ?: $this->getController()->getRequest()->getQuery(); |
|
79 | + $params = $params ?: $this->getController()->getRequest()->getQuery(); |
|
80 | 80 | |
81 | 81 | /* I tried using form methods (bind, isValid)... |
82 | 82 | * but because the search form could be in an invalidated state |
@@ -85,10 +85,10 @@ |
||
85 | 85 | if (isset($params['l'])) { |
86 | 86 | |
87 | 87 | $coords = $params['l']->getCoordinates()->getCoordinates(); |
88 | - $queryBuilder->field('locations.coordinates')->geoWithinCenter((float) $coords[0], (float) $coords[1], (float) $this->value['d']/100); |
|
88 | + $queryBuilder->field('locations.coordinates')->geoWithinCenter((float) $coords[0], (float) $coords[1], (float) $this->value['d'] / 100); |
|
89 | 89 | } |
90 | 90 | |
91 | - if (isset($params['channel']) && !empty($params['channel']) && $params['channel']!="default" ){ |
|
91 | + if (isset($params['channel']) && !empty($params['channel']) && $params['channel'] != "default") { |
|
92 | 92 | $queryBuilder->field('portals')->equals($params['channel']); |
93 | 93 | } |
94 | 94 |
@@ -54,13 +54,13 @@ discard block |
||
54 | 54 | |
55 | 55 | $locationsStrategy = new \Zend\Hydrator\Strategy\ClosureStrategy( |
56 | 56 | /* extract */ |
57 | - function ($value) use ($geoLocationStrategy) |
|
57 | + function($value) use ($geoLocationStrategy) |
|
58 | 58 | { |
59 | 59 | return $geoLocationStrategy->extract($value->first()); |
60 | 60 | }, |
61 | 61 | |
62 | 62 | /* hydrate */ |
63 | - function ($value) use ($geoLocationStrategy) |
|
63 | + function($value) use ($geoLocationStrategy) |
|
64 | 64 | { |
65 | 65 | return new ArrayCollection([$geoLocationStrategy->hydrate($value)]); |
66 | 66 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | $loc = $this->object->getLocations()->first(); |
112 | 112 | if (!$loc) { return ''; } |
113 | 113 | |
114 | - $value = $loc->getPostalCode() . ' ' . $loc->getCity() . ', ' . $loc->getRegion(); |
|
114 | + $value = $loc->getPostalCode().' '.$loc->getCity().', '.$loc->getRegion(); |
|
115 | 115 | $value = trim($value, ' ,'); |
116 | 116 | |
117 | 117 | return $value; |
@@ -69,7 +69,7 @@ |
||
69 | 69 | ? [ |
70 | 70 | 'type' => $coords->getType(), |
71 | 71 | 'coordinates' => $coords->getCoordinates(), |
72 | - ] |
|
72 | + ] |
|
73 | 73 | : null |
74 | 74 | |
75 | 75 | ]; |
@@ -85,7 +85,7 @@ |
||
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 |
@@ -67,7 +67,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -33,7 +33,7 @@ |
||
33 | 33 | $select = new GeoSelect(); |
34 | 34 | |
35 | 35 | //$select->setAttribute('data-type', $geoOptions->getPlugin()); |
36 | - $select->setAttribute('data-uri', 'geo/' . $geoOptions->getPlugin()); |
|
36 | + $select->setAttribute('data-uri', 'geo/'.$geoOptions->getPlugin()); |
|
37 | 37 | |
38 | 38 | $client = $container->get('Geo/Client'); |
39 | 39 | $strategy = new GeoSelectHydratorStrategy($client); |
@@ -40,7 +40,7 @@ |
||
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, ',')) { |
@@ -63,16 +63,16 @@ |
||
63 | 63 | |
64 | 64 | foreach ($result as $key => $val) { |
65 | 65 | $row=[ |
66 | - 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
67 | - 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
68 | - 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
69 | - 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
70 | - 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
66 | + 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
67 | + 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
68 | + 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
69 | + 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
70 | + 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
71 | 71 | |
72 | - 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
73 | - 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
74 | - //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()), |
|
75 | - //'data' => json_encode($val), |
|
72 | + 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
73 | + 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
74 | + //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()), |
|
75 | + //'data' => json_encode($val), |
|
76 | 76 | ]; |
77 | 77 | if ($val->geometry) { |
78 | 78 | $row['coordinates'] = [ |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | $client->setMethod('GET'); |
29 | 29 | |
30 | 30 | $osmTags = [ |
31 | - 'tourism','aeroway','railway', 'amenity', 'historic', 'tunnel', 'mountain_pass', |
|
31 | + 'tourism', 'aeroway', 'railway', 'amenity', 'historic', 'tunnel', 'mountain_pass', |
|
32 | 32 | 'leisure', 'natural', 'bridge', 'waterway' |
33 | 33 | ]; |
34 | 34 | |
35 | - $osmTags = array_map(function($i) { return urlencode('!' . $i); }, $osmTags); |
|
35 | + $osmTags = array_map(function($i) { return urlencode('!'.$i); }, $osmTags); |
|
36 | 36 | |
37 | 37 | $uri = sprintf( |
38 | 38 | '%s?osm_tag=%s', |
@@ -59,12 +59,12 @@ discard block |
||
59 | 59 | { |
60 | 60 | $result = json_decode($result); |
61 | 61 | $result = $result->features; |
62 | - $r=[]; |
|
62 | + $r = []; |
|
63 | 63 | |
64 | 64 | foreach ($result as $key => $val) { |
65 | - $row=[ |
|
66 | - 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
67 | - 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
65 | + $row = [ |
|
66 | + 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode : ''), |
|
67 | + 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city : ''), |
|
68 | 68 | 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
69 | 69 | 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
70 | 70 | 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | ]; |
82 | 82 | } |
83 | 83 | $row['id'] = json_encode($row); |
84 | - $r[]=$row; |
|
84 | + $r[] = $row; |
|
85 | 85 | } |
86 | 86 | return $r; |
87 | 87 | } |
@@ -72,10 +72,10 @@ |
||
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 | } |
@@ -75,7 +75,7 @@ |
||
75 | 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 | } |