Passed
Push — master ( a578a5...8a7963 )
by Julius
32:38 queued 15:33
created
lib/private/Remote/Instance.php 1 patch
Indentation   +103 added lines, -103 removed lines patch added patch discarded remove patch
@@ -30,118 +30,118 @@
 block discarded – undo
30 30
  * Provides some basic info about a remote Nextcloud instance
31 31
  */
32 32
 class Instance implements IInstance {
33
-	/** @var string */
34
-	private $url;
33
+    /** @var string */
34
+    private $url;
35 35
 
36
-	/** @var ICache */
37
-	private $cache;
36
+    /** @var ICache */
37
+    private $cache;
38 38
 
39
-	/** @var IClientService */
40
-	private $clientService;
39
+    /** @var IClientService */
40
+    private $clientService;
41 41
 
42
-	/** @var array|null */
43
-	private $status;
42
+    /** @var array|null */
43
+    private $status;
44 44
 
45
-	/**
46
-	 * @param string $url
47
-	 * @param ICache $cache
48
-	 * @param IClientService $clientService
49
-	 */
50
-	public function __construct($url, ICache $cache, IClientService $clientService) {
51
-		$url = str_replace('https://', '', $url);
52
-		$this->url = str_replace('http://', '', $url);
53
-		$this->cache = $cache;
54
-		$this->clientService = $clientService;
55
-	}
45
+    /**
46
+     * @param string $url
47
+     * @param ICache $cache
48
+     * @param IClientService $clientService
49
+     */
50
+    public function __construct($url, ICache $cache, IClientService $clientService) {
51
+        $url = str_replace('https://', '', $url);
52
+        $this->url = str_replace('http://', '', $url);
53
+        $this->cache = $cache;
54
+        $this->clientService = $clientService;
55
+    }
56 56
 
57
-	/**
58
-	 * @return string The url of the remote server without protocol
59
-	 */
60
-	public function getUrl() {
61
-		return $this->url;
62
-	}
57
+    /**
58
+     * @return string The url of the remote server without protocol
59
+     */
60
+    public function getUrl() {
61
+        return $this->url;
62
+    }
63 63
 
64
-	/**
65
-	 * @return string The of of the remote server with protocol
66
-	 */
67
-	public function getFullUrl() {
68
-		return $this->getProtocol() . '://' . $this->getUrl();
69
-	}
64
+    /**
65
+     * @return string The of of the remote server with protocol
66
+     */
67
+    public function getFullUrl() {
68
+        return $this->getProtocol() . '://' . $this->getUrl();
69
+    }
70 70
 
71
-	/**
72
-	 * @return string The full version string in '13.1.2.3' format
73
-	 */
74
-	public function getVersion() {
75
-		$status = $this->getStatus();
76
-		return $status['version'];
77
-	}
71
+    /**
72
+     * @return string The full version string in '13.1.2.3' format
73
+     */
74
+    public function getVersion() {
75
+        $status = $this->getStatus();
76
+        return $status['version'];
77
+    }
78 78
 
79
-	/**
80
-	 * @return string 'http' or 'https'
81
-	 */
82
-	public function getProtocol() {
83
-		$status = $this->getStatus();
84
-		return $status['protocol'];
85
-	}
79
+    /**
80
+     * @return string 'http' or 'https'
81
+     */
82
+    public function getProtocol() {
83
+        $status = $this->getStatus();
84
+        return $status['protocol'];
85
+    }
86 86
 
87
-	/**
88
-	 * Check that the remote server is installed and not in maintenance mode
89
-	 *
90
-	 * @return bool
91
-	 */
92
-	public function isActive() {
93
-		$status = $this->getStatus();
94
-		return $status['installed'] && !$status['maintenance'];
95
-	}
87
+    /**
88
+     * Check that the remote server is installed and not in maintenance mode
89
+     *
90
+     * @return bool
91
+     */
92
+    public function isActive() {
93
+        $status = $this->getStatus();
94
+        return $status['installed'] && !$status['maintenance'];
95
+    }
96 96
 
97
-	/**
98
-	 * @return array
99
-	 * @throws NotFoundException
100
-	 * @throws \Exception
101
-	 */
102
-	private function getStatus() {
103
-		if ($this->status) {
104
-			return $this->status;
105
-		}
106
-		$key = 'remote/' . $this->url . '/status';
107
-		$httpsKey = 'remote/' . $this->url . '/https';
108
-		$status = $this->cache->get($key);
109
-		if (!$status) {
110
-			$response = $this->downloadStatus('https://' . $this->getUrl() . '/status.php');
111
-			$protocol = 'https';
112
-			if (!$response) {
113
-				if ($status = $this->cache->get($httpsKey)) {
114
-					throw new \Exception('refusing to connect to remote instance(' . $this->url . ') over http that was previously accessible over https');
115
-				}
116
-				$response = $this->downloadStatus('http://' . $this->getUrl() . '/status.php');
117
-				$protocol = 'http';
118
-			} else {
119
-				$this->cache->set($httpsKey, true, 60 * 60 * 24 * 365);
120
-			}
121
-			$status = json_decode($response, true);
122
-			if ($status) {
123
-				$status['protocol'] = $protocol;
124
-			}
125
-			if ($status) {
126
-				$this->cache->set($key, $status, 5 * 60);
127
-				$this->status = $status;
128
-			} else {
129
-				throw new NotFoundException('Remote server not found at address ' . $this->url);
130
-			}
131
-		}
132
-		return $status;
133
-	}
97
+    /**
98
+     * @return array
99
+     * @throws NotFoundException
100
+     * @throws \Exception
101
+     */
102
+    private function getStatus() {
103
+        if ($this->status) {
104
+            return $this->status;
105
+        }
106
+        $key = 'remote/' . $this->url . '/status';
107
+        $httpsKey = 'remote/' . $this->url . '/https';
108
+        $status = $this->cache->get($key);
109
+        if (!$status) {
110
+            $response = $this->downloadStatus('https://' . $this->getUrl() . '/status.php');
111
+            $protocol = 'https';
112
+            if (!$response) {
113
+                if ($status = $this->cache->get($httpsKey)) {
114
+                    throw new \Exception('refusing to connect to remote instance(' . $this->url . ') over http that was previously accessible over https');
115
+                }
116
+                $response = $this->downloadStatus('http://' . $this->getUrl() . '/status.php');
117
+                $protocol = 'http';
118
+            } else {
119
+                $this->cache->set($httpsKey, true, 60 * 60 * 24 * 365);
120
+            }
121
+            $status = json_decode($response, true);
122
+            if ($status) {
123
+                $status['protocol'] = $protocol;
124
+            }
125
+            if ($status) {
126
+                $this->cache->set($key, $status, 5 * 60);
127
+                $this->status = $status;
128
+            } else {
129
+                throw new NotFoundException('Remote server not found at address ' . $this->url);
130
+            }
131
+        }
132
+        return $status;
133
+    }
134 134
 
135
-	/**
136
-	 * @param string $url
137
-	 * @return bool|string
138
-	 */
139
-	private function downloadStatus($url) {
140
-		try {
141
-			$request = $this->clientService->newClient()->get($url);
142
-			return $request->getBody();
143
-		} catch (\Exception $e) {
144
-			return false;
145
-		}
146
-	}
135
+    /**
136
+     * @param string $url
137
+     * @return bool|string
138
+     */
139
+    private function downloadStatus($url) {
140
+        try {
141
+            $request = $this->clientService->newClient()->get($url);
142
+            return $request->getBody();
143
+        } catch (\Exception $e) {
144
+            return false;
145
+        }
146
+    }
147 147
 }
Please login to merge, or discard this patch.
lib/private/Remote/Api/ApiFactory.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -28,14 +28,14 @@
 block discarded – undo
28 28
 use OCP\Remote\IInstance;
29 29
 
30 30
 class ApiFactory implements IApiFactory {
31
-	/** @var IClientService */
32
-	private $clientService;
31
+    /** @var IClientService */
32
+    private $clientService;
33 33
 
34
-	public function __construct(IClientService $clientService) {
35
-		$this->clientService = $clientService;
36
-	}
34
+    public function __construct(IClientService $clientService) {
35
+        $this->clientService = $clientService;
36
+    }
37 37
 
38
-	public function getApiCollection(IInstance $instance, ICredentials $credentials) {
39
-		return new ApiCollection($instance, $credentials, $this->clientService);
40
-	}
38
+    public function getApiCollection(IInstance $instance, ICredentials $credentials) {
39
+        return new ApiCollection($instance, $credentials, $this->clientService);
40
+    }
41 41
 }
Please login to merge, or discard this patch.
lib/private/Remote/Api/ApiCollection.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -28,24 +28,24 @@
 block discarded – undo
28 28
 use OCP\Remote\IInstance;
29 29
 
30 30
 class ApiCollection implements IApiCollection {
31
-	/** @var IInstance */
32
-	private $instance;
33
-	/** @var ICredentials */
34
-	private $credentials;
35
-	/** @var IClientService */
36
-	private $clientService;
31
+    /** @var IInstance */
32
+    private $instance;
33
+    /** @var ICredentials */
34
+    private $credentials;
35
+    /** @var IClientService */
36
+    private $clientService;
37 37
 
38
-	public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) {
39
-		$this->instance = $instance;
40
-		$this->credentials = $credentials;
41
-		$this->clientService = $clientService;
42
-	}
38
+    public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) {
39
+        $this->instance = $instance;
40
+        $this->credentials = $credentials;
41
+        $this->clientService = $clientService;
42
+    }
43 43
 
44
-	public function getCapabilitiesApi() {
45
-		return new OCS($this->instance, $this->credentials, $this->clientService);
46
-	}
44
+    public function getCapabilitiesApi() {
45
+        return new OCS($this->instance, $this->credentials, $this->clientService);
46
+    }
47 47
 
48
-	public function getUserApi() {
49
-		return new OCS($this->instance, $this->credentials, $this->clientService);
50
-	}
48
+    public function getUserApi() {
49
+        return new OCS($this->instance, $this->credentials, $this->clientService);
50
+    }
51 51
 }
Please login to merge, or discard this patch.
lib/private/Remote/Api/ApiBase.php 1 patch
Indentation   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -26,72 +26,72 @@
 block discarded – undo
26 26
 use OCP\Remote\IInstance;
27 27
 
28 28
 class ApiBase {
29
-	/** @var IInstance */
30
-	private $instance;
31
-	/** @var ICredentials */
32
-	private $credentials;
33
-	/** @var IClientService */
34
-	private $clientService;
29
+    /** @var IInstance */
30
+    private $instance;
31
+    /** @var ICredentials */
32
+    private $credentials;
33
+    /** @var IClientService */
34
+    private $clientService;
35 35
 
36
-	public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) {
37
-		$this->instance = $instance;
38
-		$this->credentials = $credentials;
39
-		$this->clientService = $clientService;
40
-	}
36
+    public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) {
37
+        $this->instance = $instance;
38
+        $this->credentials = $credentials;
39
+        $this->clientService = $clientService;
40
+    }
41 41
 
42
-	protected function getHttpClient() {
43
-		return $this->clientService->newClient();
44
-	}
42
+    protected function getHttpClient() {
43
+        return $this->clientService->newClient();
44
+    }
45 45
 
46
-	protected function addDefaultHeaders(array $headers) {
47
-		return array_merge([
48
-			'OCS-APIREQUEST' => 'true',
49
-			'Accept' => 'application/json'
50
-		], $headers);
51
-	}
46
+    protected function addDefaultHeaders(array $headers) {
47
+        return array_merge([
48
+            'OCS-APIREQUEST' => 'true',
49
+            'Accept' => 'application/json'
50
+        ], $headers);
51
+    }
52 52
 
53
-	/**
54
-	 * @param string $method
55
-	 * @param string $url
56
-	 * @param array $body
57
-	 * @param array $query
58
-	 * @param array $headers
59
-	 * @return resource|string
60
-	 * @throws \InvalidArgumentException
61
-	 */
62
-	protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
63
-		$fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url;
64
-		$options = [
65
-			'query' => $query,
66
-			'headers' => $this->addDefaultHeaders($headers),
67
-			'auth' => [$this->credentials->getUsername(), $this->credentials->getPassword()]
68
-		];
69
-		if ($body) {
70
-			$options['body'] = $body;
71
-		}
53
+    /**
54
+     * @param string $method
55
+     * @param string $url
56
+     * @param array $body
57
+     * @param array $query
58
+     * @param array $headers
59
+     * @return resource|string
60
+     * @throws \InvalidArgumentException
61
+     */
62
+    protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
63
+        $fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url;
64
+        $options = [
65
+            'query' => $query,
66
+            'headers' => $this->addDefaultHeaders($headers),
67
+            'auth' => [$this->credentials->getUsername(), $this->credentials->getPassword()]
68
+        ];
69
+        if ($body) {
70
+            $options['body'] = $body;
71
+        }
72 72
 
73
-		$client = $this->getHttpClient();
73
+        $client = $this->getHttpClient();
74 74
 
75
-		switch ($method) {
76
-			case 'get':
77
-				$response = $client->get($fullUrl, $options);
78
-				break;
79
-			case 'post':
80
-				$response = $client->post($fullUrl, $options);
81
-				break;
82
-			case 'put':
83
-				$response = $client->put($fullUrl, $options);
84
-				break;
85
-			case 'delete':
86
-				$response = $client->delete($fullUrl, $options);
87
-				break;
88
-			case 'options':
89
-				$response = $client->options($fullUrl, $options);
90
-				break;
91
-			default:
92
-				throw new \InvalidArgumentException('Invalid method ' . $method);
93
-		}
75
+        switch ($method) {
76
+            case 'get':
77
+                $response = $client->get($fullUrl, $options);
78
+                break;
79
+            case 'post':
80
+                $response = $client->post($fullUrl, $options);
81
+                break;
82
+            case 'put':
83
+                $response = $client->put($fullUrl, $options);
84
+                break;
85
+            case 'delete':
86
+                $response = $client->delete($fullUrl, $options);
87
+                break;
88
+            case 'options':
89
+                $response = $client->options($fullUrl, $options);
90
+                break;
91
+            default:
92
+                throw new \InvalidArgumentException('Invalid method ' . $method);
93
+        }
94 94
 
95
-		return $response->getBody();
96
-	}
95
+        return $response->getBody();
96
+    }
97 97
 }
Please login to merge, or discard this patch.
lib/private/Remote/InstanceFactory.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -27,17 +27,17 @@
 block discarded – undo
27 27
 use OCP\Remote\IInstanceFactory;
28 28
 
29 29
 class InstanceFactory implements IInstanceFactory {
30
-	/** @var ICache */
31
-	private $cache;
32
-	/** @var IClientService */
33
-	private $clientService;
30
+    /** @var ICache */
31
+    private $cache;
32
+    /** @var IClientService */
33
+    private $clientService;
34 34
 
35
-	public function __construct(ICache $cache, IClientService $clientService) {
36
-		$this->cache = $cache;
37
-		$this->clientService = $clientService;
38
-	}
35
+    public function __construct(ICache $cache, IClientService $clientService) {
36
+        $this->cache = $cache;
37
+        $this->clientService = $clientService;
38
+    }
39 39
 
40
-	public function getInstance($url) {
41
-		return new Instance($url, $this->cache, $this->clientService);
42
-	}
40
+    public function getInstance($url) {
41
+        return new Instance($url, $this->cache, $this->clientService);
42
+    }
43 43
 }
Please login to merge, or discard this patch.
apps/user_ldap/lib/ILDAPGroupPlugin.php 1 patch
Indentation   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -26,61 +26,61 @@
 block discarded – undo
26 26
 
27 27
 interface ILDAPGroupPlugin {
28 28
 
29
-	/**
30
-	 * Check if plugin implements actions
31
-	 * @return int
32
-	 *
33
-	 * Returns the supported actions as int to be
34
-	 * compared with OC_GROUP_BACKEND_CREATE_GROUP etc.
35
-	 */
36
-	public function respondToActions();
29
+    /**
30
+     * Check if plugin implements actions
31
+     * @return int
32
+     *
33
+     * Returns the supported actions as int to be
34
+     * compared with OC_GROUP_BACKEND_CREATE_GROUP etc.
35
+     */
36
+    public function respondToActions();
37 37
 
38
-	/**
39
-	 * @param string $gid
40
-	 * @return string|null The group DN if group creation was successful.
41
-	 */
42
-	public function createGroup($gid);
38
+    /**
39
+     * @param string $gid
40
+     * @return string|null The group DN if group creation was successful.
41
+     */
42
+    public function createGroup($gid);
43 43
 
44
-	/**
45
-	 * delete a group
46
-	 * @param string $gid gid of the group to delete
47
-	 * @return bool
48
-	 */
49
-	public function deleteGroup($gid);
44
+    /**
45
+     * delete a group
46
+     * @param string $gid gid of the group to delete
47
+     * @return bool
48
+     */
49
+    public function deleteGroup($gid);
50 50
 
51
-	/**
52
-	 * Add a user to a group
53
-	 * @param string $uid Name of the user to add to group
54
-	 * @param string $gid Name of the group in which add the user
55
-	 * @return bool
56
-	 *
57
-	 * Adds a user to a group.
58
-	 */
59
-	public function addToGroup($uid, $gid);
51
+    /**
52
+     * Add a user to a group
53
+     * @param string $uid Name of the user to add to group
54
+     * @param string $gid Name of the group in which add the user
55
+     * @return bool
56
+     *
57
+     * Adds a user to a group.
58
+     */
59
+    public function addToGroup($uid, $gid);
60 60
 
61
-	/**
62
-	 * Removes a user from a group
63
-	 * @param string $uid Name of the user to remove from group
64
-	 * @param string $gid Name of the group from which remove the user
65
-	 * @return bool
66
-	 *
67
-	 * removes the user from a group.
68
-	 */
69
-	public function removeFromGroup($uid, $gid);
61
+    /**
62
+     * Removes a user from a group
63
+     * @param string $uid Name of the user to remove from group
64
+     * @param string $gid Name of the group from which remove the user
65
+     * @return bool
66
+     *
67
+     * removes the user from a group.
68
+     */
69
+    public function removeFromGroup($uid, $gid);
70 70
 
71
-	/**
72
-	 * get the number of all users matching the search string in a group
73
-	 * @param string $gid
74
-	 * @param string $search
75
-	 * @return int|false
76
-	 */
77
-	public function countUsersInGroup($gid, $search = '');
71
+    /**
72
+     * get the number of all users matching the search string in a group
73
+     * @param string $gid
74
+     * @param string $search
75
+     * @return int|false
76
+     */
77
+    public function countUsersInGroup($gid, $search = '');
78 78
 
79
-	/**
80
-	 * get an array with group details
81
-	 * @param string $gid
82
-	 * @return array|false
83
-	 */
84
-	public function getGroupDetails($gid);
79
+    /**
80
+     * get an array with group details
81
+     * @param string $gid
82
+     * @return array|false
83
+     */
84
+    public function getGroupDetails($gid);
85 85
 
86 86
 }
Please login to merge, or discard this patch.
lib/public/Federation/ICloudId.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -30,35 +30,35 @@
 block discarded – undo
30 30
  * @since 12.0.0
31 31
  */
32 32
 interface ICloudId {
33
-	/**
34
-	 * The remote cloud id
35
-	 *
36
-	 * @return string
37
-	 * @since 12.0.0
38
-	 */
39
-	public function getId(): string;
33
+    /**
34
+     * The remote cloud id
35
+     *
36
+     * @return string
37
+     * @since 12.0.0
38
+     */
39
+    public function getId(): string;
40 40
 
41
-	/**
42
-	 * Get a clean representation of the cloud id for display
43
-	 *
44
-	 * @return string
45
-	 * @since 12.0.0
46
-	 */
47
-	public function getDisplayId(): string;
41
+    /**
42
+     * Get a clean representation of the cloud id for display
43
+     *
44
+     * @return string
45
+     * @since 12.0.0
46
+     */
47
+    public function getDisplayId(): string;
48 48
 
49
-	/**
50
-	 * The username on the remote server
51
-	 *
52
-	 * @return string
53
-	 * @since 12.0.0
54
-	 */
55
-	public function getUser(): string;
49
+    /**
50
+     * The username on the remote server
51
+     *
52
+     * @return string
53
+     * @since 12.0.0
54
+     */
55
+    public function getUser(): string;
56 56
 
57
-	/**
58
-	 * The base address of the remote server
59
-	 *
60
-	 * @return string
61
-	 * @since 12.0.0
62
-	 */
63
-	public function getRemote(): string;
57
+    /**
58
+     * The base address of the remote server
59
+     *
60
+     * @return string
61
+     * @since 12.0.0
62
+     */
63
+    public function getRemote(): string;
64 64
 }
Please login to merge, or discard this patch.
lib/public/Http/Client/IClientService.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@
 block discarded – undo
31 31
  * @since 8.1.0
32 32
  */
33 33
 interface IClientService {
34
-	/**
35
-	 * @return IClient
36
-	 * @since 8.1.0
37
-	 */
38
-	public function newClient(): IClient;
34
+    /**
35
+     * @return IClient
36
+     * @since 8.1.0
37
+     */
38
+    public function newClient(): IClient;
39 39
 }
Please login to merge, or discard this patch.
lib/public/Http/Client/IResponse.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -32,28 +32,28 @@
 block discarded – undo
32 32
  * @since 8.1.0
33 33
  */
34 34
 interface IResponse {
35
-	/**
36
-	 * @return string|resource
37
-	 * @since 8.1.0
38
-	 */
39
-	public function getBody();
35
+    /**
36
+     * @return string|resource
37
+     * @since 8.1.0
38
+     */
39
+    public function getBody();
40 40
 
41
-	/**
42
-	 * @return int
43
-	 * @since 8.1.0
44
-	 */
45
-	public function getStatusCode(): int;
41
+    /**
42
+     * @return int
43
+     * @since 8.1.0
44
+     */
45
+    public function getStatusCode(): int;
46 46
 
47
-	/**
48
-	 * @param string $key
49
-	 * @return string
50
-	 * @since 8.1.0
51
-	 */
52
-	public function getHeader(string $key): string;
47
+    /**
48
+     * @param string $key
49
+     * @return string
50
+     * @since 8.1.0
51
+     */
52
+    public function getHeader(string $key): string;
53 53
 
54
-	/**
55
-	 * @return array
56
-	 * @since 8.1.0
57
-	 */
58
-	public function getHeaders(): array;
54
+    /**
55
+     * @return array
56
+     * @since 8.1.0
57
+     */
58
+    public function getHeaders(): array;
59 59
 }
Please login to merge, or discard this patch.