Completed
Pull Request — master (#461)
by Daniel
15:02
created
src/lib/Filesystem/Node/File.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -44,16 +44,16 @@
 block discarded – undo
44 44
      * @param array
45 45
      **/
46 46
     protected $temp_files = [
47
-        '/^\._(.*)$/',     // OS/X resource forks
48
-        '/^.DS_Store$/',   // OS/X custom folder settings
47
+        '/^\._(.*)$/', // OS/X resource forks
48
+        '/^.DS_Store$/', // OS/X custom folder settings
49 49
         '/^desktop.ini$/', // Windows custom folder settings
50
-        '/^Thumbs.db$/',   // Windows thumbnail cache
51
-        '/^.(.*).swpx$/',  // ViM temporary files
52
-        '/^.(.*).swx$/',   // ViM temporary files
53
-        '/^.(.*).swp$/',   // ViM temporary files
54
-        '/^\.dat(.*)$/',   // Smultron seems to create these
50
+        '/^Thumbs.db$/', // Windows thumbnail cache
51
+        '/^.(.*).swpx$/', // ViM temporary files
52
+        '/^.(.*).swx$/', // ViM temporary files
53
+        '/^.(.*).swp$/', // ViM temporary files
54
+        '/^\.dat(.*)$/', // Smultron seems to create these
55 55
         '/^~lock.(.*)#$/', // Windows 7 lockfiles
56
-        '/^\~\$/',         // Temporary office files
56
+        '/^\~\$/', // Temporary office files
57 57
     ];
58 58
 
59 59
     /**
Please login to merge, or discard this patch.
src/app/Balloon.App.Api/v2/Users.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
         }
162 162
 
163 163
         $attributes = compact('password', 'soft_quota', 'hard_quota', 'avatar', 'mail', 'admin', 'namespace', 'locale');
164
-        $attributes = array_filter($attributes, function ($attribute) {return !is_null($attribute); });
164
+        $attributes = array_filter($attributes, function($attribute) {return !is_null($attribute); });
165 165
 
166 166
         if (isset($attributes['avatar'])) {
167 167
             $attributes['avatar'] = new Binary(base64_decode($attributes['avatar']), Binary::TYPE_GENERIC);
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
     public function patch(string $id, ?string $username = null, ?string $password = null, ?int $soft_quota = null, ?int $hard_quota = null, ?string $avatar = null, ?string $mail = null, ?bool $admin = null, ?string $namespace = null, ?string $locale = null, ?bool $multi_factor_auth = null, ?string $multi_factor_validate = null): Response
180 180
     {
181 181
         $attributes = compact('username', 'password', 'soft_quota', 'hard_quota', 'avatar', 'mail', 'admin', 'namespace', 'locale', 'multi_factor_auth', 'multi_factor_validate');
182
-        $attributes = array_filter($attributes, function ($attribute) {return !is_null($attribute); });
182
+        $attributes = array_filter($attributes, function($attribute) {return !is_null($attribute); });
183 183
 
184 184
         if (isset($attributes['avatar'])) {
185 185
             $attributes['avatar'] = new Binary(base64_decode($attributes['avatar']), Binary::TYPE_GENERIC);
Please login to merge, or discard this patch.
src/app/Balloon.App.Idp/GrantType/UserCredentialsMultiFactor.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@
 block discarded – undo
107 107
 
108 108
                 $this->server->getUserById($user['_id'])->setAttributes([
109 109
                 'multi_factor_recovery' => $codes,
110
-              ]);
110
+                ]);
111 111
 
112 112
                 $this->user = $user;
113 113
 
Please login to merge, or discard this patch.