Completed
Push — master ( 7b60e3...8d70e9 )
by
unknown
20:41
created
apps/files_trashbin/lib/Sabre/AbstractTrashFile.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,11 +30,11 @@
 block discarded – undo
30 30
 use Sabre\DAV\IFile;
31 31
 
32 32
 abstract class AbstractTrashFile extends AbstractTrash implements IFile, ITrash {
33
-	public function put($data) {
34
-		throw new Forbidden();
35
-	}
33
+    public function put($data) {
34
+        throw new Forbidden();
35
+    }
36 36
 
37
-	public function setName($name) {
38
-		throw new Forbidden();
39
-	}
37
+    public function setName($name) {
38
+        throw new Forbidden();
39
+    }
40 40
 }
Please login to merge, or discard this patch.
apps/dav/lib/CardDAV/HasPhotoPlugin.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
 		$ns = '{http://nextcloud.com/ns}';
61 61
 
62 62
 		if ($node instanceof Card) {
63
-			$propFind->handle($ns . 'has-photo', function () use ($node) {
63
+			$propFind->handle($ns.'has-photo', function() use ($node) {
64 64
 				$vcard = Reader::read($node->get());
65 65
 				return $vcard instanceof VCard
66 66
 					&& $vcard->PHOTO
Please login to merge, or discard this patch.
Indentation   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -18,69 +18,69 @@
 block discarded – undo
18 18
 
19 19
 class HasPhotoPlugin extends ServerPlugin {
20 20
 
21
-	/** @var Server */
22
-	protected $server;
21
+    /** @var Server */
22
+    protected $server;
23 23
 
24
-	/**
25
-	 * Initializes the plugin and registers event handlers
26
-	 *
27
-	 * @param Server $server
28
-	 * @return void
29
-	 */
30
-	public function initialize(Server $server) {
31
-		$server->on('propFind', [$this, 'propFind']);
32
-	}
24
+    /**
25
+     * Initializes the plugin and registers event handlers
26
+     *
27
+     * @param Server $server
28
+     * @return void
29
+     */
30
+    public function initialize(Server $server) {
31
+        $server->on('propFind', [$this, 'propFind']);
32
+    }
33 33
 
34
-	/**
35
-	 * Adds all CardDAV-specific properties
36
-	 *
37
-	 * @param PropFind $propFind
38
-	 * @param INode $node
39
-	 * @return void
40
-	 */
41
-	public function propFind(PropFind $propFind, INode $node) {
42
-		$ns = '{http://nextcloud.com/ns}';
34
+    /**
35
+     * Adds all CardDAV-specific properties
36
+     *
37
+     * @param PropFind $propFind
38
+     * @param INode $node
39
+     * @return void
40
+     */
41
+    public function propFind(PropFind $propFind, INode $node) {
42
+        $ns = '{http://nextcloud.com/ns}';
43 43
 
44
-		if ($node instanceof Card) {
45
-			$propFind->handle($ns . 'has-photo', function () use ($node) {
46
-				$vcard = Reader::read($node->get());
47
-				return $vcard instanceof VCard
48
-					&& $vcard->PHOTO
49
-					// Either the PHOTO is a url (doesn't start with data:) or the mimetype has to start with image/
50
-					&& (!str_starts_with($vcard->PHOTO->getValue(), 'data:')
51
-						|| str_starts_with($vcard->PHOTO->getValue(), 'data:image/'))
52
-				;
53
-			});
54
-		}
55
-	}
44
+        if ($node instanceof Card) {
45
+            $propFind->handle($ns . 'has-photo', function () use ($node) {
46
+                $vcard = Reader::read($node->get());
47
+                return $vcard instanceof VCard
48
+                    && $vcard->PHOTO
49
+                    // Either the PHOTO is a url (doesn't start with data:) or the mimetype has to start with image/
50
+                    && (!str_starts_with($vcard->PHOTO->getValue(), 'data:')
51
+                        || str_starts_with($vcard->PHOTO->getValue(), 'data:image/'))
52
+                ;
53
+            });
54
+        }
55
+    }
56 56
 
57
-	/**
58
-	 * Returns a plugin name.
59
-	 *
60
-	 * Using this name other plugins will be able to access other plugins
61
-	 * using \Sabre\DAV\Server::getPlugin
62
-	 *
63
-	 * @return string
64
-	 */
65
-	public function getPluginName() {
66
-		return 'vcard-has-photo';
67
-	}
57
+    /**
58
+     * Returns a plugin name.
59
+     *
60
+     * Using this name other plugins will be able to access other plugins
61
+     * using \Sabre\DAV\Server::getPlugin
62
+     *
63
+     * @return string
64
+     */
65
+    public function getPluginName() {
66
+        return 'vcard-has-photo';
67
+    }
68 68
 
69
-	/**
70
-	 * Returns a bunch of meta-data about the plugin.
71
-	 *
72
-	 * Providing this information is optional, and is mainly displayed by the
73
-	 * Browser plugin.
74
-	 *
75
-	 * The description key in the returned array may contain html and will not
76
-	 * be sanitized.
77
-	 *
78
-	 * @return array
79
-	 */
80
-	public function getPluginInfo() {
81
-		return [
82
-			'name' => $this->getPluginName(),
83
-			'description' => 'Return a boolean stating if the vcard have a photo property set or not.'
84
-		];
85
-	}
69
+    /**
70
+     * Returns a bunch of meta-data about the plugin.
71
+     *
72
+     * Providing this information is optional, and is mainly displayed by the
73
+     * Browser plugin.
74
+     *
75
+     * The description key in the returned array may contain html and will not
76
+     * be sanitized.
77
+     *
78
+     * @return array
79
+     */
80
+    public function getPluginInfo() {
81
+        return [
82
+            'name' => $this->getPluginName(),
83
+            'description' => 'Return a boolean stating if the vcard have a photo property set or not.'
84
+        ];
85
+    }
86 86
 }
Please login to merge, or discard this patch.
apps/user_ldap/lib/Mapping/UserMapping.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,6 +35,6 @@
 block discarded – undo
35 35
 	 */
36 36
 	protected function getTableName(bool $includePrefix = true) {
37 37
 		$p = $includePrefix ? '*PREFIX*' : '';
38
-		return $p . 'ldap_user_mapping';
38
+		return $p.'ldap_user_mapping';
39 39
 	}
40 40
 }
Please login to merge, or discard this patch.
Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -20,45 +20,45 @@
 block discarded – undo
20 20
  */
21 21
 class UserMapping extends AbstractMapping {
22 22
 
23
-	protected const PROV_API_REGEX = '/\/ocs\/v[1-9].php\/cloud\/(groups|users)/';
23
+    protected const PROV_API_REGEX = '/\/ocs\/v[1-9].php\/cloud\/(groups|users)/';
24 24
 
25
-	public function __construct(
26
-		IDBConnection $dbc,
27
-		private IAssertion $assertion,
28
-	) {
29
-		parent::__construct($dbc);
30
-	}
25
+    public function __construct(
26
+        IDBConnection $dbc,
27
+        private IAssertion $assertion,
28
+    ) {
29
+        parent::__construct($dbc);
30
+    }
31 31
 
32
-	/**
33
-	 * @throws HintException
34
-	 */
35
-	public function map($fdn, $name, $uuid): bool {
36
-		try {
37
-			$this->assertion->createUserIsLegit();
38
-		} catch (HintException $e) {
39
-			static $isProvisioningApi = null;
32
+    /**
33
+     * @throws HintException
34
+     */
35
+    public function map($fdn, $name, $uuid): bool {
36
+        try {
37
+            $this->assertion->createUserIsLegit();
38
+        } catch (HintException $e) {
39
+            static $isProvisioningApi = null;
40 40
 
41
-			if ($isProvisioningApi === null) {
42
-				$request = Server::get(IRequest::class);
43
-				$isProvisioningApi = \preg_match(self::PROV_API_REGEX, $request->getRequestUri()) === 1;
44
-			}
45
-			if ($isProvisioningApi) {
46
-				// only throw when prov API is being used, since functionality
47
-				// should not break for end users (e.g. when sharing).
48
-				// On direct API usage, e.g. on users page, this is desired.
49
-				throw $e;
50
-			}
51
-			return false;
52
-		}
53
-		return parent::map($fdn, $name, $uuid);
54
-	}
41
+            if ($isProvisioningApi === null) {
42
+                $request = Server::get(IRequest::class);
43
+                $isProvisioningApi = \preg_match(self::PROV_API_REGEX, $request->getRequestUri()) === 1;
44
+            }
45
+            if ($isProvisioningApi) {
46
+                // only throw when prov API is being used, since functionality
47
+                // should not break for end users (e.g. when sharing).
48
+                // On direct API usage, e.g. on users page, this is desired.
49
+                throw $e;
50
+            }
51
+            return false;
52
+        }
53
+        return parent::map($fdn, $name, $uuid);
54
+    }
55 55
 
56
-	/**
57
-	 * returns the DB table name which holds the mappings
58
-	 * @return string
59
-	 */
60
-	protected function getTableName(bool $includePrefix = true) {
61
-		$p = $includePrefix ? '*PREFIX*' : '';
62
-		return $p . 'ldap_user_mapping';
63
-	}
56
+    /**
57
+     * returns the DB table name which holds the mappings
58
+     * @return string
59
+     */
60
+    protected function getTableName(bool $includePrefix = true) {
61
+        $p = $includePrefix ? '*PREFIX*' : '';
62
+        return $p . 'ldap_user_mapping';
63
+    }
64 64
 }
Please login to merge, or discard this patch.
apps/user_ldap/lib/Mapping/GroupMapping.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -29,12 +29,12 @@
 block discarded – undo
29 29
  */
30 30
 class GroupMapping extends AbstractMapping {
31 31
 
32
-	/**
33
-	 * returns the DB table name which holds the mappings
34
-	 * @return string
35
-	 */
36
-	protected function getTableName(bool $includePrefix = true) {
37
-		$p = $includePrefix ? '*PREFIX*' : '';
38
-		return $p . 'ldap_group_mapping';
39
-	}
32
+    /**
33
+     * returns the DB table name which holds the mappings
34
+     * @return string
35
+     */
36
+    protected function getTableName(bool $includePrefix = true) {
37
+        $p = $includePrefix ? '*PREFIX*' : '';
38
+        return $p . 'ldap_group_mapping';
39
+    }
40 40
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,6 +35,6 @@
 block discarded – undo
35 35
 	 */
36 36
 	protected function getTableName(bool $includePrefix = true) {
37 37
 		$p = $includePrefix ? '*PREFIX*' : '';
38
-		return $p . 'ldap_group_mapping';
38
+		return $p.'ldap_group_mapping';
39 39
 	}
40 40
 }
Please login to merge, or discard this patch.
apps/user_ldap/lib/Proxy.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	 * @return string
108 108
 	 */
109 109
 	protected function getUserCacheKey($uid) {
110
-		return 'user-' . $uid . '-lastSeenOn';
110
+		return 'user-'.$uid.'-lastSeenOn';
111 111
 	}
112 112
 
113 113
 	/**
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	 * @return string
116 116
 	 */
117 117
 	protected function getGroupCacheKey($gid) {
118
-		return 'group-' . $gid . '-lastSeenOn';
118
+		return 'group-'.$gid.'-lastSeenOn';
119 119
 	}
120 120
 
121 121
 	/**
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 		if ($key === null) {
179 179
 			return $prefix;
180 180
 		}
181
-		return $prefix . hash('sha256', $key);
181
+		return $prefix.hash('sha256', $key);
182 182
 	}
183 183
 
184 184
 	/**
Please login to merge, or discard this patch.
Indentation   +187 added lines, -187 removed lines patch added patch discarded remove patch
@@ -17,191 +17,191 @@
 block discarded – undo
17 17
  * @template T
18 18
  */
19 19
 abstract class Proxy {
20
-	/** @var array<string,Access> */
21
-	private static array $accesses = [];
22
-	private ?bool $isSingleBackend = null;
23
-	private ?ICache $cache = null;
24
-
25
-	/** @var T[] */
26
-	protected array $backends = [];
27
-	/** @var ?T */
28
-	protected $refBackend = null;
29
-
30
-	protected bool $isSetUp = false;
31
-
32
-	public function __construct(
33
-		private Helper $helper,
34
-		private ILDAPWrapper $ldap,
35
-		private AccessFactory $accessFactory,
36
-	) {
37
-		$memcache = Server::get(ICacheFactory::class);
38
-		if ($memcache->isAvailable()) {
39
-			$this->cache = $memcache->createDistributed();
40
-		}
41
-	}
42
-
43
-	protected function setup(): void {
44
-		if ($this->isSetUp) {
45
-			return;
46
-		}
47
-
48
-		$serverConfigPrefixes = $this->helper->getServerConfigurationPrefixes(true);
49
-		foreach ($serverConfigPrefixes as $configPrefix) {
50
-			$this->backends[$configPrefix] = $this->newInstance($configPrefix);
51
-
52
-			if (is_null($this->refBackend)) {
53
-				$this->refBackend = $this->backends[$configPrefix];
54
-			}
55
-		}
56
-
57
-		$this->isSetUp = true;
58
-	}
59
-
60
-	/**
61
-	 * @return T
62
-	 */
63
-	abstract protected function newInstance(string $configPrefix): object;
64
-
65
-	/**
66
-	 * @return T
67
-	 */
68
-	public function getBackend(string $configPrefix): object {
69
-		$this->setup();
70
-		return $this->backends[$configPrefix];
71
-	}
72
-
73
-	private function addAccess(string $configPrefix): void {
74
-		$userMap = Server::get(UserMapping::class);
75
-		$groupMap = Server::get(GroupMapping::class);
76
-
77
-		$connector = new Connection($this->ldap, $configPrefix);
78
-		$access = $this->accessFactory->get($connector);
79
-		$access->setUserMapper($userMap);
80
-		$access->setGroupMapper($groupMap);
81
-		self::$accesses[$configPrefix] = $access;
82
-	}
83
-
84
-	protected function getAccess(string $configPrefix): Access {
85
-		if (!isset(self::$accesses[$configPrefix])) {
86
-			$this->addAccess($configPrefix);
87
-		}
88
-		return self::$accesses[$configPrefix];
89
-	}
90
-
91
-	/**
92
-	 * @param string $uid
93
-	 * @return string
94
-	 */
95
-	protected function getUserCacheKey($uid) {
96
-		return 'user-' . $uid . '-lastSeenOn';
97
-	}
98
-
99
-	/**
100
-	 * @param string $gid
101
-	 * @return string
102
-	 */
103
-	protected function getGroupCacheKey($gid) {
104
-		return 'group-' . $gid . '-lastSeenOn';
105
-	}
106
-
107
-	/**
108
-	 * @param string $id
109
-	 * @param string $method
110
-	 * @param array $parameters
111
-	 * @param bool $passOnWhen
112
-	 * @return mixed
113
-	 */
114
-	abstract protected function callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
115
-
116
-	/**
117
-	 * @param string $id
118
-	 * @param string $method
119
-	 * @param array $parameters
120
-	 * @return mixed
121
-	 */
122
-	abstract protected function walkBackends($id, $method, $parameters);
123
-
124
-	/**
125
-	 * @param string $id
126
-	 * @return Access
127
-	 */
128
-	abstract public function getLDAPAccess($id);
129
-
130
-	abstract protected function activeBackends(): int;
131
-
132
-	protected function isSingleBackend(): bool {
133
-		if ($this->isSingleBackend === null) {
134
-			$this->isSingleBackend = $this->activeBackends() === 1;
135
-		}
136
-		return $this->isSingleBackend;
137
-	}
138
-
139
-	/**
140
-	 * Takes care of the request to the User backend
141
-	 *
142
-	 * @param string $id
143
-	 * @param string $method string, the method of the user backend that shall be called
144
-	 * @param array $parameters an array of parameters to be passed
145
-	 * @param bool $passOnWhen
146
-	 * @return mixed the result of the specified method
147
-	 */
148
-	protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
149
-		if (!$this->isSingleBackend()) {
150
-			$result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
151
-		}
152
-		if (!isset($result) || $result === $passOnWhen) {
153
-			$result = $this->walkBackends($id, $method, $parameters);
154
-		}
155
-		return $result;
156
-	}
157
-
158
-	/**
159
-	 * @param string|null $key
160
-	 * @return string
161
-	 */
162
-	private function getCacheKey($key) {
163
-		$prefix = 'LDAP-Proxy-';
164
-		if ($key === null) {
165
-			return $prefix;
166
-		}
167
-		return $prefix . hash('sha256', $key);
168
-	}
169
-
170
-	/**
171
-	 * @param string $key
172
-	 * @return mixed|null
173
-	 */
174
-	public function getFromCache($key) {
175
-		if ($this->cache === null) {
176
-			return null;
177
-		}
178
-
179
-		$key = $this->getCacheKey($key);
180
-		$value = $this->cache->get($key);
181
-		if ($value === null) {
182
-			return null;
183
-		}
184
-
185
-		return json_decode(base64_decode($value));
186
-	}
187
-
188
-	/**
189
-	 * @param string $key
190
-	 * @param mixed $value
191
-	 */
192
-	public function writeToCache($key, $value) {
193
-		if ($this->cache === null) {
194
-			return;
195
-		}
196
-		$key = $this->getCacheKey($key);
197
-		$value = base64_encode(json_encode($value));
198
-		$this->cache->set($key, $value, 2592000);
199
-	}
200
-
201
-	public function clearCache() {
202
-		if ($this->cache === null) {
203
-			return;
204
-		}
205
-		$this->cache->clear($this->getCacheKey(null));
206
-	}
20
+    /** @var array<string,Access> */
21
+    private static array $accesses = [];
22
+    private ?bool $isSingleBackend = null;
23
+    private ?ICache $cache = null;
24
+
25
+    /** @var T[] */
26
+    protected array $backends = [];
27
+    /** @var ?T */
28
+    protected $refBackend = null;
29
+
30
+    protected bool $isSetUp = false;
31
+
32
+    public function __construct(
33
+        private Helper $helper,
34
+        private ILDAPWrapper $ldap,
35
+        private AccessFactory $accessFactory,
36
+    ) {
37
+        $memcache = Server::get(ICacheFactory::class);
38
+        if ($memcache->isAvailable()) {
39
+            $this->cache = $memcache->createDistributed();
40
+        }
41
+    }
42
+
43
+    protected function setup(): void {
44
+        if ($this->isSetUp) {
45
+            return;
46
+        }
47
+
48
+        $serverConfigPrefixes = $this->helper->getServerConfigurationPrefixes(true);
49
+        foreach ($serverConfigPrefixes as $configPrefix) {
50
+            $this->backends[$configPrefix] = $this->newInstance($configPrefix);
51
+
52
+            if (is_null($this->refBackend)) {
53
+                $this->refBackend = $this->backends[$configPrefix];
54
+            }
55
+        }
56
+
57
+        $this->isSetUp = true;
58
+    }
59
+
60
+    /**
61
+     * @return T
62
+     */
63
+    abstract protected function newInstance(string $configPrefix): object;
64
+
65
+    /**
66
+     * @return T
67
+     */
68
+    public function getBackend(string $configPrefix): object {
69
+        $this->setup();
70
+        return $this->backends[$configPrefix];
71
+    }
72
+
73
+    private function addAccess(string $configPrefix): void {
74
+        $userMap = Server::get(UserMapping::class);
75
+        $groupMap = Server::get(GroupMapping::class);
76
+
77
+        $connector = new Connection($this->ldap, $configPrefix);
78
+        $access = $this->accessFactory->get($connector);
79
+        $access->setUserMapper($userMap);
80
+        $access->setGroupMapper($groupMap);
81
+        self::$accesses[$configPrefix] = $access;
82
+    }
83
+
84
+    protected function getAccess(string $configPrefix): Access {
85
+        if (!isset(self::$accesses[$configPrefix])) {
86
+            $this->addAccess($configPrefix);
87
+        }
88
+        return self::$accesses[$configPrefix];
89
+    }
90
+
91
+    /**
92
+     * @param string $uid
93
+     * @return string
94
+     */
95
+    protected function getUserCacheKey($uid) {
96
+        return 'user-' . $uid . '-lastSeenOn';
97
+    }
98
+
99
+    /**
100
+     * @param string $gid
101
+     * @return string
102
+     */
103
+    protected function getGroupCacheKey($gid) {
104
+        return 'group-' . $gid . '-lastSeenOn';
105
+    }
106
+
107
+    /**
108
+     * @param string $id
109
+     * @param string $method
110
+     * @param array $parameters
111
+     * @param bool $passOnWhen
112
+     * @return mixed
113
+     */
114
+    abstract protected function callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
115
+
116
+    /**
117
+     * @param string $id
118
+     * @param string $method
119
+     * @param array $parameters
120
+     * @return mixed
121
+     */
122
+    abstract protected function walkBackends($id, $method, $parameters);
123
+
124
+    /**
125
+     * @param string $id
126
+     * @return Access
127
+     */
128
+    abstract public function getLDAPAccess($id);
129
+
130
+    abstract protected function activeBackends(): int;
131
+
132
+    protected function isSingleBackend(): bool {
133
+        if ($this->isSingleBackend === null) {
134
+            $this->isSingleBackend = $this->activeBackends() === 1;
135
+        }
136
+        return $this->isSingleBackend;
137
+    }
138
+
139
+    /**
140
+     * Takes care of the request to the User backend
141
+     *
142
+     * @param string $id
143
+     * @param string $method string, the method of the user backend that shall be called
144
+     * @param array $parameters an array of parameters to be passed
145
+     * @param bool $passOnWhen
146
+     * @return mixed the result of the specified method
147
+     */
148
+    protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
149
+        if (!$this->isSingleBackend()) {
150
+            $result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
151
+        }
152
+        if (!isset($result) || $result === $passOnWhen) {
153
+            $result = $this->walkBackends($id, $method, $parameters);
154
+        }
155
+        return $result;
156
+    }
157
+
158
+    /**
159
+     * @param string|null $key
160
+     * @return string
161
+     */
162
+    private function getCacheKey($key) {
163
+        $prefix = 'LDAP-Proxy-';
164
+        if ($key === null) {
165
+            return $prefix;
166
+        }
167
+        return $prefix . hash('sha256', $key);
168
+    }
169
+
170
+    /**
171
+     * @param string $key
172
+     * @return mixed|null
173
+     */
174
+    public function getFromCache($key) {
175
+        if ($this->cache === null) {
176
+            return null;
177
+        }
178
+
179
+        $key = $this->getCacheKey($key);
180
+        $value = $this->cache->get($key);
181
+        if ($value === null) {
182
+            return null;
183
+        }
184
+
185
+        return json_decode(base64_decode($value));
186
+    }
187
+
188
+    /**
189
+     * @param string $key
190
+     * @param mixed $value
191
+     */
192
+    public function writeToCache($key, $value) {
193
+        if ($this->cache === null) {
194
+            return;
195
+        }
196
+        $key = $this->getCacheKey($key);
197
+        $value = base64_encode(json_encode($value));
198
+        $this->cache->set($key, $value, 2592000);
199
+    }
200
+
201
+    public function clearCache() {
202
+        if ($this->cache === null) {
203
+            return;
204
+        }
205
+        $this->cache->clear($this->getCacheKey(null));
206
+    }
207 207
 }
Please login to merge, or discard this patch.
lib/private/AppFramework/Services/InitialState.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -29,22 +29,22 @@
 block discarded – undo
29 29
 use OCP\IInitialStateService;
30 30
 
31 31
 class InitialState implements IInitialState {
32
-	/** @var IInitialStateService */
33
-	private $state;
32
+    /** @var IInitialStateService */
33
+    private $state;
34 34
 
35
-	/** @var string */
36
-	private $appName;
35
+    /** @var string */
36
+    private $appName;
37 37
 
38
-	public function __construct(IInitialStateService $state, string $appName) {
39
-		$this->state = $state;
40
-		$this->appName = $appName;
41
-	}
38
+    public function __construct(IInitialStateService $state, string $appName) {
39
+        $this->state = $state;
40
+        $this->appName = $appName;
41
+    }
42 42
 
43
-	public function provideInitialState(string $key, $data): void {
44
-		$this->state->provideInitialState($this->appName, $key, $data);
45
-	}
43
+    public function provideInitialState(string $key, $data): void {
44
+        $this->state->provideInitialState($this->appName, $key, $data);
45
+    }
46 46
 
47
-	public function provideLazyInitialState(string $key, \Closure $closure): void {
48
-		$this->state->provideLazyInitialState($this->appName, $key, $closure);
49
-	}
47
+    public function provideLazyInitialState(string $key, \Closure $closure): void {
48
+        $this->state->provideLazyInitialState($this->appName, $key, $closure);
49
+    }
50 50
 }
Please login to merge, or discard this patch.
lib/private/AppFramework/Middleware/NotModifiedMiddleware.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 
41 41
 	public function afterController($controller, $methodName, Response $response) {
42 42
 		$etagHeader = $this->request->getHeader('IF_NONE_MATCH');
43
-		if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') {
43
+		if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"'.$response->getETag().'"') {
44 44
 			$response->setStatus(Http::STATUS_NOT_MODIFIED);
45 45
 			return $response;
46 46
 		}
Please login to merge, or discard this patch.
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -14,26 +14,26 @@
 block discarded – undo
14 14
 use OCP\IRequest;
15 15
 
16 16
 class NotModifiedMiddleware extends Middleware {
17
-	/** @var IRequest */
18
-	private $request;
19
-
20
-	public function __construct(IRequest $request) {
21
-		$this->request = $request;
22
-	}
23
-
24
-	public function afterController($controller, $methodName, Response $response) {
25
-		$etagHeader = $this->request->getHeader('IF_NONE_MATCH');
26
-		if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') {
27
-			$response->setStatus(Http::STATUS_NOT_MODIFIED);
28
-			return $response;
29
-		}
30
-
31
-		$modifiedSinceHeader = $this->request->getHeader('IF_MODIFIED_SINCE');
32
-		if ($modifiedSinceHeader !== '' && $response->getLastModified() !== null && trim($modifiedSinceHeader) === $response->getLastModified()->format(\DateTimeInterface::RFC7231)) {
33
-			$response->setStatus(Http::STATUS_NOT_MODIFIED);
34
-			return $response;
35
-		}
36
-
37
-		return $response;
38
-	}
17
+    /** @var IRequest */
18
+    private $request;
19
+
20
+    public function __construct(IRequest $request) {
21
+        $this->request = $request;
22
+    }
23
+
24
+    public function afterController($controller, $methodName, Response $response) {
25
+        $etagHeader = $this->request->getHeader('IF_NONE_MATCH');
26
+        if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') {
27
+            $response->setStatus(Http::STATUS_NOT_MODIFIED);
28
+            return $response;
29
+        }
30
+
31
+        $modifiedSinceHeader = $this->request->getHeader('IF_MODIFIED_SINCE');
32
+        if ($modifiedSinceHeader !== '' && $response->getLastModified() !== null && trim($modifiedSinceHeader) === $response->getLastModified()->format(\DateTimeInterface::RFC7231)) {
33
+            $response->setStatus(Http::STATUS_NOT_MODIFIED);
34
+            return $response;
35
+        }
36
+
37
+        return $response;
38
+    }
39 39
 }
Please login to merge, or discard this patch.
resources/update-locales.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,28 +25,28 @@
 block discarded – undo
25 25
  */
26 26
 
27 27
 if (!extension_loaded('intl')) {
28
-	echo 'Intl extension is required to run this script.';
29
-	exit(1);
28
+    echo 'Intl extension is required to run this script.';
29
+    exit(1);
30 30
 }
31 31
 
32 32
 require '../3rdparty/autoload.php';
33 33
 
34 34
 $locales = array_map(static function (string $localeCode) {
35
-	return [
36
-		'code' => $localeCode,
37
-		'name' => Locale::getDisplayName($localeCode, 'en')
38
-	];
35
+    return [
36
+        'code' => $localeCode,
37
+        'name' => Locale::getDisplayName($localeCode, 'en')
38
+    ];
39 39
 }, ResourceBundle::getLocales(''));
40 40
 
41 41
 $locales = array_filter($locales, static function (array $locale) {
42
-	return is_array(Punic\Data::explodeLocale($locale['code']));
42
+    return is_array(Punic\Data::explodeLocale($locale['code']));
43 43
 });
44 44
 
45 45
 $locales = array_values($locales);
46 46
 
47 47
 if (file_put_contents(__DIR__ . '/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) {
48
-	echo 'Failed to update locales.json';
49
-	exit(1);
48
+    echo 'Failed to update locales.json';
49
+    exit(1);
50 50
 }
51 51
 
52 52
 echo 'Updated locales.json. Don\'t forget to commit the result.';
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,20 +31,20 @@
 block discarded – undo
31 31
 
32 32
 require '../3rdparty/autoload.php';
33 33
 
34
-$locales = array_map(static function (string $localeCode) {
34
+$locales = array_map(static function(string $localeCode) {
35 35
 	return [
36 36
 		'code' => $localeCode,
37 37
 		'name' => Locale::getDisplayName($localeCode, 'en')
38 38
 	];
39 39
 }, ResourceBundle::getLocales(''));
40 40
 
41
-$locales = array_filter($locales, static function (array $locale) {
41
+$locales = array_filter($locales, static function(array $locale) {
42 42
 	return is_array(Punic\Data::explodeLocale($locale['code']));
43 43
 });
44 44
 
45 45
 $locales = array_values($locales);
46 46
 
47
-if (file_put_contents(__DIR__ . '/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) {
47
+if (file_put_contents(__DIR__.'/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) {
48 48
 	echo 'Failed to update locales.json';
49 49
 	exit(1);
50 50
 }
Please login to merge, or discard this patch.
core/Command/Db/Migrations/StatusCommand.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,10 +62,10 @@
 block discarded – undo
62 62
 			if (is_array($value)) {
63 63
 				$output->writeln("    <comment>>></comment> $key:");
64 64
 				foreach ($value as $subKey => $subValue) {
65
-					$output->writeln("        <comment>>></comment> $subKey: " . str_repeat(' ', 46 - strlen($subKey)) . $subValue);
65
+					$output->writeln("        <comment>>></comment> $subKey: ".str_repeat(' ', 46 - strlen($subKey)).$subValue);
66 66
 				}
67 67
 			} else {
68
-				$output->writeln("    <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value);
68
+				$output->writeln("    <comment>>></comment> $key: ".str_repeat(' ', 50 - strlen($key)).$value);
69 69
 			}
70 70
 		}
71 71
 		return 0;
Please login to merge, or discard this patch.
Indentation   +93 added lines, -93 removed lines patch added patch discarded remove patch
@@ -34,109 +34,109 @@
 block discarded – undo
34 34
 use Symfony\Component\Console\Output\OutputInterface;
35 35
 
36 36
 class StatusCommand extends Command implements CompletionAwareInterface {
37
-	public function __construct(
38
-		private Connection $connection,
39
-	) {
40
-		parent::__construct();
41
-	}
37
+    public function __construct(
38
+        private Connection $connection,
39
+    ) {
40
+        parent::__construct();
41
+    }
42 42
 
43
-	protected function configure() {
44
-		$this
45
-			->setName('migrations:status')
46
-			->setDescription('View the status of a set of migrations.')
47
-			->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on');
48
-	}
43
+    protected function configure() {
44
+        $this
45
+            ->setName('migrations:status')
46
+            ->setDescription('View the status of a set of migrations.')
47
+            ->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on');
48
+    }
49 49
 
50
-	public function execute(InputInterface $input, OutputInterface $output): int {
51
-		$appName = $input->getArgument('app');
52
-		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
50
+    public function execute(InputInterface $input, OutputInterface $output): int {
51
+        $appName = $input->getArgument('app');
52
+        $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
53 53
 
54
-		$infos = $this->getMigrationsInfos($ms);
55
-		foreach ($infos as $key => $value) {
56
-			if (is_array($value)) {
57
-				$output->writeln("    <comment>>></comment> $key:");
58
-				foreach ($value as $subKey => $subValue) {
59
-					$output->writeln("        <comment>>></comment> $subKey: " . str_repeat(' ', 46 - strlen($subKey)) . $subValue);
60
-				}
61
-			} else {
62
-				$output->writeln("    <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value);
63
-			}
64
-		}
65
-		return 0;
66
-	}
54
+        $infos = $this->getMigrationsInfos($ms);
55
+        foreach ($infos as $key => $value) {
56
+            if (is_array($value)) {
57
+                $output->writeln("    <comment>>></comment> $key:");
58
+                foreach ($value as $subKey => $subValue) {
59
+                    $output->writeln("        <comment>>></comment> $subKey: " . str_repeat(' ', 46 - strlen($subKey)) . $subValue);
60
+                }
61
+            } else {
62
+                $output->writeln("    <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value);
63
+            }
64
+        }
65
+        return 0;
66
+    }
67 67
 
68
-	/**
69
-	 * @param string $optionName
70
-	 * @param CompletionContext $context
71
-	 * @return string[]
72
-	 */
73
-	public function completeOptionValues($optionName, CompletionContext $context) {
74
-		return [];
75
-	}
68
+    /**
69
+     * @param string $optionName
70
+     * @param CompletionContext $context
71
+     * @return string[]
72
+     */
73
+    public function completeOptionValues($optionName, CompletionContext $context) {
74
+        return [];
75
+    }
76 76
 
77
-	/**
78
-	 * @param string $argumentName
79
-	 * @param CompletionContext $context
80
-	 * @return string[]
81
-	 */
82
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
83
-		if ($argumentName === 'app') {
84
-			$allApps = \OC_App::getAllApps();
85
-			return array_diff($allApps, \OC_App::getEnabledApps(true, true));
86
-		}
87
-		return [];
88
-	}
77
+    /**
78
+     * @param string $argumentName
79
+     * @param CompletionContext $context
80
+     * @return string[]
81
+     */
82
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
83
+        if ($argumentName === 'app') {
84
+            $allApps = \OC_App::getAllApps();
85
+            return array_diff($allApps, \OC_App::getEnabledApps(true, true));
86
+        }
87
+        return [];
88
+    }
89 89
 
90
-	/**
91
-	 * @param MigrationService $ms
92
-	 * @return array associative array of human readable info name as key and the actual information as value
93
-	 */
94
-	public function getMigrationsInfos(MigrationService $ms) {
95
-		$executedMigrations = $ms->getMigratedVersions();
96
-		$availableMigrations = $ms->getAvailableVersions();
97
-		$executedUnavailableMigrations = array_diff($executedMigrations, array_keys($availableMigrations));
90
+    /**
91
+     * @param MigrationService $ms
92
+     * @return array associative array of human readable info name as key and the actual information as value
93
+     */
94
+    public function getMigrationsInfos(MigrationService $ms) {
95
+        $executedMigrations = $ms->getMigratedVersions();
96
+        $availableMigrations = $ms->getAvailableVersions();
97
+        $executedUnavailableMigrations = array_diff($executedMigrations, array_keys($availableMigrations));
98 98
 
99
-		$numExecutedUnavailableMigrations = count($executedUnavailableMigrations);
100
-		$numNewMigrations = count(array_diff(array_keys($availableMigrations), $executedMigrations));
101
-		$pending = $ms->describeMigrationStep('lastest');
99
+        $numExecutedUnavailableMigrations = count($executedUnavailableMigrations);
100
+        $numNewMigrations = count(array_diff(array_keys($availableMigrations), $executedMigrations));
101
+        $pending = $ms->describeMigrationStep('lastest');
102 102
 
103
-		$infos = [
104
-			'App' => $ms->getApp(),
105
-			'Version Table Name' => $ms->getMigrationsTableName(),
106
-			'Migrations Namespace' => $ms->getMigrationsNamespace(),
107
-			'Migrations Directory' => $ms->getMigrationsDirectory(),
108
-			'Previous Version' => $this->getFormattedVersionAlias($ms, 'prev'),
109
-			'Current Version' => $this->getFormattedVersionAlias($ms, 'current'),
110
-			'Next Version' => $this->getFormattedVersionAlias($ms, 'next'),
111
-			'Latest Version' => $this->getFormattedVersionAlias($ms, 'latest'),
112
-			'Executed Migrations' => count($executedMigrations),
113
-			'Executed Unavailable Migrations' => $numExecutedUnavailableMigrations,
114
-			'Available Migrations' => count($availableMigrations),
115
-			'New Migrations' => $numNewMigrations,
116
-			'Pending Migrations' => count($pending) ? $pending : 'None'
117
-		];
103
+        $infos = [
104
+            'App' => $ms->getApp(),
105
+            'Version Table Name' => $ms->getMigrationsTableName(),
106
+            'Migrations Namespace' => $ms->getMigrationsNamespace(),
107
+            'Migrations Directory' => $ms->getMigrationsDirectory(),
108
+            'Previous Version' => $this->getFormattedVersionAlias($ms, 'prev'),
109
+            'Current Version' => $this->getFormattedVersionAlias($ms, 'current'),
110
+            'Next Version' => $this->getFormattedVersionAlias($ms, 'next'),
111
+            'Latest Version' => $this->getFormattedVersionAlias($ms, 'latest'),
112
+            'Executed Migrations' => count($executedMigrations),
113
+            'Executed Unavailable Migrations' => $numExecutedUnavailableMigrations,
114
+            'Available Migrations' => count($availableMigrations),
115
+            'New Migrations' => $numNewMigrations,
116
+            'Pending Migrations' => count($pending) ? $pending : 'None'
117
+        ];
118 118
 
119
-		return $infos;
120
-	}
119
+        return $infos;
120
+    }
121 121
 
122
-	/**
123
-	 * @param MigrationService $migrationService
124
-	 * @param string $alias
125
-	 * @return mixed|null|string
126
-	 */
127
-	private function getFormattedVersionAlias(MigrationService $migrationService, $alias) {
128
-		$migration = $migrationService->getMigration($alias);
129
-		//No version found
130
-		if ($migration === null) {
131
-			if ($alias === 'next') {
132
-				return 'Already at latest migration step';
133
-			}
122
+    /**
123
+     * @param MigrationService $migrationService
124
+     * @param string $alias
125
+     * @return mixed|null|string
126
+     */
127
+    private function getFormattedVersionAlias(MigrationService $migrationService, $alias) {
128
+        $migration = $migrationService->getMigration($alias);
129
+        //No version found
130
+        if ($migration === null) {
131
+            if ($alias === 'next') {
132
+                return 'Already at latest migration step';
133
+            }
134 134
 
135
-			if ($alias === 'prev') {
136
-				return 'Already at first migration step';
137
-			}
138
-		}
135
+            if ($alias === 'prev') {
136
+                return 'Already at first migration step';
137
+            }
138
+        }
139 139
 
140
-		return $migration;
141
-	}
140
+        return $migration;
141
+    }
142 142
 }
Please login to merge, or discard this patch.