Completed
Push — stable13 ( f62775...bea70d )
by Roeland
12:09
created
lib/private/Files/Cache/HomeCache.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -51,8 +51,8 @@
 block discarded – undo
51 51
 		}
52 52
 		if ($entry && $entry['mimetype'] === 'httpd/unix-directory') {
53 53
 			$id = $entry['fileid'];
54
-			$sql = 'SELECT SUM(`size`) AS f1 ' .
55
-			   'FROM `*PREFIX*filecache` ' .
54
+			$sql = 'SELECT SUM(`size`) AS f1 '.
55
+			   'FROM `*PREFIX*filecache` '.
56 56
 				'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0';
57 57
 			$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
58 58
 			if ($row = $result->fetchRow()) {
Please login to merge, or discard this patch.
lib/private/Files/Cache/MoveFromCacheTrait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
 		if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
68 68
 			$folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId());
69 69
 			foreach ($folderContent as $subEntry) {
70
-				$subTargetPath = $targetPath . '/' . $subEntry->getName();
70
+				$subTargetPath = $targetPath.'/'.$subEntry->getName();
71 71
 				$this->copyFromCache($sourceCache, $subEntry, $subTargetPath);
72 72
 			}
73 73
 		}
Please login to merge, or discard this patch.
lib/private/Search/Provider/File.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -51,19 +51,19 @@
 block discarded – undo
51 51
 				continue;
52 52
 			}
53 53
 			// create audio result
54
-			if($fileData['mimepart'] === 'audio'){
54
+			if ($fileData['mimepart'] === 'audio') {
55 55
 				$result = new \OC\Search\Result\Audio($fileData);
56 56
 			}
57 57
 			// create image result
58
-			elseif($fileData['mimepart'] === 'image'){
58
+			elseif ($fileData['mimepart'] === 'image') {
59 59
 				$result = new \OC\Search\Result\Image($fileData);
60 60
 			}
61 61
 			// create folder result
62
-			elseif($fileData['mimetype'] === 'httpd/unix-directory'){
62
+			elseif ($fileData['mimetype'] === 'httpd/unix-directory') {
63 63
 				$result = new \OC\Search\Result\Folder($fileData);
64 64
 			}
65 65
 			// or create file result
66
-			else{
66
+			else {
67 67
 				$result = new \OC\Search\Result\File($fileData);
68 68
 			}
69 69
 			// add to results
Please login to merge, or discard this patch.
lib/private/Search/Result/File.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 	 * @param string $path
106 106
 	 * @return string relative path
107 107
 	 */
108
-	protected function getRelativePath ($path) {
108
+	protected function getRelativePath($path) {
109 109
 		if (!isset(self::$userFolderCache)) {
110 110
 			$user = \OC::$server->getUserSession()->getUser()->getUID();
111 111
 			self::$userFolderCache = \OC::$server->getUserFolder($user);
Please login to merge, or discard this patch.
lib/private/AppFramework/Utility/SimpleContainer.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -89,17 +89,17 @@  discard block
 block discarded – undo
89 89
 	 * @throws QueryException if the class could not be found or instantiated
90 90
 	 */
91 91
 	public function resolve($name) {
92
-		$baseMsg = 'Could not resolve ' . $name . '!';
92
+		$baseMsg = 'Could not resolve '.$name.'!';
93 93
 		try {
94 94
 			$class = new ReflectionClass($name);
95 95
 			if ($class->isInstantiable()) {
96 96
 				return $this->buildClass($class);
97 97
 			} else {
98
-				throw new QueryException($baseMsg .
98
+				throw new QueryException($baseMsg.
99 99
 					' Class can not be instantiated');
100 100
 			}
101
-		} catch(ReflectionException $e) {
102
-			throw new QueryException($baseMsg . ' ' . $e->getMessage());
101
+		} catch (ReflectionException $e) {
102
+			throw new QueryException($baseMsg.' '.$e->getMessage());
103 103
 		}
104 104
 	}
105 105
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 			return $this->offsetGet($name);
116 116
 		} else {
117 117
 			$object = $this->resolve($name);
118
-			$this->registerService($name, function () use ($object) {
118
+			$this->registerService($name, function() use ($object) {
119 119
 				return $object;
120 120
 			});
121 121
 			return $object;
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 */
142 142
 	public function registerService($name, Closure $closure, $shared = true) {
143 143
 		$name = $this->sanitizeName($name);
144
-		if (isset($this[$name]))  {
144
+		if (isset($this[$name])) {
145 145
 			unset($this[$name]);
146 146
 		}
147 147
 		if ($shared) {
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 	 * @param string $target the target that should be resolved instead
160 160
 	 */
161 161
 	public function registerAlias($alias, $target) {
162
-		$this->registerService($alias, function (IContainer $container) use ($target) {
162
+		$this->registerService($alias, function(IContainer $container) use ($target) {
163 163
 			return $container->query($target);
164 164
 		}, false);
165 165
 	}
Please login to merge, or discard this patch.
lib/private/AppFramework/Core/API.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
  * class and add your methods
39 39
  * @deprecated
40 40
  */
41
-class API implements IApi{
41
+class API implements IApi {
42 42
 
43 43
 	private $appName;
44 44
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	 * constructor
47 47
 	 * @param string $appName the name of your application
48 48
 	 */
49
-	public function __construct($appName){
49
+	public function __construct($appName) {
50 50
 		$this->appName = $appName;
51 51
 	}
52 52
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	 * @return string the user id of the current user
57 57
 	 * @deprecated Use \OC::$server->getUserSession()->getUser()->getUID()
58 58
 	 */
59
-	public function getUserId(){
59
+	public function getUserId() {
60 60
 		return \OCP\User::getUser();
61 61
 	}
62 62
 
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
 	 * @param string $scriptName the name of the javascript in js/ without the suffix
68 68
 	 * @param string $appName the name of the app, defaults to the current one
69 69
 	 */
70
-	public function addScript($scriptName, $appName=null){
71
-		if($appName === null){
70
+	public function addScript($scriptName, $appName = null) {
71
+		if ($appName === null) {
72 72
 			$appName = $this->appName;
73 73
 		}
74 74
 		\OCP\Util::addScript($appName, $scriptName);
@@ -81,8 +81,8 @@  discard block
 block discarded – undo
81 81
 	 * @param string $styleName the name of the css file in css/without the suffix
82 82
 	 * @param string $appName the name of the app, defaults to the current one
83 83
 	 */
84
-	public function addStyle($styleName, $appName=null){
85
-		if($appName === null){
84
+	public function addStyle($styleName, $appName = null) {
85
+		if ($appName === null) {
86 86
 			$appName = $this->appName;
87 87
 		}
88 88
 		\OCP\Util::addStyle($appName, $styleName);
@@ -94,8 +94,8 @@  discard block
 block discarded – undo
94 94
 	 * shorthand for addScript for files in the 3rdparty directory
95 95
 	 * @param string $name the name of the file without the suffix
96 96
 	 */
97
-	public function add3rdPartyScript($name){
98
-		\OCP\Util::addScript($this->appName . '/3rdparty', $name);
97
+	public function add3rdPartyScript($name) {
98
+		\OCP\Util::addScript($this->appName.'/3rdparty', $name);
99 99
 	}
100 100
 
101 101
 
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
 	 * shorthand for addStyle for files in the 3rdparty directory
105 105
 	 * @param string $name the name of the file without the suffix
106 106
 	 */
107
-	public function add3rdPartyStyle($name){
108
-		\OCP\Util::addStyle($this->appName . '/3rdparty', $name);
107
+	public function add3rdPartyStyle($name) {
108
+		\OCP\Util::addStyle($this->appName.'/3rdparty', $name);
109 109
 	}
110 110
 
111 111
 
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 	 * @param string $appName the name of an app
118 118
 	 * @return bool true if app is enabled
119 119
 	 */
120
-	public function isAppEnabled($appName){
120
+	public function isAppEnabled($appName) {
121 121
 		return \OCP\App::isEnabled($appName);
122 122
 	}
123 123
 
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	 * @return \OCP\IEventSource a new open EventSource class
128 128
 	 * @deprecated Use \OC::$server->createEventSource();
129 129
 	 */
130
-	public function openEventSource(){
130
+	public function openEventSource() {
131 131
 		return \OC::$server->createEventSource();
132 132
 	}
133 133
 
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 	 * @param string $signalClass
165 165
 	 * @param string $signalName
166 166
 	 */
167
-	public function clearHook($signalClass=false, $signalName=false) {
167
+	public function clearHook($signalClass = false, $signalName = false) {
168 168
 		if ($signalClass) {
169 169
 			\OC_Hook::clear($signalClass, $signalName);
170 170
 		}
@@ -176,8 +176,8 @@  discard block
 block discarded – undo
176 176
 	 * suffix, relative to your apps directory! not the template directory
177 177
 	 * @param string $appName the name of the app, defaults to the current one
178 178
 	 */
179
-	public function registerAdmin($mainPath, $appName=null) {
180
-		if($appName === null){
179
+	public function registerAdmin($mainPath, $appName = null) {
180
+		if ($appName === null) {
181 181
 			$appName = $this->appName;
182 182
 		}
183 183
 
Please login to merge, or discard this patch.
lib/private/AppFramework/Http/Output.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@
 block discarded – undo
92 92
 	 * @param bool $httpOnly
93 93
 	 */
94 94
 	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly) {
95
-		$path = $this->webRoot ? : '/';
95
+		$path = $this->webRoot ?: '/';
96 96
 		setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
97 97
 	}
98 98
 
Please login to merge, or discard this patch.
lib/private/AppFramework/Http/Dispatcher.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 			// exception and creates a response. If no response is created, it is
94 94
 			// assumed that theres no middleware who can handle it and the error is
95 95
 			// thrown again
96
-		} catch(\Exception $exception){
96
+		} catch (\Exception $exception) {
97 97
 			$response = $this->middlewareDispatcher->afterException(
98 98
 				$controller, $methodName, $exception);
99 99
 			if (is_null($response)) {
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		// valid types that will be casted
132 132
 		$types = array('int', 'integer', 'bool', 'boolean', 'float');
133 133
 
134
-		foreach($this->reflector->getParameters() as $param => $default) {
134
+		foreach ($this->reflector->getParameters() as $param => $default) {
135 135
 
136 136
 			// try to get the parameter from the request object and cast
137 137
 			// it to the type annotated in the @param annotation
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 
141 141
 			// if this is submitted using GET or a POST form, 'false' should be
142 142
 			// converted to false
143
-			if(($type === 'bool' || $type === 'boolean') &&
143
+			if (($type === 'bool' || $type === 'boolean') &&
144 144
 				$value === 'false' &&
145 145
 				(
146 146
 					$this->request->method === 'GET' ||
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 			) {
151 151
 				$value = false;
152 152
 
153
-			} elseif($value !== null && in_array($type, $types)) {
153
+			} elseif ($value !== null && in_array($type, $types)) {
154 154
 				settype($value, $type);
155 155
 			}
156 156
 
@@ -160,13 +160,13 @@  discard block
 block discarded – undo
160 160
 		$response = call_user_func_array(array($controller, $methodName), $arguments);
161 161
 
162 162
 		// format response
163
-		if($response instanceof DataResponse || !($response instanceof Response)) {
163
+		if ($response instanceof DataResponse || !($response instanceof Response)) {
164 164
 
165 165
 			// get format from the url format or request format parameter
166 166
 			$format = $this->request->getParam('format');
167 167
 
168 168
 			// if none is given try the first Accept header
169
-			if($format === null) {
169
+			if ($format === null) {
170 170
 				$headers = $this->request->getHeader('Accept');
171 171
 				$format = $controller->getResponderByHTTPHeader($headers, null);
172 172
 			}
Please login to merge, or discard this patch.
lib/private/AppFramework/Http.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	 * @param array $server $_SERVER
42 42
 	 * @param string $protocolVersion the http version to use defaults to HTTP/1.1
43 43
 	 */
44
-	public function __construct($server, $protocolVersion='HTTP/1.1') {
44
+	public function __construct($server, $protocolVersion = 'HTTP/1.1') {
45 45
 		$this->server = $server;
46 46
 		$this->protocolVersion = $protocolVersion;
47 47
 
@@ -116,16 +116,16 @@  discard block
 block discarded – undo
116 116
 	 * @param string $ETag the etag
117 117
 	 * @return string
118 118
 	 */
119
-	public function getStatusHeader($status, \DateTime $lastModified=null, 
120
-	                                $ETag=null) {
119
+	public function getStatusHeader($status, \DateTime $lastModified = null, 
120
+	                                $ETag = null) {
121 121
 
122
-		if(!is_null($lastModified)) {
122
+		if (!is_null($lastModified)) {
123 123
 			$lastModified = $lastModified->format(\DateTime::RFC2822);
124 124
 		}
125 125
 
126 126
 		// if etag or lastmodified have not changed, return a not modified
127 127
 		if ((isset($this->server['HTTP_IF_NONE_MATCH'])
128
-			&& trim(trim($this->server['HTTP_IF_NONE_MATCH']), '"') === (string)$ETag)
128
+			&& trim(trim($this->server['HTTP_IF_NONE_MATCH']), '"') === (string) $ETag)
129 129
 
130 130
 			||
131 131
 
@@ -139,13 +139,13 @@  discard block
 block discarded – undo
139 139
 		// we have one change currently for the http 1.0 header that differs
140 140
 		// from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
141 141
 		// if this differs any more, we want to create childclasses for this
142
-		if($status === self::STATUS_TEMPORARY_REDIRECT 
142
+		if ($status === self::STATUS_TEMPORARY_REDIRECT 
143 143
 			&& $this->protocolVersion === 'HTTP/1.0') {
144 144
 
145 145
 			$status = self::STATUS_FOUND;
146 146
 		}
147 147
 
148
-		return $this->protocolVersion . ' ' . $status . ' ' . 
148
+		return $this->protocolVersion.' '.$status.' '. 
149 149
 			$this->headers[$status];
150 150
 	}
151 151
 
Please login to merge, or discard this patch.