Completed
Pull Request — master (#97)
by Aleksandar
46:22 queued 13:15
created
packages/Core/Service/AdminUserService.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace Core\Service;
5 5
 
@@ -61,17 +61,17 @@  discard block
 block discarded – undo
61 61
      */
62 62
     public function loginUser($email, $password)
63 63
     {
64
-        if(!$email || !$password) {
64
+        if (!$email || !$password) {
65 65
             throw new \Exception('Both email and password are required.', 400);
66 66
         }
67 67
 
68 68
         $user = $this->adminUsersMapper->getByEmail($email);
69 69
 
70
-        if(!$user) {
70
+        if (!$user) {
71 71
             throw new \Exception('User does not exist.');
72 72
         }
73 73
 
74
-        if(!$this->crypt->verify($password, $user->password)) {
74
+        if (!$this->crypt->verify($password, $user->password)) {
75 75
             throw new \Exception('Password does not match.');
76 76
         }
77 77
 
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
     {
118 118
         $filter = $this->adminUserFilter->getInputFilter()->setData($data);
119 119
 
120
-        if(!$filter->isValid()) {
120
+        if (!$filter->isValid()) {
121 121
             throw new FilterException($filter->getMessages());
122 122
         }
123 123
 
@@ -126,10 +126,10 @@  discard block
 block discarded – undo
126 126
                 'profile_img' => $this->upload->uploadImage($data, 'profile_img')
127 127
             ];
128 128
 
129
-        unset($data['confirm_password']);
130
-        $data['password']        = $this->crypt->create($data['password']);
131
-        $data['admin_user_id']   = Uuid::uuid1()->toString();
132
-        $data['admin_user_uuid'] = (new MysqlUuid($data['admin_user_id']))->toFormat(new Binary);
129
+        unset($data[ 'confirm_password' ]);
130
+        $data[ 'password' ]        = $this->crypt->create($data[ 'password' ]);
131
+        $data[ 'admin_user_id' ]   = Uuid::uuid1()->toString();
132
+        $data[ 'admin_user_uuid' ] = (new MysqlUuid($data[ 'admin_user_id' ]))->toFormat(new Binary);
133 133
 
134 134
         return $this->adminUsersMapper->insert($data);
135 135
     }
@@ -143,17 +143,17 @@  discard block
 block discarded – undo
143 143
         $filter = $this->adminUserFilter->getInputFilter()->setData($data);
144 144
 
145 145
         // we dont want to force user to enter the password again
146
-        if($data['password'] == '') {
146
+        if ($data[ 'password' ] == '') {
147 147
             $filter->remove('password');
148 148
             $filter->remove('confirm_password');
149 149
         }
150 150
 
151 151
         // if we want to keep same email
152
-        if($user->email == $data['email']) {
152
+        if ($user->email == $data[ 'email' ]) {
153 153
             $filter->remove('email');
154 154
         }
155 155
 
156
-        if(!$filter->isValid()) {
156
+        if (!$filter->isValid()) {
157 157
             throw new FilterException($filter->getMessages());
158 158
         }
159 159
 
@@ -163,20 +163,20 @@  discard block
 block discarded – undo
163 163
             ];
164 164
 
165 165
         // We dont want to force user to re-upload image on edit
166
-        if(!$data['face_img']) {
167
-            unset($data['face_img']);
166
+        if (!$data[ 'face_img' ]) {
167
+            unset($data[ 'face_img' ]);
168 168
         }
169 169
 
170
-        if(!$data['profile_img']) {
171
-            unset($data['profile_img']);
170
+        if (!$data[ 'profile_img' ]) {
171
+            unset($data[ 'profile_img' ]);
172 172
         }
173 173
 
174
-        if(isset($data['password'])) {
175
-            unset($data['confirm_password']);
176
-            $data['password'] = $this->crypt->create($data['password']);
174
+        if (isset($data[ 'password' ])) {
175
+            unset($data[ 'confirm_password' ]);
176
+            $data[ 'password' ] = $this->crypt->create($data[ 'password' ]);
177 177
         }
178 178
 
179
-        return $this->adminUsersMapper->update($data, ['admin_user_id' => $userId]);
179
+        return $this->adminUsersMapper->update($data, [ 'admin_user_id' => $userId ]);
180 180
     }
181 181
 
182 182
     /**
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
      */
188 188
     public function delete($userId)
189 189
     {
190
-        return (bool)$this->adminUsersMapper->delete(['admin_user_id' => $userId]);
190
+        return (bool) $this->adminUsersMapper->delete([ 'admin_user_id' => $userId ]);
191 191
     }
192 192
 
193 193
     /**
Please login to merge, or discard this patch.
packages/Core/Filter/AdminUserFilter.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -19,37 +19,37 @@  discard block
 block discarded – undo
19 19
 
20 20
     public function getInputFilter()
21 21
     {
22
-        if(!$this->inputFilter){
22
+        if (!$this->inputFilter) {
23 23
             $inputFilter = new InputFilter();
24 24
 
25 25
             $inputFilter->add([
26 26
                 'name'       => 'first_name',
27 27
                 'required'   => true,
28
-                'filters'    => [['name' => 'StringTrim']],
28
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
29 29
                 'validators' => [
30
-                    ['name' => 'NotEmpty'],
31
-                    ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 255]]
30
+                    [ 'name' => 'NotEmpty' ],
31
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 255 ] ]
32 32
                 ],
33 33
             ]);
34 34
 
35 35
             $inputFilter->add([
36 36
                 'name'       => 'last_name',
37 37
                 'required'   => true,
38
-                'filters'    => [['name' => 'StringTrim']],
38
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
39 39
                 'validators' => [
40
-                    ['name' => 'NotEmpty'],
41
-                    ['name' => 'StringLength', 'options' => ['min' => 2, 'max' => 255]]
40
+                    [ 'name' => 'NotEmpty' ],
41
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 2, 'max' => 255 ] ]
42 42
                 ],
43 43
             ]);
44 44
 
45 45
             $inputFilter->add([
46 46
                 'name'       => 'email',
47 47
                 'required'   => true,
48
-                'filters'    => [['name' => 'StringTrim']],
48
+                'filters'    => [ [ 'name' => 'StringTrim' ] ],
49 49
                 'validators' => [
50
-                    ['name' => 'NotEmpty'],
51
-                    ['name' => 'EmailAddress'],
52
-                    ['name' => 'dbnorecordexists', 'options' => ['adapter' => $this->adapter, 'table' => 'admin_users', 'field' => 'email']],
50
+                    [ 'name' => 'NotEmpty' ],
51
+                    [ 'name' => 'EmailAddress' ],
52
+                    [ 'name' => 'dbnorecordexists', 'options' => [ 'adapter' => $this->adapter, 'table' => 'admin_users', 'field' => 'email' ] ],
53 53
 
54 54
                 ],
55 55
             ]);
@@ -57,21 +57,21 @@  discard block
 block discarded – undo
57 57
             $inputFilter->add([
58 58
                 'name'     => 'introduction',
59 59
                 'required' => false,
60
-                'filters'  => [['name' => 'StringTrim']]
60
+                'filters'  => [ [ 'name' => 'StringTrim' ] ]
61 61
             ]);
62 62
 
63 63
             $inputFilter->add([
64 64
                 'name'     => 'biography',
65 65
                 'required' => false,
66
-                'filters'  => [['name' => 'StringTrim']]
66
+                'filters'  => [ [ 'name' => 'StringTrim' ] ]
67 67
             ]);
68 68
 
69 69
             $inputFilter->add([
70 70
                 'name'       => 'password',
71 71
                 'required'   => true,
72 72
                 'validators' => [
73
-                    ['name' => 'NotEmpty'],
74
-                    ['name' => 'StringLength', 'options' => ['min' => 7, 'max' => 255]]
73
+                    [ 'name' => 'NotEmpty' ],
74
+                    [ 'name' => 'StringLength', 'options' => [ 'min' => 7, 'max' => 255 ] ]
75 75
                 ],
76 76
             ]);
77 77
 
@@ -79,15 +79,15 @@  discard block
 block discarded – undo
79 79
                 'name'       => 'confirm_password',
80 80
                 'required'   => true,
81 81
                 'validators' => [
82
-                    ['name' => 'NotEmpty'],
83
-                    ['name' => 'Identical', 'options' => ['token' => 'password']],
82
+                    [ 'name' => 'NotEmpty' ],
83
+                    [ 'name' => 'Identical', 'options' => [ 'token' => 'password' ] ],
84 84
                 ],
85 85
             ]);
86 86
 
87 87
             $inputFilter->add([
88 88
                 'name'       => 'status',
89 89
                 'required'   => true,
90
-                'validators' => [['name' => 'NotEmpty'], ['name' => 'Digits']]
90
+                'validators' => [ [ 'name' => 'NotEmpty' ], [ 'name' => 'Digits' ] ]
91 91
             ]);
92 92
 
93 93
             $this->inputFilter = $inputFilter;
Please login to merge, or discard this patch.
packages/Core/Filter/AbstractFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
     public function getMessages(array $msgs)
20 20
     {
21 21
         $allMsgs = '';
22
-        array_walk_recursive($msgs, function ($value) use (&$allMsgs){
22
+        array_walk_recursive($msgs, function($value) use (&$allMsgs){
23 23
             $allMsgs .= "- " . $value . "<br/>";
24 24
         });
25 25
 
Please login to merge, or discard this patch.
packages/Core/ConfigProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
             'middleware_pipeline' => [
51 51
                 // execute this middlweare on every /admin[*] path
52 52
                 'permission' => [
53
-                    'middleware' => [Middleware\AdminAuth::class],
53
+                    'middleware' => [ Middleware\AdminAuth::class ],
54 54
                     'priority'   => 100,
55 55
                     'path'       => '/admin'
56 56
                 ],
Please login to merge, or discard this patch.
packages/Core/Factory/Service/AdminUserServiceFactory.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace Core\Factory\Service;
5 5
 
@@ -20,8 +20,8 @@  discard block
 block discarded – undo
20 20
      */
21 21
     public function __invoke(ContainerInterface $container): AdminUserService
22 22
     {
23
-        $config = $container->get('config')['upload'];
24
-        $upload = new Upload($config['public_path'], $config['non_public_path']);
23
+        $config = $container->get('config')[ 'upload' ];
24
+        $upload = new Upload($config[ 'public_path' ], $config[ 'non_public_path' ]);
25 25
 
26 26
         return new AdminUserService(
27 27
             new Bcrypt(),
Please login to merge, or discard this patch.
packages/Core/Factory/Service/MeetupApiServiceFactory.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace Core\Factory\Service;
5 5
 
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
      */
17 17
     public function __invoke(ContainerInterface $container): MeetupApiService
18 18
     {
19
-        $config = $container->get('config')['meetupApi'];
19
+        $config = $container->get('config')[ 'meetupApi' ];
20 20
 
21
-        return new MeetupApiService($config['key']);
21
+        return new MeetupApiService($config[ 'key' ]);
22 22
     }
23 23
 }
Please login to merge, or discard this patch.
packages/Core/Middleware/AdminAuth.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
         if (!$user) {
55 55
             return $response->withStatus(302)->withHeader(
56 56
                 'Location',
57
-                $this->router->generateUri('auth', ['action' => 'login'])
57
+                $this->router->generateUri('auth', [ 'action' => 'login' ])
58 58
             );
59 59
         }
60 60
 
Please login to merge, or discard this patch.
packages/Newsletter/src/Service/NewsletterService.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,14 +15,14 @@
 block discarded – undo
15 15
 
16 16
     public function registerNew($email)
17 17
     {
18
-        if(!filter_var($email, FILTER_VALIDATE_EMAIL)) {
18
+        if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
19 19
             throw new \Exception('Email is not valid!', 400);
20 20
         }
21 21
 
22
-        $current = $this->newsletterMapper->select(['email' => $email])->current();
22
+        $current = $this->newsletterMapper->select([ 'email' => $email ])->current();
23 23
 
24
-        if(!$current) {
25
-            return $this->newsletterMapper->insert(['email' => $email]);
24
+        if (!$current) {
25
+            return $this->newsletterMapper->insert([ 'email' => $email ]);
26 26
         }
27 27
     }
28 28
 }
Please login to merge, or discard this patch.
packages/Newsletter/src/Service/NewsletterServiceFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Newsletter\Service;
6 6
 
Please login to merge, or discard this patch.