Passed
Push — master ( d23e96...1bc100 )
by Roeland
11:25 queued 10s
created
apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php 1 patch
Indentation   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -36,54 +36,54 @@
 block discarded – undo
36 36
  */
37 37
 class GlobalAuth extends AuthMechanism {
38 38
 
39
-	const CREDENTIALS_IDENTIFIER = 'password::global';
39
+    const CREDENTIALS_IDENTIFIER = 'password::global';
40 40
 
41
-	/** @var ICredentialsManager */
42
-	protected $credentialsManager;
41
+    /** @var ICredentialsManager */
42
+    protected $credentialsManager;
43 43
 
44
-	public function __construct(IL10N $l, ICredentialsManager $credentialsManager) {
45
-		$this->credentialsManager = $credentialsManager;
44
+    public function __construct(IL10N $l, ICredentialsManager $credentialsManager) {
45
+        $this->credentialsManager = $credentialsManager;
46 46
 
47
-		$this
48
-			->setIdentifier('password::global')
49
-			->setVisibility(BackendService::VISIBILITY_DEFAULT)
50
-			->setScheme(self::SCHEME_PASSWORD)
51
-			->setText($l->t('Global credentials'));
52
-	}
47
+        $this
48
+            ->setIdentifier('password::global')
49
+            ->setVisibility(BackendService::VISIBILITY_DEFAULT)
50
+            ->setScheme(self::SCHEME_PASSWORD)
51
+            ->setText($l->t('Global credentials'));
52
+    }
53 53
 
54
-	public function getAuth($uid) {
55
-		$auth = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER);
56
-		if (!is_array($auth)) {
57
-			return [
58
-				'user' => '',
59
-				'password' => ''
60
-			];
61
-		} else {
62
-			return $auth;
63
-		}
64
-	}
54
+    public function getAuth($uid) {
55
+        $auth = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER);
56
+        if (!is_array($auth)) {
57
+            return [
58
+                'user' => '',
59
+                'password' => ''
60
+            ];
61
+        } else {
62
+            return $auth;
63
+        }
64
+    }
65 65
 
66
-	public function saveAuth($uid, $user, $password) {
67
-		$this->credentialsManager->store($uid, self::CREDENTIALS_IDENTIFIER, [
68
-			'user' => $user,
69
-			'password' => $password
70
-		]);
71
-	}
66
+    public function saveAuth($uid, $user, $password) {
67
+        $this->credentialsManager->store($uid, self::CREDENTIALS_IDENTIFIER, [
68
+            'user' => $user,
69
+            'password' => $password
70
+        ]);
71
+    }
72 72
 
73
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
74
-		if ($storage->getType() === StorageConfig::MOUNT_TYPE_ADMIN) {
75
-			$uid = '';
76
-		} elseif (is_null($user)) {
77
-			throw new InsufficientDataForMeaningfulAnswerException('No credentials saved');
78
-		} else {
79
-			$uid = $user->getUID();
80
-		}
81
-		$credentials = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER);
73
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
74
+        if ($storage->getType() === StorageConfig::MOUNT_TYPE_ADMIN) {
75
+            $uid = '';
76
+        } elseif (is_null($user)) {
77
+            throw new InsufficientDataForMeaningfulAnswerException('No credentials saved');
78
+        } else {
79
+            $uid = $user->getUID();
80
+        }
81
+        $credentials = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER);
82 82
 
83
-		if (is_array($credentials)) {
84
-			$storage->setBackendOption('user', $credentials['user']);
85
-			$storage->setBackendOption('password', $credentials['password']);
86
-		}
87
-	}
83
+        if (is_array($credentials)) {
84
+            $storage->setBackendOption('user', $credentials['user']);
85
+            $storage->setBackendOption('password', $credentials['password']);
86
+        }
87
+    }
88 88
 
89 89
 }
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Auth/IUserProvided.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -28,10 +28,10 @@
 block discarded – undo
28 28
  * For auth mechanisms where the user needs to provide credentials
29 29
  */
30 30
 interface IUserProvided {
31
-	/**
32
-	 * @param IUser $user the user for which to save the user provided options
33
-	 * @param int $mountId the mount id to save the options for
34
-	 * @param array $options the user provided options
35
-	 */
36
-	public function saveBackendOptions(IUser $user, $mountId, array $options);
31
+    /**
32
+     * @param IUser $user the user for which to save the user provided options
33
+     * @param int $mountId the mount id to save the options for
34
+     * @param array $options the user provided options
35
+     */
36
+    public function saveBackendOptions(IUser $user, $mountId, array $options);
37 37
 }
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Auth/Builtin.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -29,12 +29,12 @@
 block discarded – undo
29 29
  */
30 30
 class Builtin extends AuthMechanism {
31 31
 
32
-	public function __construct(IL10N $l) {
33
-		$this
34
-			->setIdentifier('builtin::builtin')
35
-			->setScheme(self::SCHEME_BUILTIN)
36
-			->setText($l->t('Builtin'))
37
-		;
38
-	}
32
+    public function __construct(IL10N $l) {
33
+        $this
34
+            ->setIdentifier('builtin::builtin')
35
+            ->setScheme(self::SCHEME_BUILTIN)
36
+            ->setText($l->t('Builtin'))
37
+        ;
38
+    }
39 39
 
40 40
 }
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Auth/NullMechanism.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -29,12 +29,12 @@
 block discarded – undo
29 29
  */
30 30
 class NullMechanism extends AuthMechanism {
31 31
 
32
-	public function __construct(IL10N $l) {
33
-		$this
34
-			->setIdentifier('null::null')
35
-			->setScheme(self::SCHEME_NULL)
36
-			->setText($l->t('None'))
37
-		;
38
-	}
32
+    public function __construct(IL10N $l) {
33
+        $this
34
+            ->setIdentifier('null::null')
35
+            ->setScheme(self::SCHEME_NULL)
36
+            ->setText($l->t('None'))
37
+        ;
38
+    }
39 39
 
40 40
 }
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/PriorityTrait.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -29,33 +29,33 @@
 block discarded – undo
29 29
  */
30 30
 trait PriorityTrait {
31 31
 
32
-	/** @var int initial priority */
33
-	protected $priority = BackendService::PRIORITY_DEFAULT;
34
-
35
-	/**
36
-	 * @return int
37
-	 */
38
-	public function getPriority() {
39
-		return $this->priority;
40
-	}
41
-
42
-	/**
43
-	 * @param int $priority
44
-	 * @return self
45
-	 */
46
-	public function setPriority($priority) {
47
-		$this->priority = $priority;
48
-		return $this;
49
-	}
50
-
51
-	/**
52
-	 * @param PriorityTrait $a
53
-	 * @param PriorityTrait $b
54
-	 * @return int
55
-	 */
56
-	public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) {
57
-		return ($a->getPriority() - $b->getPriority());
58
-	}
32
+    /** @var int initial priority */
33
+    protected $priority = BackendService::PRIORITY_DEFAULT;
34
+
35
+    /**
36
+     * @return int
37
+     */
38
+    public function getPriority() {
39
+        return $this->priority;
40
+    }
41
+
42
+    /**
43
+     * @param int $priority
44
+     * @return self
45
+     */
46
+    public function setPriority($priority) {
47
+        $this->priority = $priority;
48
+        return $this;
49
+    }
50
+
51
+    /**
52
+     * @param PriorityTrait $a
53
+     * @param PriorityTrait $b
54
+     * @return int
55
+     */
56
+    public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) {
57
+        return ($a->getPriority() - $b->getPriority());
58
+    }
59 59
 
60 60
 }
61 61
 
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Config/IBackendProvider.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -30,10 +30,10 @@
 block discarded – undo
30 30
  */
31 31
 interface IBackendProvider {
32 32
 
33
-	/**
34
-	 * @since 9.1.0
35
-	 * @return Backend[]
36
-	 */
37
-	public function getBackends();
33
+    /**
34
+     * @since 9.1.0
35
+     * @return Backend[]
36
+     */
37
+    public function getBackends();
38 38
 
39 39
 }
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Config/IAuthMechanismProvider.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -30,10 +30,10 @@
 block discarded – undo
30 30
  */
31 31
 interface IAuthMechanismProvider {
32 32
 
33
-	/**
34
-	 * @since 9.1.0
35
-	 * @return AuthMechanism[]
36
-	 */
37
-	public function getAuthMechanisms();
33
+    /**
34
+     * @since 9.1.0
35
+     * @return AuthMechanism[]
36
+     */
37
+    public function getAuthMechanisms();
38 38
 
39 39
 }
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/SessionStorageWrapper.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -31,14 +31,14 @@
 block discarded – undo
31 31
  */
32 32
 class SessionStorageWrapper extends PermissionsMask {
33 33
 
34
-	/**
35
-	 * @param array $arguments ['storage' => $storage]
36
-	 */
37
-	public function __construct($arguments) {
38
-		// disable sharing permission
39
-		$arguments['mask'] = Constants::PERMISSION_ALL & ~Constants::PERMISSION_SHARE;
40
-		parent::__construct($arguments);
41
-	}
34
+    /**
35
+     * @param array $arguments ['storage' => $storage]
36
+     */
37
+    public function __construct($arguments) {
38
+        // disable sharing permission
39
+        $arguments['mask'] = Constants::PERMISSION_ALL & ~Constants::PERMISSION_SHARE;
40
+        parent::__construct($arguments);
41
+    }
42 42
 
43 43
 }
44 44
 
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Storage/FTP.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -93,8 +93,7 @@
 block discarded – undo
93 93
 	public function unlink($path) {
94 94
 		if ($this->is_dir($path)) {
95 95
 			return $this->rmdir($path);
96
-		}
97
-		else {
96
+		} else {
98 97
 			$url = $this->constructUrl($path);
99 98
 			$result = unlink($url);
100 99
 			clearstatcache(true, $url);
Please login to merge, or discard this patch.
Indentation   +108 added lines, -108 removed lines patch added patch discarded remove patch
@@ -38,120 +38,120 @@
 block discarded – undo
38 38
 use Icewind\Streams\RetryWrapper;
39 39
 
40 40
 class FTP extends StreamWrapper{
41
-	private $password;
42
-	private $user;
43
-	private $host;
44
-	private $secure;
45
-	private $root;
41
+    private $password;
42
+    private $user;
43
+    private $host;
44
+    private $secure;
45
+    private $root;
46 46
 
47
-	public function __construct($params) {
48
-		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
49
-			$this->host=$params['host'];
50
-			$this->user=$params['user'];
51
-			$this->password=$params['password'];
52
-			if (isset($params['secure'])) {
53
-				$this->secure = $params['secure'];
54
-			} else {
55
-				$this->secure = false;
56
-			}
57
-			$this->root=isset($params['root'])?$params['root']:'/';
58
-			if ( ! $this->root || $this->root[0]!=='/') {
59
-				$this->root='/'.$this->root;
60
-			}
61
-			if (substr($this->root, -1) !== '/') {
62
-				$this->root .= '/';
63
-			}
64
-		} else {
65
-			throw new \Exception('Creating FTP storage failed');
66
-		}
47
+    public function __construct($params) {
48
+        if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
49
+            $this->host=$params['host'];
50
+            $this->user=$params['user'];
51
+            $this->password=$params['password'];
52
+            if (isset($params['secure'])) {
53
+                $this->secure = $params['secure'];
54
+            } else {
55
+                $this->secure = false;
56
+            }
57
+            $this->root=isset($params['root'])?$params['root']:'/';
58
+            if ( ! $this->root || $this->root[0]!=='/') {
59
+                $this->root='/'.$this->root;
60
+            }
61
+            if (substr($this->root, -1) !== '/') {
62
+                $this->root .= '/';
63
+            }
64
+        } else {
65
+            throw new \Exception('Creating FTP storage failed');
66
+        }
67 67
 		
68
-	}
68
+    }
69 69
 
70
-	public function getId(){
71
-		return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root;
72
-	}
70
+    public function getId(){
71
+        return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root;
72
+    }
73 73
 
74
-	/**
75
-	 * construct the ftp url
76
-	 * @param string $path
77
-	 * @return string
78
-	 */
79
-	public function constructUrl($path) {
80
-		$url='ftp';
81
-		if ($this->secure) {
82
-			$url.='s';
83
-		}
84
-		$url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
85
-		return $url;
86
-	}
74
+    /**
75
+     * construct the ftp url
76
+     * @param string $path
77
+     * @return string
78
+     */
79
+    public function constructUrl($path) {
80
+        $url='ftp';
81
+        if ($this->secure) {
82
+            $url.='s';
83
+        }
84
+        $url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
85
+        return $url;
86
+    }
87 87
 
88
-	/**
89
-	 * Unlinks file or directory
90
-	 * @param string $path
91
-	 */
92
-	public function unlink($path) {
93
-		if ($this->is_dir($path)) {
94
-			return $this->rmdir($path);
95
-		}
96
-		else {
97
-			$url = $this->constructUrl($path);
98
-			$result = unlink($url);
99
-			clearstatcache(true, $url);
100
-			return $result;
101
-		}
102
-	}
103
-	public function fopen($path,$mode) {
104
-		switch($mode) {
105
-			case 'r':
106
-			case 'rb':
107
-			case 'w':
108
-			case 'wb':
109
-			case 'a':
110
-			case 'ab':
111
-				//these are supported by the wrapper
112
-				$context = stream_context_create(array('ftp' => array('overwrite' => true)));
113
-				$handle = fopen($this->constructUrl($path), $mode, false, $context);
114
-				return RetryWrapper::wrap($handle);
115
-			case 'r+':
116
-			case 'w+':
117
-			case 'wb+':
118
-			case 'a+':
119
-			case 'x':
120
-			case 'x+':
121
-			case 'c':
122
-			case 'c+':
123
-				//emulate these
124
-				if (strrpos($path, '.')!==false) {
125
-					$ext=substr($path, strrpos($path, '.'));
126
-				} else {
127
-					$ext='';
128
-				}
129
-				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
130
-				if ($this->file_exists($path)) {
131
-					$this->getFile($path, $tmpFile);
132
-				}
133
-				$handle = fopen($tmpFile, $mode);
134
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
135
-					$this->writeBack($tmpFile, $path);
136
-				});
137
-		}
138
-		return false;
139
-	}
88
+    /**
89
+     * Unlinks file or directory
90
+     * @param string $path
91
+     */
92
+    public function unlink($path) {
93
+        if ($this->is_dir($path)) {
94
+            return $this->rmdir($path);
95
+        }
96
+        else {
97
+            $url = $this->constructUrl($path);
98
+            $result = unlink($url);
99
+            clearstatcache(true, $url);
100
+            return $result;
101
+        }
102
+    }
103
+    public function fopen($path,$mode) {
104
+        switch($mode) {
105
+            case 'r':
106
+            case 'rb':
107
+            case 'w':
108
+            case 'wb':
109
+            case 'a':
110
+            case 'ab':
111
+                //these are supported by the wrapper
112
+                $context = stream_context_create(array('ftp' => array('overwrite' => true)));
113
+                $handle = fopen($this->constructUrl($path), $mode, false, $context);
114
+                return RetryWrapper::wrap($handle);
115
+            case 'r+':
116
+            case 'w+':
117
+            case 'wb+':
118
+            case 'a+':
119
+            case 'x':
120
+            case 'x+':
121
+            case 'c':
122
+            case 'c+':
123
+                //emulate these
124
+                if (strrpos($path, '.')!==false) {
125
+                    $ext=substr($path, strrpos($path, '.'));
126
+                } else {
127
+                    $ext='';
128
+                }
129
+                $tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
130
+                if ($this->file_exists($path)) {
131
+                    $this->getFile($path, $tmpFile);
132
+                }
133
+                $handle = fopen($tmpFile, $mode);
134
+                return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
135
+                    $this->writeBack($tmpFile, $path);
136
+                });
137
+        }
138
+        return false;
139
+    }
140 140
 
141
-	public function writeBack($tmpFile, $path) {
142
-		$this->uploadFile($tmpFile, $path);
143
-		unlink($tmpFile);
144
-	}
141
+    public function writeBack($tmpFile, $path) {
142
+        $this->uploadFile($tmpFile, $path);
143
+        unlink($tmpFile);
144
+    }
145 145
 
146
-	/**
147
-	 * check if php-ftp is installed
148
-	 */
149
-	public static function checkDependencies() {
150
-		if (function_exists('ftp_login')) {
151
-			return true;
152
-		} else {
153
-			return array('ftp');
154
-		}
155
-	}
146
+    /**
147
+     * check if php-ftp is installed
148
+     */
149
+    public static function checkDependencies() {
150
+        if (function_exists('ftp_login')) {
151
+            return true;
152
+        } else {
153
+            return array('ftp');
154
+        }
155
+    }
156 156
 
157 157
 }
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 use Icewind\Streams\CallbackWrapper;
38 38
 use Icewind\Streams\RetryWrapper;
39 39
 
40
-class FTP extends StreamWrapper{
40
+class FTP extends StreamWrapper {
41 41
 	private $password;
42 42
 	private $user;
43 43
 	private $host;
@@ -46,17 +46,17 @@  discard block
 block discarded – undo
46 46
 
47 47
 	public function __construct($params) {
48 48
 		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
49
-			$this->host=$params['host'];
50
-			$this->user=$params['user'];
51
-			$this->password=$params['password'];
49
+			$this->host = $params['host'];
50
+			$this->user = $params['user'];
51
+			$this->password = $params['password'];
52 52
 			if (isset($params['secure'])) {
53 53
 				$this->secure = $params['secure'];
54 54
 			} else {
55 55
 				$this->secure = false;
56 56
 			}
57
-			$this->root=isset($params['root'])?$params['root']:'/';
58
-			if ( ! $this->root || $this->root[0]!=='/') {
59
-				$this->root='/'.$this->root;
57
+			$this->root = isset($params['root']) ? $params['root'] : '/';
58
+			if (!$this->root || $this->root[0] !== '/') {
59
+				$this->root = '/'.$this->root;
60 60
 			}
61 61
 			if (substr($this->root, -1) !== '/') {
62 62
 				$this->root .= '/';
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
 		
68 68
 	}
69 69
 
70
-	public function getId(){
71
-		return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root;
70
+	public function getId() {
71
+		return 'ftp::'.$this->user.'@'.$this->host.'/'.$this->root;
72 72
 	}
73 73
 
74 74
 	/**
@@ -77,11 +77,11 @@  discard block
 block discarded – undo
77 77
 	 * @return string
78 78
 	 */
79 79
 	public function constructUrl($path) {
80
-		$url='ftp';
80
+		$url = 'ftp';
81 81
 		if ($this->secure) {
82
-			$url.='s';
82
+			$url .= 's';
83 83
 		}
84
-		$url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
84
+		$url .= '://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
85 85
 		return $url;
86 86
 	}
87 87
 
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
100 100
 			return $result;
101 101
 		}
102 102
 	}
103
-	public function fopen($path,$mode) {
104
-		switch($mode) {
103
+	public function fopen($path, $mode) {
104
+		switch ($mode) {
105 105
 			case 'r':
106 106
 			case 'rb':
107 107
 			case 'w':
@@ -121,17 +121,17 @@  discard block
 block discarded – undo
121 121
 			case 'c':
122 122
 			case 'c+':
123 123
 				//emulate these
124
-				if (strrpos($path, '.')!==false) {
125
-					$ext=substr($path, strrpos($path, '.'));
124
+				if (strrpos($path, '.') !== false) {
125
+					$ext = substr($path, strrpos($path, '.'));
126 126
 				} else {
127
-					$ext='';
127
+					$ext = '';
128 128
 				}
129 129
 				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
130 130
 				if ($this->file_exists($path)) {
131 131
 					$this->getFile($path, $tmpFile);
132 132
 				}
133 133
 				$handle = fopen($tmpFile, $mode);
134
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
134
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
135 135
 					$this->writeBack($tmpFile, $path);
136 136
 				});
137 137
 		}
Please login to merge, or discard this patch.