Completed
Push — develop ( 321e68...dce9ea )
by Carsten
09:20
created
module/Core/src/Core/Entity/ClonePropertiesTrait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
                     $collection->add(clone $item);
48 48
                 }
49 49
                 $value = $collection;
50
-            } elseif(null === $value) {
50
+            } elseif (null === $value) {
51 51
 
52 52
             } else {
53 53
                 $value = clone $value;
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Form/JobboardSearch.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
     public function init()
46 46
     {
47
-        $this->setAttribute('id','jobs-list-filter');
47
+        $this->setAttribute('id', 'jobs-list-filter');
48 48
         $this->setOption('text_span', 5);
49 49
         parent::init();
50 50
         $this->setButtonElement('q');
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
                 ),
84 84
                 'attributes' => [
85 85
                     'value'            => '10', // default distance
86
-                    'data-searchbox'   => -1,  // hide the search box
86
+                    'data-searchbox'   => -1, // hide the search box
87 87
                     'data-allowclear'  => 'false', // allow to clear a selected value
88 88
                     'data-placeholder' => /*@translate*/ 'Distance',
89 89
                     'data-width'       => '100%',
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/SearchForm.php 2 patches
Doc Comments   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -46,10 +46,8 @@
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,11 +72,11 @@
 block discarded – undo
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 ?: clone $this->getController()->getRequest()->getQuery();
79
+        $params = $params ?: clone $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
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Repository/Filter/PaginationQuery.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -85,10 +85,10 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
module/Core/src/Core/Entity/AbstractLocation.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
                     ? [
70 70
                         'type' => $coords->getType(),
71 71
                         'coordinates' => $coords->getCoordinates(),
72
-                      ]
72
+                        ]
73 73
                     : null
74 74
 
75 75
         ];
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -90,14 +90,14 @@  discard block
 block discarded – undo
90 90
         
91 91
         $str = '';
92 92
         if ($street) { $str .= $street; if (!$number) { $str .= ', '; } }
93
-        if ($number) { $str .= ' ' . $number . ', '; }
94
-        if ($postalCode) { $str .= $postalCode . ' '; }
93
+        if ($number) { $str .= ' '.$number.', '; }
94
+        if ($postalCode) { $str .= $postalCode.' '; }
95 95
         if ($city) { $str .= $city; }
96
-        if ($region) { $str .= ', ' . $region; }
97
-        if ($country) { $str .= ', ' . $country; }
96
+        if ($region) { $str .= ', '.$region; }
97
+        if ($country) { $str .= ', '.$country; }
98 98
         if ($coords) {
99 99
             $coords = $coords->getCoordinates();
100
-            $str .= ' ( ' . join(', ', $coords) . ' )';
100
+            $str .= ' ( '.join(', ', $coords).' )';
101 101
         }
102 102
         
103 103
         return $str;
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
             if (!$value) { continue; }
139 139
 
140 140
             if ('coordinates' == $key) {
141
-                $class = '\\Geo\\Entity\\Geometry\\' . $value['type'];
141
+                $class = '\\Geo\\Entity\\Geometry\\'.$value['type'];
142 142
                 $value = new $class($value['coordinates']);
143 143
             }
144 144
 
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/Service/Photon.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -63,16 +63,16 @@
 block discarded – undo
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'] = [
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -28,11 +28,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
module/Geo/src/Geo/Form/GeoSelectHydratorStrategy.php 2 patches
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.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
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
     }
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.