Completed
Push — develop ( a73e2c...030f10 )
by Carsten
28:43 queued 13:31
created
module/Geo/config/module.config.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
                  * for multiple paths.
23 23
                  * example https://github.com/doctrine/DoctrineORMModule
24 24
                  */
25
-                'paths' => [ __DIR__ . '/../src/Entity'],
25
+                'paths' => [__DIR__.'/../src/Entity'],
26 26
             ],
27 27
         ],
28 28
     ],
Please login to merge, or discard this patch.
module/Geo/src/Form/GeoSelectSimple.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
     {
54 54
         return new ClosureStrategy(
55 55
             /* extract */
56
-            function ($value) {
56
+            function($value) {
57 57
                 if ($value instanceof Location) {
58 58
                     return $value->toString();
59 59
                 }
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
             },
74 74
 
75 75
             /* hydrate */
76
-            function ($value) {
76
+            function($value) {
77 77
                 if (empty($value) || 0 !== strpos($value, '{')) {
78 78
                     return null;
79 79
                 }
Please login to merge, or discard this patch.
module/Geo/src/Module.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,10 +17,10 @@
 block discarded – undo
17 17
 class Module
18 18
 {
19 19
     /**
20
-    * Loads module specific configuration.
21
-    *
22
-    * @return array
23
-    */
20
+     * Loads module specific configuration.
21
+     *
22
+     * @return array
23
+     */
24 24
     public function getConfig()
25 25
     {
26 26
         return include __DIR__ . '/../config/module.config.php';
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,6 +23,6 @@
 block discarded – undo
23 23
     */
24 24
     public function getConfig()
25 25
     {
26
-        return include __DIR__ . '/../config/module.config.php';
26
+        return include __DIR__.'/../config/module.config.php';
27 27
     }
28 28
 }
Please login to merge, or discard this patch.
module/Geo/src/Service/AbstractClient.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
     protected $country;
39 39
 
40 40
 
41
-    public function __construct($uri, $country="DE", $cache = false)
41
+    public function __construct($uri, $country = "DE", $cache = false)
42 42
     {
43 43
         $this->country = $country;
44 44
         $this->client = $this->setupClient($uri);
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 
73 73
         $response = $this->client->send();
74 74
         if ($response->getStatusCode() !== 200) {
75
-            throw new \RuntimeException('Query failed, because ' . $response->getReasonPhrase());
75
+            throw new \RuntimeException('Query failed, because '.$response->getReasonPhrase());
76 76
         }
77 77
 
78 78
         $result = $response->getBody();
Please login to merge, or discard this patch.
module/Geo/src/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   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -26,12 +26,12 @@  discard block
 block discarded – undo
26 26
         $client->setMethod('GET');
27 27
 
28 28
         $osmTags = [
29
-            'tourism','aeroway','railway', 'amenity', 'historic', 'tunnel', 'mountain_pass',
29
+            'tourism', 'aeroway', 'railway', 'amenity', 'historic', 'tunnel', 'mountain_pass',
30 30
             'leisure', 'natural', 'bridge', 'waterway'
31 31
         ];
32 32
 
33
-        $osmTags = array_map(function ($i) {
34
-            return urlencode('!' . $i);
33
+        $osmTags = array_map(function($i) {
34
+            return urlencode('!'.$i);
35 35
         }, $osmTags);
36 36
 
37 37
         $uri = sprintf(
@@ -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/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/Organizations/config/module.config.php 2 patches
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -66,14 +66,14 @@  discard block
 block discarded – undo
66 66
     'view_manager' => [
67 67
         // Map template to files. Speeds up the lookup through the template stack.
68 68
         'template_map' => [
69
-             'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
70
-             'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
71
-             'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
72
-             'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
73
-             'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
74
-             'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
75
-             'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
76
-             'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml',
69
+                'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
70
+                'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
71
+                'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
72
+                'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
73
+                'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
74
+                'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
75
+                'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
76
+                'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml',
77 77
             'organizations/profile/disabled' => __DIR__ . '/../view/organizations/profile/disabled.phtml',
78 78
         ],
79 79
         // Where to look for view templates not mapped above
@@ -83,21 +83,21 @@  discard block
 block discarded – undo
83 83
     ],
84 84
     'form_elements' => [
85 85
         'invokables' => [
86
-             'Organizations/Form' => 'Organizations\Form\Organizations',
87
-             'Organizations/OrganizationsContactForm'     => 'Organizations\Form\OrganizationsContactForm',
88
-             'Organizations/OrganizationsNameForm'        => 'Organizations\Form\OrganizationsNameForm',
89
-             'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm',
90
-             'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset',
91
-             'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset',
92
-             //'Organizations/OrganizationFieldset'       => 'Organizations\Form\OrganizationFieldset',
93
-             'Organizations/EmployeesContainer'           => 'Organizations\Form\EmployeesContainer',
94
-             'Organizations/Employees'                    => 'Organizations\Form\Employees',
95
-             'Organizations/InviteEmployeeBar'            => 'Organizations\Form\Element\InviteEmployeeBar',
96
-             'Organizations/Employee'                     => 'Organizations\Form\Element\Employee',
97
-             'Organizations/WorkflowSettings'             => 'Organizations\Form\WorkflowSettings',
98
-             'Organizations/WorkflowSettingsFieldset'     => 'Organizations\Form\WorkflowSettingsFieldset',
99
-             'Organizations/Profile'                      => \Organizations\Form\OrganizationsProfileForm::class,
100
-             'Organizations/ProfileFieldset'              => \Organizations\Form\OrganizationsProfileFieldset::class
86
+                'Organizations/Form' => 'Organizations\Form\Organizations',
87
+                'Organizations/OrganizationsContactForm'     => 'Organizations\Form\OrganizationsContactForm',
88
+                'Organizations/OrganizationsNameForm'        => 'Organizations\Form\OrganizationsNameForm',
89
+                'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm',
90
+                'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset',
91
+                'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset',
92
+                //'Organizations/OrganizationFieldset'       => 'Organizations\Form\OrganizationFieldset',
93
+                'Organizations/EmployeesContainer'           => 'Organizations\Form\EmployeesContainer',
94
+                'Organizations/Employees'                    => 'Organizations\Form\Employees',
95
+                'Organizations/InviteEmployeeBar'            => 'Organizations\Form\Element\InviteEmployeeBar',
96
+                'Organizations/Employee'                     => 'Organizations\Form\Element\Employee',
97
+                'Organizations/WorkflowSettings'             => 'Organizations\Form\WorkflowSettings',
98
+                'Organizations/WorkflowSettingsFieldset'     => 'Organizations\Form\WorkflowSettingsFieldset',
99
+                'Organizations/Profile'                      => \Organizations\Form\OrganizationsProfileForm::class,
100
+                'Organizations/ProfileFieldset'              => \Organizations\Form\OrganizationsProfileFieldset::class
101 101
         ],
102 102
         'factories' => [
103 103
             'Organizations/OrganizationsNameFieldset'    => \Organizations\Factory\Form\OrganizationsNameFieldsetFactory::class,
@@ -212,13 +212,13 @@  discard block
 block discarded – undo
212 212
 
213 213
     'service_manager' => [
214 214
         'invokables' => [
215
-           'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener'
215
+            'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener'
216 216
         ],
217 217
         'factories' => [
218
-           'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory',
219
-           'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory',
220
-           'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory',
221
-           'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory',
218
+            'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory',
219
+            'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory',
220
+            'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory',
221
+            'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory',
222 222
         ],
223 223
     ],
224 224
 
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
                 ],
14 14
             ],
15 15
             'annotation' => [
16
-                'paths' => [ __DIR__ . '/../src/Entity']
16
+                'paths' => [__DIR__.'/../src/Entity']
17 17
             ],
18 18
         ],
19 19
         'eventmanager' => [
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
         'translation_file_patterns' => [
41 41
             [
42 42
                 'type' => 'gettext',
43
-                'base_dir' => __DIR__ . '/../language',
43
+                'base_dir' => __DIR__.'/../language',
44 44
                 'pattern' => '%s.mo',
45 45
             ],
46 46
         ],
@@ -66,19 +66,19 @@  discard block
 block discarded – undo
66 66
     'view_manager' => [
67 67
         // Map template to files. Speeds up the lookup through the template stack.
68 68
         'template_map' => [
69
-             'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml',
70
-             'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml',
71
-             'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml',
72
-             'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml',
73
-             'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
74
-             'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml',
75
-             'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml',
76
-             'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml',
77
-            'organizations/profile/disabled' => __DIR__ . '/../view/organizations/profile/disabled.phtml',
69
+             'organizations/index/edit' => __DIR__.'/../view/organizations/index/form.phtml',
70
+             'organizations/form/employees-fieldset' => __DIR__.'/../view/form/employees-fieldset.phtml',
71
+             'organizations/form/employee-fieldset' => __DIR__.'/../view/form/employee-fieldset.phtml',
72
+             'organizations/form/invite-employee-bar' => __DIR__.'/../view/form/invite-employee-bar.phtml',
73
+             'organizations/error/no-parent' => __DIR__.'/../view/error/no-parent.phtml',
74
+             'organizations/error/invite' => __DIR__.'/../view/error/invite.phtml',
75
+             'organizations/mail/invite-employee' => __DIR__.'/../view/mail/invite-employee.phtml',
76
+             'organizations/form/workflow-fieldset' => __DIR__.'/../view/form/workflow-fieldset.phtml',
77
+            'organizations/profile/disabled' => __DIR__.'/../view/organizations/profile/disabled.phtml',
78 78
         ],
79 79
         // Where to look for view templates not mapped above
80 80
         'template_path_stack' => [
81
-            __DIR__ . '/../view',
81
+            __DIR__.'/../view',
82 82
         ],
83 83
     ],
84 84
     'form_elements' => [
@@ -156,13 +156,13 @@  discard block
 block discarded – undo
156 156
                 'allow' => [
157 157
                     'Entity/OrganizationImage',
158 158
                     'route/lang/organizations/invite',
159
-                    'Organizations/InviteEmployee' => [ 'accept' ],
159
+                    'Organizations/InviteEmployee' => ['accept'],
160 160
                     'route/lang/organizations/profile',
161 161
                     'route/lang/organizations/profileDetail',
162 162
                 ],
163 163
                 'deny' => [
164 164
                     'route/lang/organizations',
165
-                    'Organizations/InviteEmployee' => [ 'invite' ],
165
+                    'Organizations/InviteEmployee' => ['invite'],
166 166
                 ],
167 167
             ],
168 168
             // recruiters are allowed to view their companies
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
                 'allow' => [
171 171
                     'route/lang/organizations',
172 172
                     'Organizations/InviteEmployee',
173
-                    'Entity/Organization' => [ 'edit' => 'Organizations/Write' ],
173
+                    'Entity/Organization' => ['edit' => 'Organizations/Write'],
174 174
                     'route/lang/organizations/profile',
175 175
                     'route/lang/organizations/profileDetail'
176 176
                 ],
@@ -188,8 +188,8 @@  discard block
 block discarded – undo
188 188
             'organizations' => [
189 189
                 'label' => 'Organizations',
190 190
                 'route' => 'lang/organizations',
191
-                'order' => 65,                             // allows to order the menu items
192
-                'resource' => 'route/lang/organizations',  // if a resource is defined, the acl will be applied.
191
+                'order' => 65, // allows to order the menu items
192
+                'resource' => 'route/lang/organizations', // if a resource is defined, the acl will be applied.
193 193
 
194 194
                 'pages' => [
195 195
                     'list' => [
Please login to merge, or discard this patch.
module/Organizations/src/Repository/Organization.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -129,10 +129,10 @@
 block discarded – undo
129 129
 //           )
130 130
 //        );
131 131
         $qb->addAnd($qb->expr()->field('user')->equals($userId))
132
-           ->addAnd(
133
-               $qb->expr()->addOr($qb->expr()->field('parent')->exists(false))
134
-                               ->addOr($qb->expr()->field('parent')->equals(null))
135
-           );
132
+            ->addAnd(
133
+                $qb->expr()->addOr($qb->expr()->field('parent')->exists(false))
134
+                                ->addOr($qb->expr()->field('parent')->equals(null))
135
+            );
136 136
 
137 137
         $q      = $qb->getQuery();
138 138
         $entity = $q->getSingleResult();
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@
 block discarded – undo
197 197
      * @param bool          $persist
198 198
      * @return \Organizations\Entity\Organization
199 199
      */
200
-    public function create(array $data = null, $persist=false)
200
+    public function create(array $data = null, $persist = false)
201 201
     {
202 202
         $entity = parent::create($data);
203 203
         $entity->isDraft(true);
Please login to merge, or discard this patch.
Organizations/src/Repository/Event/InjectOrganizationReferenceListener.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
         if ($document instanceof UserInterface) {
42 42
             $repository = $args->getDocumentManager()->getRepository('Organizations\Entity\Organization');
43
-            $userId  = $document->getId();
43
+            $userId = $document->getId();
44 44
             $reference = new OrganizationReference($userId, $repository);
45 45
 
46 46
             $document->setOrganization($reference);
Please login to merge, or discard this patch.