Passed
Push — master ( b93e1e...342765 )
by Roeland
34:24 queued 23:05
created
lib/private/Console/TimestampFormatter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -103,6 +103,6 @@
 block discarded – undo
103 103
 		$time = new \DateTime('now', $timeZone);
104 104
 		$timestampInfo = $time->format($this->config->getSystemValue('logdateformat', \DateTime::ATOM));
105 105
 
106
-		return $timestampInfo . ' ' . $this->formatter->format($message);
106
+		return $timestampInfo.' '.$this->formatter->format($message);
107 107
 	}
108 108
 }
Please login to merge, or discard this patch.
lib/private/Security/Certificate.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -54,19 +54,19 @@
 block discarded – undo
54 54
 
55 55
 		// If string starts with "file://" ignore the certificate
56 56
 		$query = 'file://';
57
-		if(strtolower(substr($data, 0, strlen($query))) === $query) {
57
+		if (strtolower(substr($data, 0, strlen($query))) === $query) {
58 58
 			throw new \Exception('Certificate could not get parsed.');
59 59
 		}
60 60
 
61 61
 		$info = openssl_x509_parse($data);
62
-		if(!is_array($info)) {
62
+		if (!is_array($info)) {
63 63
 			throw new \Exception('Certificate could not get parsed.');
64 64
 		}
65 65
 
66 66
 		$this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null;
67 67
 		$this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null;
68
-		$this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt);
69
-		$this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt);
68
+		$this->issueDate = new \DateTime('@'.$info['validFrom_time_t'], $gmt);
69
+		$this->expireDate = new \DateTime('@'.$info['validTo_time_t'], $gmt);
70 70
 		$this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null;
71 71
 		$this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null;
72 72
 	}
Please login to merge, or discard this patch.
lib/private/TempManager.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -65,13 +65,13 @@  discard block
 block discarded – undo
65 65
 	 * @return string
66 66
 	 */
67 67
 	private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
68
-		if($postFix !== '') {
69
-			$postFix = '.' . ltrim($postFix, '.');
68
+		if ($postFix !== '') {
69
+			$postFix = '.'.ltrim($postFix, '.');
70 70
 			$postFix = str_replace(['\\', '/'], '', $postFix);
71 71
 			$absolutePath .= '-';
72 72
 		}
73 73
 
74
-		return $absolutePath . $postFix;
74
+		return $absolutePath.$postFix;
75 75
 	}
76 76
 
77 77
 	/**
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
 			// If a postfix got specified sanitize it and create a postfixed
93 93
 			// temporary file
94
-			if($postFix !== '') {
94
+			if ($postFix !== '') {
95 95
 				$fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
96 96
 				touch($fileNameWithPostfix);
97 97
 				chmod($fileNameWithPostfix, 0600);
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
 			$this->current[] = $uniqueFileName;
128 128
 
129 129
 			// Build a name without postfix
130
-			$path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
130
+			$path = $this->buildFileNameWithSuffix($uniqueFileName.'-folder', $postFix);
131 131
 			mkdir($path, 0700);
132 132
 			$this->current[] = $path;
133 133
 
134
-			return $path . '/';
134
+			return $path.'/';
135 135
 		} else {
136 136
 			$this->log->warning(
137 137
 				'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 		if ($dh) {
191 191
 			while (($file = readdir($dh)) !== false) {
192 192
 				if (substr($file, 0, 7) === self::TMP_PREFIX) {
193
-					$path = $this->tmpBaseDir . '/' . $file;
193
+					$path = $this->tmpBaseDir.'/'.$file;
194 194
 					$mtime = filemtime($path);
195 195
 					if ($mtime < $cutOfTime) {
196 196
 						$files[] = $path;
Please login to merge, or discard this patch.
lib/private/Log/ErrorHandler.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 		return preg_replace('/\/\/(.*):(.*)@/', '//xxx:xxx@', $msg);
41 41
 	}
42 42
 
43
-	public static function register($debug=false) {
43
+	public static function register($debug = false) {
44 44
 		$handler = new ErrorHandler();
45 45
 
46 46
 		if ($debug) {
@@ -62,9 +62,9 @@  discard block
 block discarded – undo
62 62
 	//Fatal errors handler
63 63
 	public static function onShutdown() {
64 64
 		$error = error_get_last();
65
-		if($error && self::$logger) {
65
+		if ($error && self::$logger) {
66 66
 			//ob_end_clean();
67
-			$msg = $error['message'] . ' at ' . $error['file'] . '#' . $error['line'];
67
+			$msg = $error['message'].' at '.$error['file'].'#'.$error['line'];
68 68
 			self::$logger->critical(self::removePassword($msg), array('app' => 'PHP'));
69 69
 		}
70 70
 	}
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 	public static function onException($exception) {
78 78
 		$class = get_class($exception);
79 79
 		$msg = $exception->getMessage();
80
-		$msg = "$class: $msg at " . $exception->getFile() . '#' . $exception->getLine();
80
+		$msg = "$class: $msg at ".$exception->getFile().'#'.$exception->getLine();
81 81
 		self::$logger->critical(self::removePassword($msg), ['app' => 'PHP']);
82 82
 	}
83 83
 
@@ -86,14 +86,14 @@  discard block
 block discarded – undo
86 86
 		if (error_reporting() === 0) {
87 87
 			return;
88 88
 		}
89
-		$msg = $message . ' at ' . $file . '#' . $line;
89
+		$msg = $message.' at '.$file.'#'.$line;
90 90
 		self::$logger->error(self::removePassword($msg), array('app' => 'PHP'));
91 91
 
92 92
 	}
93 93
 
94 94
 	//Recoverable handler which catch all errors, warnings and notices
95 95
 	public static function onAll($number, $message, $file, $line) {
96
-		$msg = $message . ' at ' . $file . '#' . $line;
96
+		$msg = $message.' at '.$file.'#'.$line;
97 97
 		self::$logger->debug(self::removePassword($msg), array('app' => 'PHP'));
98 98
 
99 99
 	}
Please login to merge, or discard this patch.
lib/private/Search.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
59 59
 	public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30) {
60 60
 		$this->initProviders();
61 61
 		$results = array();
62
-		foreach($this->providers as $provider) {
62
+		foreach ($this->providers as $provider) {
63 63
 			/** @var $provider Provider */
64
-			if ( ! $provider->providesResultsFor($inApps) ) {
64
+			if (!$provider->providesResultsFor($inApps)) {
65 65
 				continue;
66 66
 			}
67 67
 			if ($provider instanceof PagedProvider) {
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	public function removeProvider($provider) {
97 97
 		$this->registeredProviders = array_filter(
98 98
 			$this->registeredProviders,
99
-			function ($element) use ($provider) {
99
+			function($element) use ($provider) {
100 100
 				return ($element['class'] != $provider);
101 101
 			}
102 102
 		);
@@ -117,10 +117,10 @@  discard block
 block discarded – undo
117 117
 	 * Create instances of all the registered search providers
118 118
 	 */
119 119
 	private function initProviders() {
120
-		if( ! empty($this->providers) ) {
120
+		if (!empty($this->providers)) {
121 121
 			return;
122 122
 		}
123
-		foreach($this->registeredProviders as $provider) {
123
+		foreach ($this->registeredProviders as $provider) {
124 124
 			$class = $provider['class'];
125 125
 			$options = $provider['options'];
126 126
 			$this->providers[] = new $class($options);
Please login to merge, or discard this patch.
lib/private/Http/Client/Response.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,8 +54,7 @@
 block discarded – undo
54 54
 	 */
55 55
 	public function getBody() {
56 56
 		return $this->stream ?
57
-			$this->response->getBody()->detach():
58
-			$this->response->getBody()->getContents();
57
+			$this->response->getBody()->detach() : $this->response->getBody()->getContents();
59 58
 	}
60 59
 
61 60
 	/**
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/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/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.