Completed
Push — develop ( 037ef6...a650ad )
by Carsten
06:58
created
module/Geo/src/Geo/Service/Geo.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 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, ',')) {
@@ -57,8 +57,8 @@  discard block
 block discarded – undo
57 57
                 'state' => $state,
58 58
                 'coordinates' => $coords,
59 59
                 'id' => $coords
60
-                        ? 'c:' . $coords[0] . ':' . $coords[1]
61
-                        : 'q:' . $val,
60
+                        ? 'c:'.$coords[0].':'.$coords[1]
61
+                        : 'q:'.$val,
62 62
                 'data' => json_encode($val),
63 63
             ];
64 64
         }
@@ -78,6 +78,6 @@  discard block
 block discarded – undo
78 78
         $coord = $result["result"][0];
79 79
         $coord = explode(',', $coord);
80 80
 
81
-        return [str_replace('.', ',', $coord[1]), str_replace('.',',',$coord[0])];
81
+        return [str_replace('.', ',', $coord[1]), str_replace('.', ',', $coord[0])];
82 82
     }
83 83
 }
84 84
\ No newline at end of file
Please login to merge, or discard this patch.
module/Geo/src/Geo/Service/Photon.php 2 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -62,16 +62,16 @@
 block discarded – undo
62 62
         $r=[];
63 63
         foreach ($result as $key => $val) {
64 64
             $row=['name' => (property_exists($val->properties, 'name') ? $val->properties->name:''),
65
-                  'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''),
66
-                  'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''),
67
-                  'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''),
68
-                  'state' => (property_exists($val->properties, 'state') ? $val->properties->state : ''),
69
-                  'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''),
70
-                  'coordinates' => $val->geometry->coordinates,
71
-                  'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''),
72
-                  'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''),
73
-                  //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()),
74
-                  'data' => json_encode($val),
65
+                    'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''),
66
+                    'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''),
67
+                    'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''),
68
+                    'state' => (property_exists($val->properties, 'state') ? $val->properties->state : ''),
69
+                    'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''),
70
+                    'coordinates' => $val->geometry->coordinates,
71
+                    'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''),
72
+                    'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''),
73
+                    //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()),
74
+                    'data' => json_encode($val),
75 75
             ];
76 76
             $row['id'] = 'c:' . (float) $row['coordinates'][0] . ':' . (float) $row['coordinates'][1];
77 77
             $r[]=$row;
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 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,11 +59,11 @@  discard block
 block discarded – undo
59 59
     {
60 60
         $result = json_decode($result);
61 61
         $result = $result->features;
62
-        $r=[];
62
+        $r = [];
63 63
         foreach ($result as $key => $val) {
64
-            $row=['name' => (property_exists($val->properties, 'name') ? $val->properties->name:''),
65
-                  'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''),
66
-                  'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''),
64
+            $row = ['name' => (property_exists($val->properties, 'name') ? $val->properties->name : ''),
65
+                  'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode : ''),
66
+                  'city' =>(property_exists($val->properties, 'city') ? $val->properties->city : ''),
67 67
                   'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''),
68 68
                   'state' => (property_exists($val->properties, 'state') ? $val->properties->state : ''),
69 69
                   'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''),
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
                   //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()),
74 74
                   'data' => json_encode($val),
75 75
             ];
76
-            $row['id'] = 'c:' . (float) $row['coordinates'][0] . ':' . (float) $row['coordinates'][1];
77
-            $r[]=$row;
76
+            $row['id'] = 'c:'.(float) $row['coordinates'][0].':'.(float) $row['coordinates'][1];
77
+            $r[] = $row;
78 78
         }
79 79
         return $r;
80 80
     }
Please login to merge, or discard this patch.
module/Geo/src/Geo/Factory/Form/GeoSelectFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
         $select = new GeoSelect();
33 33
 
34 34
         //$select->setAttribute('data-type', $geoOptions->getPlugin());
35
-        $select->setAttribute('data-uri', 'geo/' . $geoOptions->getPlugin());
35
+        $select->setAttribute('data-uri', 'geo/'.$geoOptions->getPlugin());
36 36
 
37 37
         return $select;
38 38
     }
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/Repository/AbstractRepository.php 2 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.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@
 block discarded – undo
130 130
 
131 131
     protected function checkEntityType($entity)
132 132
     {
133
-        if ( !($entity instanceOf $this->entityPrototype) ) {
133
+        if (!($entity instanceOf $this->entityPrototype)) {
134 134
             throw new \InvalidArgumentException(sprintf(
135 135
                                                     'Entity must be of type %s but recieved %s instead',
136 136
                                                     get_class($this->entityPrototype),
Please login to merge, or discard this patch.
module/Core/src/Core/Repository/DoctrineMongoODM/PersistenceListener.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,6 @@
 block discarded – undo
26 26
      * Attach to an event manager
27 27
      *
28 28
      * @param  EventManagerInterface $events
29
-     * @param  integer $priority
30 29
      */
31 30
     public function attach(EventManagerInterface $events)
32 31
     {
Please login to merge, or discard this patch.
module/Organizations/src/Organizations/Controller/IndexController.php 2 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.
src/Organizations/Controller/Plugin/GetOrganizationHandler.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
      * @param Params $params
60 60
      * @param bool   $allowDraft
61 61
      *
62
-     * @return object|\Organizations\Entity\Organization
62
+     * @return \Organizations\Entity\OrganizationInterface
63 63
      * @throws UnauthorizedAccessException
64 64
      * @throws \Doctrine\ODM\MongoDB\LockException
65 65
      * @throws NotFoundException
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -44,10 +44,10 @@  discard block
 block discarded – undo
44 44
      */
45 45
     protected $acl;
46 46
 
47
-    public function __construct(RepositoryService $repositoryService,AuthenticationService $auth, Acl $acl) {
48
-        $this->repositoryService=$repositoryService;
49
-        $this->auth=$auth;
50
-        $this->acl=$acl;
47
+    public function __construct(RepositoryService $repositoryService, AuthenticationService $auth, Acl $acl) {
48
+        $this->repositoryService = $repositoryService;
49
+        $this->auth = $auth;
50
+        $this->acl = $acl;
51 51
     }
52 52
 
53 53
     public function __invoke()
@@ -64,9 +64,9 @@  discard block
 block discarded – undo
64 64
      * @throws \Doctrine\ODM\MongoDB\LockException
65 65
      * @throws NotFoundException
66 66
      */
67
-    public function process(Params $params,$allowDraft = true)
67
+    public function process(Params $params, $allowDraft = true)
68 68
     {
69
-        $repositories   = $this->repositoryService;
69
+        $repositories = $this->repositoryService;
70 70
         /* @var \Organizations\Repository\Organization $organizationRepository */
71 71
         $organizationRepository = $this->repositoryService->get('Organizations/Organization');
72 72
 
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
         $user = $this->auth->getUser(); /* @var $user \Auth\Entity\UserInterface */
76 76
 
77 77
         /* @var $organizationId string */
78
-        $organizationId = empty($idFromRoute)?$idFromSubForm:$idFromRoute;
78
+        $organizationId = empty($idFromRoute) ? $idFromSubForm : $idFromRoute;
79 79
 
80 80
         $editOwnOrganization = '__my__' === $organizationId;
81 81
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
             return $organization;
111 111
         }
112 112
 
113
-        $organization      = $organizationRepository->find($organizationId);
113
+        $organization = $organizationRepository->find($organizationId);
114 114
         if (!$organization) {
115 115
             throw new NotFoundException($organizationId);
116 116
         }
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.