Completed
Pull Request — develop (#434)
by Carsten
06:27
created
module/Geo/src/Geo/Service/AbstractClient.php 1 patch
Spacing   +3 added lines, -3 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);
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
     public function query($term, array $params = [])
64 64
     {
65 65
     	/* @TODO: [ZF3] overriding $term value because it always returns null */
66
-    	if(is_null($term)){
66
+    	if (is_null($term)) {
67 67
 		    $term = $_REQUEST['q'];
68 68
 	    }
69 69
         $cacheId = md5($term);
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 
77 77
         $response = $this->client->send();
78 78
         if ($response->getStatusCode() !== 200) {
79
-            throw new \RuntimeException('Query failed, because ' . $response->getReasonPhrase());
79
+            throw new \RuntimeException('Query failed, because '.$response->getReasonPhrase());
80 80
         }
81 81
 
82 82
         $result = $response->getBody();
Please login to merge, or discard this patch.
public/index.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -13,15 +13,15 @@  discard block
 block discarded – undo
13 13
 
14 14
 if (php_sapi_name() == 'cli-server') {
15 15
     $parseUrl = parse_url(substr($_SERVER["REQUEST_URI"], 1));
16
-    $route = isset($parseUrl['path']) ? $parseUrl['path']:null;
17
-    if (is_file(__DIR__ . '/' . $route)) {
18
-        if(substr($route, -4) == ".php"){
19
-            require __DIR__ . '/' . $route;     // Include requested script files
16
+    $route = isset($parseUrl['path']) ? $parseUrl['path'] : null;
17
+    if (is_file(__DIR__.'/'.$route)) {
18
+        if (substr($route, -4) == ".php") {
19
+            require __DIR__.'/'.$route; // Include requested script files
20 20
             exit;
21 21
         }
22
-        return false;           // Serve file as is
22
+        return false; // Serve file as is
23 23
     } else {                    // Fallback to index.php
24
-        $_GET["q"] = $route;    // Try to emulate the behaviour of a .htaccess here.
24
+        $_GET["q"] = $route; // Try to emulate the behaviour of a .htaccess here.
25 25
     }
26 26
 }
27 27
 
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
 } else {
42 42
     echo '<p>Could not initialize autoloading. This happens, if the dependencies are not installed yet.</p>';
43 43
     echo '<p>Please try to install the dependencies via: </p>';
44
-    echo '<code>cd '. realpath('.') .'<br>./install.sh</code>';
45
-    echo '<p>exit at ' . __FILE__ . ' in line ' . __LINE__ .'</p>';
44
+    echo '<code>cd '.realpath('.').'<br>./install.sh</code>';
45
+    echo '<p>exit at '.__FILE__.' in line '.__LINE__.'</p>';
46 46
     exit;
47 47
 }
48 48
 
Please login to merge, or discard this patch.
module/Auth/src/Auth/Entity/Info.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
      */
139 139
     public function setBirthDay($birthDay)
140 140
     {
141
-        $this->birthDay=$birthDay;
141
+        $this->birthDay = $birthDay;
142 142
         return $this;
143 143
     }
144 144
 
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
      */
160 160
     public function setBirthMonth($birthMonth)
161 161
     {
162
-        $this->birthMonth=$birthMonth;
162
+        $this->birthMonth = $birthMonth;
163 163
         return $this;
164 164
     }
165 165
 
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
      */
181 181
     public function setBirthYear($birthYear)
182 182
     {
183
-        $this->birthYear=$birthYear;
183
+        $this->birthYear = $birthYear;
184 184
         return $this;
185 185
     }
186 186
 
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
      */
202 202
     public function setEmail($email)
203 203
     {
204
-        $this->email = trim((String)$email);
204
+        $this->email = trim((String) $email);
205 205
         return $this;
206 206
     }
207 207
 
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
      */
245 245
     public function setFirstName($firstName)
246 246
     {
247
-        $this->firstName = trim((String)$firstName);
247
+        $this->firstName = trim((String) $firstName);
248 248
         return $this;
249 249
     }
250 250
 
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
      */
267 267
     public function setGender($gender)
268 268
     {
269
-        $this->gender = trim((String)$gender);
269
+        $this->gender = trim((String) $gender);
270 270
         return $this;
271 271
     }
272 272
 
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
      */
288 288
     public function setHouseNumber($houseNumber)
289 289
     {
290
-        $this->houseNumber=$houseNumber;
290
+        $this->houseNumber = $houseNumber;
291 291
         return $this;
292 292
     }
293 293
 
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
         if (!$this->lastName) {
333 333
             return $emailIfEmpty ? $this->email : '';
334 334
         }
335
-        return ($this->firstName ? $this->firstName . ' ' : '') . $this->lastName;
335
+        return ($this->firstName ? $this->firstName.' ' : '').$this->lastName;
336 336
     }
337 337
     
338 338
     /**
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
      */
427 427
     public function setStreet($street)
428 428
     {
429
-        $this->street=$street;
429
+        $this->street = $street;
430 430
         return $this;
431 431
     }
432 432
 
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
      */
448 448
     public function setCountry($country)
449 449
     {
450
-        $this->country=$country;
450
+        $this->country = $country;
451 451
         return $this;
452 452
     }
453 453
 
Please login to merge, or discard this patch.
module/Organizations/src/Organizations/Entity/OrganizationContact.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
      */
87 87
     public function setHouseNumber($houseNumber = "")
88 88
     {
89
-        $this->houseNumber=$houseNumber;
89
+        $this->houseNumber = $houseNumber;
90 90
         return $this;
91 91
     }
92 92
     
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
      */
153 153
     public function setStreet($street = "")
154 154
     {
155
-        $this->street=$street;
155
+        $this->street = $street;
156 156
         return $this;
157 157
     }
158 158
 
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
      */
175 175
     public function setCountry($country = "")
176 176
     {
177
-        $this->country=$country;
177
+        $this->country = $country;
178 178
         return $this;
179 179
     }
180 180
 
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
      */
200 200
     public function setPhone($phone = "")
201 201
     {
202
-        $this->phone=$phone;
202
+        $this->phone = $phone;
203 203
         return $this;
204 204
     }
205 205
 
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
      */
223 223
     public function setFax($fax = "")
224 224
     {
225
-        $this->fax=$fax;
225
+        $this->fax = $fax;
226 226
         return $this;
227 227
     }
228 228
 
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/View/Helper/JobUrl.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     public function __invoke(Job $jobEntity, $options = [], $urlParams = [])
69 69
     {
70 70
 
71
-        $options= array_merge($this->options, $options);
71
+        $options = array_merge($this->options, $options);
72 72
         $paramsHelper = $this->paramsHelper;
73 73
         $urlHelper = $this->urlHelper;
74 74
         $serverUrlHelper = $this->serverUrlHelper;
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
         if (!empty($jobEntity->getLink())) {
78 78
             $url = $jobEntity->getLink();
79 79
             $isExternalLink = true;
80
-        }elseif($options['showPendingJobs']) {
80
+        }elseif ($options['showPendingJobs']) {
81 81
             $url = $urlHelper(
82 82
                 'lang/jobs/approval',
83 83
                 [],
@@ -87,10 +87,10 @@  discard block
 block discarded – undo
87 87
                     ]
88 88
                 ], true);
89 89
 
90
-        }else{
90
+        } else {
91 91
 
92 92
             $query = [
93
-                'subscriberUri' => $serverUrlHelper([]) . '/subscriber/' . 1,
93
+                'subscriberUri' => $serverUrlHelper([]).'/subscriber/'.1,
94 94
                 'id' => $jobEntity->getId()
95 95
             ];
96 96
             if ($jobEntity instanceOf JobSnapshot) {
@@ -107,16 +107,16 @@  discard block
 block discarded – undo
107 107
             $url = $urlHelper($route, $params, array('query' => $query));
108 108
         }
109 109
 
110
-        if ($options['linkOnly']){
110
+        if ($options['linkOnly']) {
111 111
             $result = $url;
112
-            if ($options['absolute'] && !$isExternalLink){
112
+            if ($options['absolute'] && !$isExternalLink) {
113 113
                 $result = $serverUrlHelper($url);
114 114
             }
115
-        }else{
115
+        } else {
116 116
             $result = sprintf('<a href="%s" rel="%s" %s>%s</a>',
117 117
                               $url,
118 118
                               $options['rel'],
119
-                              $options['target']?"target=" . $options['target']:"",
119
+                              $options['target'] ? "target=".$options['target'] : "",
120 120
                               strip_tags($jobEntity->getTitle()));
121 121
         }
122 122
 
@@ -126,10 +126,10 @@  discard block
 block discarded – undo
126 126
     /**
127 127
      * @param $options
128 128
      */
129
-    public function setOptions($options){
130
-        foreach($options as $key=>$val) {
131
-            if (array_key_exists($this->options,$key)) {
132
-                $this->options[$key]=$val;
129
+    public function setOptions($options) {
130
+        foreach ($options as $key=>$val) {
131
+            if (array_key_exists($this->options, $key)) {
132
+                $this->options[$key] = $val;
133 133
             }
134 134
         }
135 135
     }
Please login to merge, or discard this patch.
module/Core/src/Core/Entity/AbstractLocation.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -66,13 +66,13 @@  discard block
 block discarded – undo
66 66
         $region = $this->getRegion();
67 67
         
68 68
         $str = '';
69
-        if ($postalCode) { $str .= $postalCode . ' '; }
69
+        if ($postalCode) { $str .= $postalCode.' '; }
70 70
         if ($city) { $str .= $city; }
71
-        if ($region) { $str .= ', ' . $region; }
72
-        if ($country) { $str .= ', ' . $country; }
71
+        if ($region) { $str .= ', '.$region; }
72
+        if ($country) { $str .= ', '.$country; }
73 73
         if ($coords) {
74 74
             $coords = $coords->getCoordinates();
75
-            $str .= ' ( ' . join(', ', $coords) . ' )';
75
+            $str .= ' ( '.join(', ', $coords).' )';
76 76
         }
77 77
         
78 78
         return $str;
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
             if (!$value) { continue; }
108 108
 
109 109
             if ('coordinates' == $key) {
110
-                $class = '\\Geo\\Entity\\Geometry\\' . $value['type'];
110
+                $class = '\\Geo\\Entity\\Geometry\\'.$value['type'];
111 111
                 $value = new $class($value['coordinates']);
112 112
             }
113 113
 
Please login to merge, or discard this patch.
module/Core/src/Core/Entity/SnapshotTrait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
     public function __construct(EntityInterface $source)
34 34
     {
35 35
         $this->snapshotMeta = new SnapshotMeta();
36
-        $this->snapshotEntity       = $source;
36
+        $this->snapshotEntity = $source;
37 37
     }
38 38
 
39 39
     public function getOriginalEntity()
Please login to merge, or discard this patch.