Completed
Pull Request — master (#4106)
by Blizzz
15:12 queued 15s
created
lib/private/Settings/Mapper.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
 			->from(self::TABLE_ADMIN_SETTINGS, 'f')
70 70
 			->where($query->expr()->eq('s.id', 'f.section'));
71 71
 		$result = $query->execute();
72
-		return array_map(function ($row) {
73
-			$row['priority'] = (int)$row['priority'];
72
+		return array_map(function($row) {
73
+			$row['priority'] = (int) $row['priority'];
74 74
 			return $row;
75 75
 		}, $result->fetchAll());
76 76
 	}
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 */
82 82
 	public function add($table, array $values) {
83 83
 		$query = $this->dbc->getQueryBuilder();
84
-		$values = array_map(function ($value) use ($query) {
84
+		$values = array_map(function($value) use ($query) {
85 85
 			return $query->createNamedParameter($value);
86 86
 		}, $values);
87 87
 		$query->insert($table)->values($values);
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 		$data = $resultStatement->fetchAll();
103 103
 		$resultStatement->closeCursor();
104 104
 
105
-		return array_map(function ($row) {
105
+		return array_map(function($row) {
106 106
 			return $row['class'];
107 107
 		}, $data);
108 108
 	}
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		$row = $result->fetch();
126 126
 		$result->closeCursor();
127 127
 
128
-		return (bool)$row;
128
+		return (bool) $row;
129 129
 	}
130 130
 
131 131
 	/**
Please login to merge, or discard this patch.
lib/private/Settings/RemoveOrphaned.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	private $manager;
47 47
 
48 48
 	public function __construct(Manager $manager = null) {
49
-		if($manager !== null) {
49
+		if ($manager !== null) {
50 50
 			$this->manager = $manager;
51 51
 		} else {
52 52
 			// fix DI for Jobs
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	public function execute($jobList, ILogger $logger = null) {
64 64
 		// add an interval of 15 mins
65
-		$this->setInterval(15*60);
65
+		$this->setInterval(15 * 60);
66 66
 
67 67
 		$this->jobList = $jobList;
68 68
 		$this->logger = $logger;
Please login to merge, or discard this patch.
lib/private/Settings/Manager.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	 */
143 143
 	private function setupAdminSection($sectionClassName) {
144 144
 		if (!class_exists($sectionClassName)) {
145
-			$this->log->debug('Could not find admin section class ' . $sectionClassName);
145
+			$this->log->debug('Could not find admin section class '.$sectionClassName);
146 146
 			return;
147 147
 		}
148 148
 		try {
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 
225 225
 	private function setupAdminSettings($settingsClassName) {
226 226
 		if (!class_exists($settingsClassName)) {
227
-			$this->log->debug('Could not find admin section class ' . $settingsClassName);
227
+			$this->log->debug('Could not find admin section class '.$settingsClassName);
228 228
 			return;
229 229
 		}
230 230
 
Please login to merge, or discard this patch.
lib/private/Streamer.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -29,12 +29,12 @@  discard block
 block discarded – undo
29 29
 
30 30
 class Streamer {
31 31
 	// array of regexp. Matching user agents will get tar instead of zip
32
-	private $preferTarFor = [ '/macintosh|mac os x/i' ];
32
+	private $preferTarFor = ['/macintosh|mac os x/i'];
33 33
 
34 34
 	// streamer instance
35 35
 	private $streamerInstance;
36 36
 	
37
-	public function __construct(){
37
+	public function __construct() {
38 38
 		/** @var \OCP\IRequest */
39 39
 		$request = \OC::$server->getRequest();
40 40
 		
@@ -49,9 +49,9 @@  discard block
 block discarded – undo
49 49
 	 * Send HTTP headers
50 50
 	 * @param string $name 
51 51
 	 */
52
-	public function sendHeaders($name){
52
+	public function sendHeaders($name) {
53 53
 		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
54
-		$fullName = $name . $extension;
54
+		$fullName = $name.$extension;
55 55
 		$this->streamerInstance->sendHeaders($fullName);
56 56
 	}
57 57
 	
@@ -60,27 +60,27 @@  discard block
 block discarded – undo
60 60
 	 * @param string $dir
61 61
 	 * @param string $internalDir
62 62
 	 */
63
-	public function addDirRecursive($dir, $internalDir='') {
63
+	public function addDirRecursive($dir, $internalDir = '') {
64 64
 		$dirname = basename($dir);
65
-		$rootDir = $internalDir . $dirname;
65
+		$rootDir = $internalDir.$dirname;
66 66
 		if (!empty($rootDir)) {
67 67
 			$this->streamerInstance->addEmptyDir($rootDir);
68 68
 		}
69
-		$internalDir .= $dirname . '/';
69
+		$internalDir .= $dirname.'/';
70 70
 		// prevent absolute dirs
71 71
 		$internalDir = ltrim($internalDir, '/');
72 72
 
73
-		$files= \OC\Files\Filesystem::getDirectoryContent($dir);
74
-		foreach($files as $file) {
73
+		$files = \OC\Files\Filesystem::getDirectoryContent($dir);
74
+		foreach ($files as $file) {
75 75
 			$filename = $file['name'];
76
-			$file = $dir . '/' . $filename;
77
-			if(\OC\Files\Filesystem::is_file($file)) {
76
+			$file = $dir.'/'.$filename;
77
+			if (\OC\Files\Filesystem::is_file($file)) {
78 78
 				$filesize = \OC\Files\Filesystem::filesize($file);
79 79
 				$fileTime = \OC\Files\Filesystem::filemtime($file);
80 80
 				$fh = \OC\Files\Filesystem::fopen($file, 'r');
81
-				$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
81
+				$this->addFileFromStream($fh, $internalDir.$filename, $filesize, $fileTime);
82 82
 				fclose($fh);
83
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
83
+			}elseif (\OC\Files\Filesystem::is_dir($file)) {
84 84
 				$this->addDirRecursive($file, $internalDir);
85 85
 			}
86 86
 		}
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 	 * @param string $dirName Directory Path and name to be added to the archive.
117 117
 	 * @return bool $success
118 118
 	 */
119
-	public function addEmptyDir($dirName){
119
+	public function addEmptyDir($dirName) {
120 120
 		return $this->streamerInstance->addEmptyDir($dirName);
121 121
 	}
122 122
 
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 	 * closing, the file is completely written to the output stream.
127 127
 	 * @return bool $success
128 128
 	 */
129
-	public function finalize(){
129
+	public function finalize() {
130 130
 		return $this->streamerInstance->finalize();
131 131
 	}
132 132
 }
Please login to merge, or discard this patch.
lib/private/Memcache/Factory.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 	 * @return \OCP\IMemcache
131 131
 	 */
132 132
 	public function createLocking($prefix = '') {
133
-		return new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix);
133
+		return new $this->lockingCacheClass($this->globalPrefix.'/'.$prefix);
134 134
 	}
135 135
 
136 136
 	/**
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 	 * @return \OC\Memcache\Cache
141 141
 	 */
142 142
 	public function createDistributed($prefix = '') {
143
-		return new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix);
143
+		return new $this->distributedCacheClass($this->globalPrefix.'/'.$prefix);
144 144
 	}
145 145
 
146 146
 	/**
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 	 * @return \OC\Memcache\Cache
151 151
 	 */
152 152
 	public function createLocal($prefix = '') {
153
-		return new $this->localCacheClass($this->globalPrefix . '/' . $prefix);
153
+		return new $this->localCacheClass($this->globalPrefix.'/'.$prefix);
154 154
 	}
155 155
 
156 156
 	/**
Please login to merge, or discard this patch.
lib/private/Memcache/CASTrait.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,13 +41,13 @@
 block discarded – undo
41 41
 	 */
42 42
 	public function cas($key, $old, $new) {
43 43
 		//no native cas, emulate with locking
44
-		if ($this->add($key . '_lock', true)) {
44
+		if ($this->add($key.'_lock', true)) {
45 45
 			if ($this->get($key) === $old) {
46 46
 				$this->set($key, $new);
47
-				$this->remove($key . '_lock');
47
+				$this->remove($key.'_lock');
48 48
 				return true;
49 49
 			} else {
50
-				$this->remove($key . '_lock');
50
+				$this->remove($key.'_lock');
51 51
 				return false;
52 52
 			}
53 53
 		} else {
Please login to merge, or discard this patch.
lib/private/Memcache/APCu.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 	use CADTrait;
38 38
 
39 39
 	public function get($key) {
40
-		$result = apcu_fetch($this->getPrefix() . $key, $success);
40
+		$result = apcu_fetch($this->getPrefix().$key, $success);
41 41
 		if (!$success) {
42 42
 			return null;
43 43
 		}
@@ -45,24 +45,24 @@  discard block
 block discarded – undo
45 45
 	}
46 46
 
47 47
 	public function set($key, $value, $ttl = 0) {
48
-		return apcu_store($this->getPrefix() . $key, $value, $ttl);
48
+		return apcu_store($this->getPrefix().$key, $value, $ttl);
49 49
 	}
50 50
 
51 51
 	public function hasKey($key) {
52
-		return apcu_exists($this->getPrefix() . $key);
52
+		return apcu_exists($this->getPrefix().$key);
53 53
 	}
54 54
 
55 55
 	public function remove($key) {
56
-		return apcu_delete($this->getPrefix() . $key);
56
+		return apcu_delete($this->getPrefix().$key);
57 57
 	}
58 58
 
59 59
 	public function clear($prefix = '') {
60
-		$ns = $this->getPrefix() . $prefix;
60
+		$ns = $this->getPrefix().$prefix;
61 61
 		$ns = preg_quote($ns, '/');
62
-		if(class_exists('\APCIterator')) {
63
-			$iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
62
+		if (class_exists('\APCIterator')) {
63
+			$iter = new \APCIterator('user', '/^'.$ns.'/', APC_ITER_KEY);
64 64
 		} else {
65
-			$iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
65
+			$iter = new \APCUIterator('/^'.$ns.'/', APC_ITER_KEY);
66 66
 		}
67 67
 		return apcu_delete($iter);
68 68
 	}
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 * @return bool
77 77
 	 */
78 78
 	public function add($key, $value, $ttl = 0) {
79
-		return apcu_add($this->getPrefix() . $key, $value, $ttl);
79
+		return apcu_add($this->getPrefix().$key, $value, $ttl);
80 80
 	}
81 81
 
82 82
 	/**
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
100 100
 		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
101 101
 		 * for details
102 102
 		 */
103
-		return apcu_exists($this->getPrefix() . $key)
104
-			? apcu_inc($this->getPrefix() . $key, $step)
103
+		return apcu_exists($this->getPrefix().$key)
104
+			? apcu_inc($this->getPrefix().$key, $step)
105 105
 			: false;
106 106
 	}
107 107
 
@@ -125,8 +125,8 @@  discard block
 block discarded – undo
125 125
 		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
126 126
 		 * for details
127 127
 		 */
128
-		return apcu_exists($this->getPrefix() . $key)
129
-			? apcu_dec($this->getPrefix() . $key, $step)
128
+		return apcu_exists($this->getPrefix().$key)
129
+			? apcu_dec($this->getPrefix().$key, $step)
130 130
 			: false;
131 131
 	}
132 132
 
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	public function cas($key, $old, $new) {
142 142
 		// apc only does cas for ints
143 143
 		if (is_int($old) and is_int($new)) {
144
-			return apcu_cas($this->getPrefix() . $key, $old, $new);
144
+			return apcu_cas($this->getPrefix().$key, $old, $new);
145 145
 		} else {
146 146
 			return $this->casEmulated($key, $old, $new);
147 147
 		}
Please login to merge, or discard this patch.
lib/private/Memcache/CADTrait.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -38,13 +38,13 @@
 block discarded – undo
38 38
 	 */
39 39
 	public function cad($key, $old) {
40 40
 		//no native cas, emulate with locking
41
-		if ($this->add($key . '_lock', true)) {
41
+		if ($this->add($key.'_lock', true)) {
42 42
 			if ($this->get($key) === $old) {
43 43
 				$this->remove($key);
44
-				$this->remove($key . '_lock');
44
+				$this->remove($key.'_lock');
45 45
 				return true;
46 46
 			} else {
47
-				$this->remove($key . '_lock');
47
+				$this->remove($key.'_lock');
48 48
 				return false;
49 49
 			}
50 50
 		} else {
Please login to merge, or discard this patch.
lib/private/Memcache/Memcached.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 	}
98 98
 
99 99
 	public function get($key) {
100
-		$result = self::$cache->get($this->getNamespace() . $key);
100
+		$result = self::$cache->get($this->getNamespace().$key);
101 101
 		if ($result === false and self::$cache->getResultCode() == \Memcached::RES_NOTFOUND) {
102 102
 			return null;
103 103
 		} else {
@@ -107,9 +107,9 @@  discard block
 block discarded – undo
107 107
 
108 108
 	public function set($key, $value, $ttl = 0) {
109 109
 		if ($ttl > 0) {
110
-			$result =  self::$cache->set($this->getNamespace() . $key, $value, $ttl);
110
+			$result = self::$cache->set($this->getNamespace().$key, $value, $ttl);
111 111
 		} else {
112
-			$result = self::$cache->set($this->getNamespace() . $key, $value);
112
+			$result = self::$cache->set($this->getNamespace().$key, $value);
113 113
 		}
114 114
 		if ($result !== true) {
115 115
 			$this->verifyReturnCode();
@@ -118,12 +118,12 @@  discard block
 block discarded – undo
118 118
 	}
119 119
 
120 120
 	public function hasKey($key) {
121
-		self::$cache->get($this->getNamespace() . $key);
121
+		self::$cache->get($this->getNamespace().$key);
122 122
 		return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
123 123
 	}
124 124
 
125 125
 	public function remove($key) {
126
-		$result= self::$cache->delete($this->getNamespace() . $key);
126
+		$result = self::$cache->delete($this->getNamespace().$key);
127 127
 		if (self::$cache->getResultCode() !== \Memcached::RES_NOTFOUND) {
128 128
 			$this->verifyReturnCode();
129 129
 		}
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	}
132 132
 
133 133
 	public function clear($prefix = '') {
134
-		$prefix = $this->getNamespace() . $prefix;
134
+		$prefix = $this->getNamespace().$prefix;
135 135
 		$allKeys = self::$cache->getAllKeys();
136 136
 		if ($allKeys === false) {
137 137
 			// newer Memcached doesn't like getAllKeys(), flush everything
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 	 * @throws \Exception
166 166
 	 */
167 167
 	public function add($key, $value, $ttl = 0) {
168
-		$result = self::$cache->add($this->getPrefix() . $key, $value, $ttl);
168
+		$result = self::$cache->add($this->getPrefix().$key, $value, $ttl);
169 169
 		if (self::$cache->getResultCode() !== \Memcached::RES_NOTSTORED) {
170 170
 			$this->verifyReturnCode();
171 171
 		}
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 	 */
182 182
 	public function inc($key, $step = 1) {
183 183
 		$this->add($key, 0);
184
-		$result = self::$cache->increment($this->getPrefix() . $key, $step);
184
+		$result = self::$cache->increment($this->getPrefix().$key, $step);
185 185
 
186 186
 		if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
187 187
 			return false;
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 	 * @return int | bool
199 199
 	 */
200 200
 	public function dec($key, $step = 1) {
201
-		$result = self::$cache->decrement($this->getPrefix() . $key, $step);
201
+		$result = self::$cache->decrement($this->getPrefix().$key, $step);
202 202
 
203 203
 		if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
204 204
 			return false;
Please login to merge, or discard this patch.