Completed
Pull Request — master (#9345)
by Björn
26:01 queued 08:55
created
lib/private/Authentication/Token/DefaultToken.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -170,7 +170,7 @@
 block discarded – undo
170 170
 		if (is_array($scope)) {
171 171
 			parent::setScope(json_encode($scope));
172 172
 		} else {
173
-			parent::setScope((string)$scope);
173
+			parent::setScope((string) $scope);
174 174
 		}
175 175
 	}
176 176
 }
Please login to merge, or discard this patch.
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/Activity/Event.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@
 block discarded – undo
162 162
 	 */
163 163
 	public function setAuthor($author) {
164 164
 		if (!is_string($author) || isset($author[64])) {
165
-			throw new \InvalidArgumentException('The given author user is invalid'. serialize($author));
165
+			throw new \InvalidArgumentException('The given author user is invalid'.serialize($author));
166 166
 		}
167 167
 		$this->author = (string) $author;
168 168
 		return $this;
Please login to merge, or discard this patch.
lib/private/Activity/Manager.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 		}
113 113
 
114 114
 		$this->consumers = [];
115
-		foreach($this->consumersClosures as $consumer) {
115
+		foreach ($this->consumersClosures as $consumer) {
116 116
 			$c = $consumer();
117 117
 			if ($c instanceof IConsumer) {
118 118
 				$this->consumers[] = $c;
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 		}
134 134
 
135 135
 		$this->extensions = [];
136
-		foreach($this->extensionsClosures as $extension) {
136
+		foreach ($this->extensionsClosures as $extension) {
137 137
 			$e = $extension();
138 138
 			if ($e instanceof IExtension) {
139 139
 				$this->extensions[] = $e;
@@ -669,7 +669,7 @@  discard block
 block discarded – undo
669 669
 			return array(null, null);
670 670
 		}
671 671
 
672
-		return array(' and ((' . implode(') or (', $conditions) . '))', $parameters);
672
+		return array(' and (('.implode(') or (', $conditions).'))', $parameters);
673 673
 	}
674 674
 
675 675
 	/**
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.