Completed
Pull Request — develop (#353)
by ANTHONIUS
06:14
created
module/Auth/src/Auth/Entity/Info.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
      */
132 132
     public function setBirthDay($birthDay)
133 133
     {
134
-        $this->birthDay=$birthDay;
134
+        $this->birthDay = $birthDay;
135 135
         return $this;
136 136
     }
137 137
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
      */
153 153
     public function setBirthMonth($birthMonth)
154 154
     {
155
-        $this->birthMonth=$birthMonth;
155
+        $this->birthMonth = $birthMonth;
156 156
         return $this;
157 157
     }
158 158
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
      */
174 174
     public function setBirthYear($birthYear)
175 175
     {
176
-        $this->birthYear=$birthYear;
176
+        $this->birthYear = $birthYear;
177 177
         return $this;
178 178
     }
179 179
 
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
      */
195 195
     public function setEmail($email)
196 196
     {
197
-        $this->email = trim((String)$email);
197
+        $this->email = trim((String) $email);
198 198
         return $this;
199 199
     }
200 200
 
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
      */
238 238
     public function setFirstName($firstName)
239 239
     {
240
-        $this->firstName = trim((String)$firstName);
240
+        $this->firstName = trim((String) $firstName);
241 241
         return $this;
242 242
     }
243 243
 
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
      */
260 260
     public function setGender($gender)
261 261
     {
262
-        $this->gender = trim((String)$gender);
262
+        $this->gender = trim((String) $gender);
263 263
         return $this;
264 264
     }
265 265
 
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
      */
281 281
     public function setHouseNumber($houseNumber)
282 282
     {
283
-        $this->houseNumber=$houseNumber;
283
+        $this->houseNumber = $houseNumber;
284 284
         return $this;
285 285
     }
286 286
 
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
         if (!$this->lastName) {
321 321
             return $emailIfEmpty ? $this->email : '';
322 322
         }
323
-        return ($this->firstName ? $this->firstName . ' ' : '') . $this->lastName;
323
+        return ($this->firstName ? $this->firstName.' ' : '').$this->lastName;
324 324
     }
325 325
     
326 326
     /**
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
      */
415 415
     public function setStreet($street)
416 416
     {
417
-        $this->street=$street;
417
+        $this->street = $street;
418 418
         return $this;
419 419
     }
420 420
 
Please login to merge, or discard this patch.
module/Auth/src/Auth/Entity/Group.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@
 block discarded – undo
97 97
     
98 98
     public function getPermissionsResourceId()
99 99
     {
100
-        return 'group:' . $this->getId();
100
+        return 'group:'.$this->getId();
101 101
     }
102 102
     
103 103
     /**
Please login to merge, or discard this patch.
module/Auth/src/Auth/Entity/SocialProfiles/LinkedIn.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -36,10 +36,10 @@  discard block
 block discarded – undo
36 36
     {
37 37
         $return = array();
38 38
         if (isset($data['start-date'])) {
39
-            $return['startDate'] = $data['start-date']['year'] . '-' . $data['start-date']['month'] . '-' . $data['start-date']['day'];
39
+            $return['startDate'] = $data['start-date']['year'].'-'.$data['start-date']['month'].'-'.$data['start-date']['day'];
40 40
         }
41 41
         if (isset($data['end-date'])) {
42
-            $return['endDate'] = $data['end-date']['year'] . '-' . $data['end-date']['month'] . '-' . $data['end-date']['day'];
42
+            $return['endDate'] = $data['end-date']['year'].'-'.$data['end-date']['month'].'-'.$data['end-date']['day'];
43 43
         }
44 44
         if (isset($data['school-name'])) {
45 45
             $return['organizationName'] = $data['school-name'];
@@ -56,10 +56,10 @@  discard block
 block discarded – undo
56 56
             $data = $data['positions'][0];
57 57
 
58 58
             if (isset($data['start-date'])) {
59
-                $return['startDate'] = $data['start-date']['year'] . '-' . $data['start-date']['month'] . '-' . $data['start-date']['day'];
59
+                $return['startDate'] = $data['start-date']['year'].'-'.$data['start-date']['month'].'-'.$data['start-date']['day'];
60 60
             }
61 61
             if (isset($data['end-date'])) {
62
-                $return['endDate'] = $data['end-date']['year'] . '-' . $data['end-date']['month'] . '-' . $data['end-date']['day'];
62
+                $return['endDate'] = $data['end-date']['year'].'-'.$data['end-date']['month'].'-'.$data['end-date']['day'];
63 63
             } elseif (isset($data['is-current']) && 'true' == $data['is-current']) {
64 64
                 $return['currentIndicator'] = true;
65 65
             }
Please login to merge, or discard this patch.
module/Auth/src/Auth/Entity/SocialProfiles/AbstractProfile.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -223,13 +223,13 @@  discard block
 block discarded – undo
223 223
         $collection = new ArrayCollection();
224 224
         $key        = $this->config[$type]['key'];
225 225
         $hydrator   = $this->getHydrator($type);
226
-        $filter     = 'filter' . rtrim($type, 's');
226
+        $filter     = 'filter'.rtrim($type, 's');
227 227
         $entity     = $this->getEntity($type);
228 228
         $dataArray  = $this->getData($key);
229 229
         
230 230
         if ($dataArray) {
231 231
             foreach ($dataArray as $data) {
232
-                $data    = $this->$filter($data);
232
+                $data = $this->$filter($data);
233 233
                 if (!count($data)) {
234 234
                     continue;
235 235
                 }
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
     {
285 285
         $entity = isset($this->config[$type]['entity'])
286 286
                 ? $this->config[$type]['entity']
287
-                : '\Cv\Entity\\'. ucfirst(rtrim($type, 's'));
287
+                : '\Cv\Entity\\'.ucfirst(rtrim($type, 's'));
288 288
         
289 289
         if (is_string($entity)) {
290 290
             $this->config[$type]['entity'] = $entity = new $entity();
Please login to merge, or discard this patch.
module/Auth/src/Auth/View/Helper/BuildReferer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
         }
50 50
         
51 51
         if (null === $uri && isset($_SERVER['REQUEST_URI'])) {
52
-            $uri = preg_replace('~^' . $this->getView()->basePath() . '~', '', $_SERVER['REQUEST_URI']);
52
+            $uri = preg_replace('~^'.$this->getView()->basePath().'~', '', $_SERVER['REQUEST_URI']);
53 53
         }
54 54
         
55 55
         if (null === $stripParams) {
Please login to merge, or discard this patch.
module/Auth/src/Auth/Adapter/ExternalApplication.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
         }
119 119
                 
120 120
         $identity      = $this->getIdentity();
121
-        $applicationId = '@' . $this->getApplicationIdentifier();
121
+        $applicationId = '@'.$this->getApplicationIdentifier();
122 122
         $applicationIdIndex = strrpos($identity, $applicationId);
123 123
         //$login         = (0 < $applicationIdIndex &&  strlen($identity) - strlen($applicationId) == $applicationIdIndex)?substr($identity, 0, $applicationIdIndex):$identity;
124 124
         $login         = $identity;
@@ -130,8 +130,8 @@  discard block
 block discarded – undo
130 130
         $loginSuccess = false;
131 131
         $loginResult = array();
132 132
         
133
-        if (0 < $applicationIdIndex &&  strlen($identity) - strlen($applicationId) == $applicationIdIndex) {
134
-            $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', login with correct suffix: ');
133
+        if (0 < $applicationIdIndex && strlen($identity) - strlen($applicationId) == $applicationIdIndex) {
134
+            $this->serviceManager->get('Core/Log')->debug('User '.$login.', login with correct suffix: ');
135 135
             // the login ends with the applicationID, therefore use the secret key
136 136
             // the external login must be the form 'xxxxx@yyyy' where yyyy is the matching suffix to the external application key
137 137
             if (isset($user)) {
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
                     $loginSuccess = true;
140 140
                 } else {
141 141
                     $loginSuccess = false;
142
-                    $this->serviceManager->get('Core/Log')->info('User ' . $login . ', secret: ' . $user->secret . ' != loginPassword: ' . $filter->filter($credential) . ' (' . $credential . ')');
142
+                    $this->serviceManager->get('Core/Log')->info('User '.$login.', secret: '.$user->secret.' != loginPassword: '.$filter->filter($credential).' ('.$credential.')');
143 143
                 }
144 144
             } else {
145 145
                 $user = $users->create(
@@ -155,17 +155,17 @@  discard block
 block discarded – undo
155 155
                 $loginResult = array('firstLogin' => true);
156 156
             }
157 157
         } elseif (isset($user)) {
158
-            $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', login with noncorrect suffix: ');
158
+            $this->serviceManager->get('Core/Log')->debug('User '.$login.', login with noncorrect suffix: ');
159 159
             if ($user->credential == $filter->filter($credential)) {
160
-                $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials are equal');
160
+                $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials are equal');
161 161
                 $loginSuccess = true;
162 162
             } elseif (!empty($applicationId)) {
163
-                $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials are not equal');
163
+                $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials are not equal');
164 164
                 // TODO: remove this code as soon as the secret key has been fully established
165 165
                 // basically this does allow an external login with an applicationIndex match against the User-Password
166 166
                 // the way it had been used in the start
167 167
                 if ($user->credential == $filter->filter($credential)) {
168
-                    $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials2 test');
168
+                    $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials2 test');
169 169
                     $loginSuccess = true;
170 170
                 }
171 171
             }
Please login to merge, or discard this patch.
module/Auth/src/Auth/Filter/LoginFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,6 +45,6 @@
 block discarded – undo
45 45
         if (!$loginSuffixResponseCollection->isEmpty()) {
46 46
             $suffix = $loginSuffixResponseCollection->last();
47 47
         }
48
-        return $value . $suffix;
48
+        return $value.$suffix;
49 49
     }
50 50
 }
Please login to merge, or discard this patch.
module/Auth/src/Auth/Filter/StripQueryParams.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,6 +44,6 @@
 block discarded – undo
44 44
         
45 45
         parse_str($query, $queryParams);
46 46
         $queryParams = array_diff_key($queryParams, array_flip($stripParams));
47
-        return $uri . (empty($queryParams) ? '' : '?' . http_build_query($queryParams));
47
+        return $uri.(empty($queryParams) ? '' : '?'.http_build_query($queryParams));
48 48
     }
49 49
 }
Please login to merge, or discard this patch.
module/Auth/src/Auth/Controller/Plugin/SocialProfiles.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
             throw new \InvalidArgumentException(
57 57
                 sprintf(
58 58
                     'Adapter must be either a string or an instance of \Auth\Controller\Plugin\SocialProfiles\AbstractAdapter, but received %s',
59
-                    is_object($adapter) ? get_class($adapter) : '(' . gettype($adapter) . ')'
59
+                    is_object($adapter) ? get_class($adapter) : '('.gettype($adapter).')'
60 60
                 )
61 61
             );
62 62
         }
Please login to merge, or discard this patch.