Completed
Pull Request — master (#4617)
by Julius
14:00
created
lib/private/Notification/Manager.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
 				throw new \InvalidArgumentException('The given notifier information is invalid');
147 147
 			}
148 148
 			if (isset($this->notifiersInfo[$notifier['id']])) {
149
-				throw new \InvalidArgumentException('The given notifier ID ' . $notifier['id'] . ' is already in use');
149
+				throw new \InvalidArgumentException('The given notifier ID '.$notifier['id'].' is already in use');
150 150
 			}
151 151
 			$this->notifiersInfo[$notifier['id']] = $notifier['name'];
152 152
 		}
Please login to merge, or discard this patch.
lib/private/IntegrityCheck/Iterator/ExcludeFileByNameFilterIterator.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
 	 * @return bool
49 49
 	 */
50 50
 	public function accept() {
51
-		if($this->isDir()) {
51
+		if ($this->isDir()) {
52 52
 			return true;
53 53
 		}
54 54
 
Please login to merge, or discard this patch.
lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -30,25 +30,25 @@
 block discarded – undo
30 30
 		parent::__construct($iterator);
31 31
 
32 32
 		$appFolders = \OC::$APPSROOTS;
33
-		foreach($appFolders as $key => $appFolder) {
33
+		foreach ($appFolders as $key => $appFolder) {
34 34
 			$appFolders[$key] = rtrim($appFolder['path'], '/');
35 35
 		}
36 36
 
37 37
 		$excludedFolders = [
38
-			rtrim($root . '/data', '/'),
39
-			rtrim($root . '/themes', '/'),
40
-			rtrim($root . '/config', '/'),
41
-			rtrim($root . '/apps', '/'),
42
-			rtrim($root . '/assets', '/'),
43
-			rtrim($root . '/lost+found', '/'),
38
+			rtrim($root.'/data', '/'),
39
+			rtrim($root.'/themes', '/'),
40
+			rtrim($root.'/config', '/'),
41
+			rtrim($root.'/apps', '/'),
42
+			rtrim($root.'/assets', '/'),
43
+			rtrim($root.'/lost+found', '/'),
44 44
 			// Ignore folders generated by updater since the updater is replaced
45 45
 			// after the integrity check is run.
46 46
 			// See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
47
-			rtrim($root . '/updater', '/'),
48
-			rtrim($root . '/_oc_upgrade', '/'),
47
+			rtrim($root.'/updater', '/'),
48
+			rtrim($root.'/_oc_upgrade', '/'),
49 49
 		];
50 50
 		$customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
51
-		if($customDataDir !== '') {
51
+		if ($customDataDir !== '') {
52 52
 			$excludedFolders[] = rtrim($customDataDir, '/');
53 53
 		}
54 54
 
Please login to merge, or discard this patch.
lib/private/IntegrityCheck/Helpers/FileAccessHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -59,8 +59,8 @@  discard block
 block discarded – undo
59 59
 	 */
60 60
 	public function file_put_contents($filename, $data) {
61 61
 		$bytesWritten = @file_put_contents($filename, $data);
62
-		if ($bytesWritten === false || $bytesWritten !== strlen($data)){
63
-			throw new \Exception('Failed to write into ' . $filename);
62
+		if ($bytesWritten === false || $bytesWritten !== strlen($data)) {
63
+			throw new \Exception('Failed to write into '.$filename);
64 64
 		}
65 65
 		return $bytesWritten;
66 66
 	}
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public function assertDirectoryExists($path) {
81 81
 		if (!is_dir($path)) {
82
-			throw new \Exception('Directory ' . $path . ' does not exist.');
82
+			throw new \Exception('Directory '.$path.' does not exist.');
83 83
 		}
84 84
 	}
85 85
 }
Please login to merge, or discard this patch.
lib/private/IntegrityCheck/Helpers/AppLocator.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 	 */
40 40
 	public function getAppPath($appId) {
41 41
 		$path = \OC_App::getAppPath($appId);
42
-		if($path === false) {
42
+		if ($path === false) {
43 43
 
44 44
 			throw new \Exception('App not found');
45 45
 		}
Please login to merge, or discard this patch.
lib/private/HintException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
 	 * @return string
62 62
 	 */
63 63
 	public function __toString() {
64
-		return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
64
+		return __CLASS__.": [{$this->code}]: {$this->message} ({$this->hint})\n";
65 65
 	}
66 66
 
67 67
 	/**
Please login to merge, or discard this patch.
lib/private/Repair.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
 use Symfony\Component\EventDispatcher\EventDispatcher;
59 59
 use Symfony\Component\EventDispatcher\GenericEvent;
60 60
 
61
-class Repair implements IOutput{
61
+class Repair implements IOutput {
62 62
 	/* @var IRepairStep[] */
63 63
 	private $repairSteps;
64 64
 	/** @var EventDispatcher */
Please login to merge, or discard this patch.
lib/private/Avatar.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 	/**
81 81
 	 * @inheritdoc
82 82
 	 */
83
-	public function get ($size = 64) {
83
+	public function get($size = 64) {
84 84
 		try {
85 85
 			$file = $this->getFile($size);
86 86
 		} catch (NotFoundException $e) {
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
 	 * @throws NotSquareException if the image is not square
111 111
 	 * @return void
112 112
 	*/
113
-	public function set ($data) {
113
+	public function set($data) {
114 114
 
115
-		if($data instanceOf IImage) {
115
+		if ($data instanceOf IImage) {
116 116
 			$img = $data;
117 117
 			$data = $img->data();
118 118
 		} else {
@@ -143,12 +143,12 @@  discard block
 block discarded – undo
143 143
 	 * remove the users avatar
144 144
 	 * @return void
145 145
 	*/
146
-	public function remove () {
146
+	public function remove() {
147 147
 		$regex = '/^avatar\.([0-9]+\.)?(jpg|png)$/';
148 148
 		$avatars = $this->folder->getDirectoryListing();
149 149
 
150 150
 		$this->config->setUserValue($this->user->getUID(), 'avatar', 'version',
151
-			(int)$this->config->getUserValue($this->user->getUID(), 'avatar', 'version', 0) + 1);
151
+			(int) $this->config->getUserValue($this->user->getUID(), 'avatar', 'version', 0) + 1);
152 152
 
153 153
 		foreach ($avatars as $avatar) {
154 154
 			if (preg_match($regex, $avatar->getName())) {
@@ -165,9 +165,9 @@  discard block
 block discarded – undo
165 165
 		$ext = $this->getExtension();
166 166
 
167 167
 		if ($size === -1) {
168
-			$path = 'avatar.' . $ext;
168
+			$path = 'avatar.'.$ext;
169 169
 		} else {
170
-			$path = 'avatar.' . $size . '.' . $ext;
170
+			$path = 'avatar.'.$size.'.'.$ext;
171 171
 		}
172 172
 
173 173
 		try {
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 
180 180
 			$avatar = new OC_Image();
181 181
 			/** @var ISimpleFile $file */
182
-			$file = $this->folder->getFile('avatar.' . $ext);
182
+			$file = $this->folder->getFile('avatar.'.$ext);
183 183
 			$avatar->loadFromData($file->getContent());
184 184
 			if ($size !== -1) {
185 185
 				$avatar->resize($size);
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 				$file = $this->folder->newFile($path);
189 189
 				$file->putContent($avatar->data());
190 190
 			} catch (NotPermittedException $e) {
191
-				$this->logger->error('Failed to save avatar for ' . $this->user->getUID());
191
+				$this->logger->error('Failed to save avatar for '.$this->user->getUID());
192 192
 			}
193 193
 		}
194 194
 
Please login to merge, or discard this patch.
lib/private/User/Backend.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -37,14 +37,14 @@  discard block
 block discarded – undo
37 37
 	/**
38 38
 	 * actions that user backends can define
39 39
 	 */
40
-	const CREATE_USER		= 1;			// 1 << 0
41
-	const SET_PASSWORD		= 16;			// 1 << 4
42
-	const CHECK_PASSWORD	= 256;			// 1 << 8
43
-	const GET_HOME			= 4096;			// 1 << 12
44
-	const GET_DISPLAYNAME	= 65536;		// 1 << 16
45
-	const SET_DISPLAYNAME	= 1048576;		// 1 << 20
46
-	const PROVIDE_AVATAR	= 16777216;		// 1 << 24
47
-	const COUNT_USERS		= 268435456;	// 1 << 28
40
+	const CREATE_USER = 1; // 1 << 0
41
+	const SET_PASSWORD = 16; // 1 << 4
42
+	const CHECK_PASSWORD = 256; // 1 << 8
43
+	const GET_HOME = 4096; // 1 << 12
44
+	const GET_DISPLAYNAME	= 65536; // 1 << 16
45
+	const SET_DISPLAYNAME	= 1048576; // 1 << 20
46
+	const PROVIDE_AVATAR = 16777216; // 1 << 24
47
+	const COUNT_USERS = 268435456; // 1 << 28
48 48
 
49 49
 	protected $possibleActions = array(
50 50
 		self::CREATE_USER => 'createUser',
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
 	*/
67 67
 	public function getSupportedActions() {
68 68
 		$actions = 0;
69
-		foreach($this->possibleActions AS $action => $methodName) {
70
-			if(method_exists($this, $methodName)) {
69
+		foreach ($this->possibleActions AS $action => $methodName) {
70
+			if (method_exists($this, $methodName)) {
71 71
 				$actions |= $action;
72 72
 			}
73 73
 		}
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	* compared with self::CREATE_USER etc.
85 85
 	*/
86 86
 	public function implementsActions($actions) {
87
-		return (bool)($this->getSupportedActions() & $actions);
87
+		return (bool) ($this->getSupportedActions() & $actions);
88 88
 	}
89 89
 
90 90
 	/**
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 	 *
95 95
 	 * Deletes a user
96 96
 	 */
97
-	public function deleteUser( $uid ) {
97
+	public function deleteUser($uid) {
98 98
 		return false;
99 99
 	}
100 100
 
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 	public function getDisplayNames($search = '', $limit = null, $offset = null) {
149 149
 		$displayNames = array();
150 150
 		$users = $this->getUsers($search, $limit, $offset);
151
-		foreach ( $users as $user) {
151
+		foreach ($users as $user) {
152 152
 			$displayNames[$user] = $user;
153 153
 		}
154 154
 		return $displayNames;
Please login to merge, or discard this patch.