Completed
Pull Request — master (#9488)
by John
26:02 queued 01:01
created
apps/sharebymail/composer/composer/autoload_classmap.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -6,11 +6,11 @@
 block discarded – undo
6 6
 $baseDir = $vendorDir;
7 7
 
8 8
 return array(
9
-    'OCA\\ShareByMail\\Activity' => $baseDir . '/../lib/Activity.php',
10
-    'OCA\\ShareByMail\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
11
-    'OCA\\ShareByMail\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
12
-    'OCA\\ShareByMail\\Settings' => $baseDir . '/../lib/Settings.php',
13
-    'OCA\\ShareByMail\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
14
-    'OCA\\ShareByMail\\Settings\\SettingsManager' => $baseDir . '/../lib/Settings/SettingsManager.php',
15
-    'OCA\\ShareByMail\\ShareByMailProvider' => $baseDir . '/../lib/ShareByMailProvider.php',
9
+    'OCA\\ShareByMail\\Activity' => $baseDir.'/../lib/Activity.php',
10
+    'OCA\\ShareByMail\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
11
+    'OCA\\ShareByMail\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
12
+    'OCA\\ShareByMail\\Settings' => $baseDir.'/../lib/Settings.php',
13
+    'OCA\\ShareByMail\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
14
+    'OCA\\ShareByMail\\Settings\\SettingsManager' => $baseDir.'/../lib/Settings/SettingsManager.php',
15
+    'OCA\\ShareByMail\\ShareByMailProvider' => $baseDir.'/../lib/ShareByMailProvider.php',
16 16
 );
Please login to merge, or discard this patch.
apps/updatenotification/composer/autoload.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,6 +2,6 @@
 block discarded – undo
2 2
 
3 3
 // autoload.php @generated by Composer
4 4
 
5
-require_once __DIR__ . '/composer/autoload_real.php';
5
+require_once __DIR__.'/composer/autoload_real.php';
6 6
 
7 7
 return ComposerAutoloaderInitUpdateNotification::getLoader();
Please login to merge, or discard this patch.
apps/updatenotification/composer/composer/autoload_psr4.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,5 +6,5 @@
 block discarded – undo
6 6
 $baseDir = $vendorDir;
7 7
 
8 8
 return array(
9
-    'OCA\\UpdateNotification\\' => array($baseDir . '/../lib'),
9
+    'OCA\\UpdateNotification\\' => array($baseDir.'/../lib'),
10 10
 );
Please login to merge, or discard this patch.
apps/files_versions/composer/autoload.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,6 +2,6 @@
 block discarded – undo
2 2
 
3 3
 // autoload.php @generated by Composer
4 4
 
5
-require_once __DIR__ . '/composer/autoload_real.php';
5
+require_once __DIR__.'/composer/autoload_real.php';
6 6
 
7 7
 return ComposerAutoloaderInitFiles_Versions::getLoader();
Please login to merge, or discard this patch.
apps/files_versions/composer/composer/autoload_psr4.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,5 +6,5 @@
 block discarded – undo
6 6
 $baseDir = $vendorDir;
7 7
 
8 8
 return array(
9
-    'OCA\\Files_Versions\\' => array($baseDir . '/../lib'),
9
+    'OCA\\Files_Versions\\' => array($baseDir.'/../lib'),
10 10
 );
Please login to merge, or discard this patch.
apps/files_versions/lib/Hooks.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	/**
54 54
 	 * listen to write event.
55 55
 	 */
56
-	public static function write_hook( $params ) {
56
+	public static function write_hook($params) {
57 57
 		$path = $params[\OC\Files\Filesystem::signal_param_path];
58
-		if($path !== '') {
58
+		if ($path !== '') {
59 59
 			Storage::store($path);
60 60
 		}
61 61
 	}
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	public static function remove_hook($params) {
72 72
 		$path = $params[\OC\Files\Filesystem::signal_param_path];
73
-		if($path !== '') {
73
+		if ($path !== '') {
74 74
 			Storage::delete($path);
75 75
 		}
76 76
 	}
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 */
82 82
 	public static function pre_remove_hook($params) {
83 83
 		$path = $params[\OC\Files\Filesystem::signal_param_path];
84
-			if($path !== '') {
84
+			if ($path !== '') {
85 85
 				Storage::markDeletedFile($path);
86 86
 			}
87 87
 	}
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	public static function rename_hook($params) {
97 97
 		$oldpath = $params['oldpath'];
98 98
 		$newpath = $params['newpath'];
99
-		if($oldpath !== '' && $newpath !== '') {
99
+		if ($oldpath !== '' && $newpath !== '') {
100 100
 			Storage::renameOrCopy($oldpath, $newpath, 'rename');
101 101
 		}
102 102
 	}
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 	public static function copy_hook($params) {
112 112
 		$oldpath = $params['oldpath'];
113 113
 		$newpath = $params['newpath'];
114
-		if($oldpath !== '' && $newpath !== '') {
114
+		if ($oldpath !== '' && $newpath !== '') {
115 115
 			Storage::renameOrCopy($oldpath, $newpath, 'copy');
116 116
 		}
117 117
 	}
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	public static function pre_renameOrCopy_hook($params) {
128 128
 		// if we rename a movable mount point, then the versions don't have
129 129
 		// to be renamed
130
-		$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
130
+		$absOldPath = \OC\Files\Filesystem::normalizePath('/'.\OCP\User::getUser().'/files'.$params['oldpath']);
131 131
 		$manager = \OC\Files\Filesystem::getMountManager();
132 132
 		$mount = $manager->find($absOldPath);
133 133
 		$internalPath = $mount->getInternalPath($absOldPath);
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 			return;
136 136
 		}
137 137
 
138
-		$view = new \OC\Files\View(\OCP\User::getUser() . '/files');
138
+		$view = new \OC\Files\View(\OCP\User::getUser().'/files');
139 139
 		if ($view->file_exists($params['newpath'])) {
140 140
 			Storage::store($params['newpath']);
141 141
 		} else {
Please login to merge, or discard this patch.
apps/files/templates/list.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 		<div class="actions creatable hidden">
3 3
 			<div id="uploadprogresswrapper">
4 4
 				<div id="uploadprogressbar">
5
-					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading …'));?></span><span class="mobile"><?php p($l->t('…'));?></span></em>
5
+					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading …')); ?></span><span class="mobile"><?php p($l->t('…')); ?></span></em>
6 6
 				</div>
7 7
 				<button class="stop icon-close" style="display:none">
8 8
 					<span class="hidden-visually"><?php p($l->t('Cancel upload')) ?></span>
@@ -18,10 +18,10 @@  discard block
 block discarded – undo
18 18
 	*/ ?>
19 19
 	<input type="hidden" name="permissions" value="" id="permissions">
20 20
 	<input type="hidden" id="free_space" value="<?php isset($_['freeSpace']) ? p($_['freeSpace']) : '' ?>">
21
-	<?php if(isset($_['dirToken'])):?>
21
+	<?php if (isset($_['dirToken'])):?>
22 22
 	<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
23 23
 	<input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
24
-	<?php endif;?>
24
+	<?php endif; ?>
25 25
 	<input type="hidden" class="max_human_file_size"
26 26
 		   value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)">
27 27
 </div>
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 			</th>
50 50
 			<th id='headerName' class="hidden column-name">
51 51
 				<div id="headerName-container">
52
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
52
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
53 53
 					<span id="selectedActionsList" class="selectedActions">
54 54
 						<a href="" class="copy-move">
55 55
 							<span class="icon icon-external"></span>
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
67 67
 			</th>
68 68
 			<th id="headerDate" class="hidden column-mtime">
69
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
69
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
70 70
 					<span class="selectedActions"><a href="" class="delete-selected">
71 71
 						<span><?php p($l->t('Delete'))?></span>
72 72
 						<span class="icon icon-delete"></span>
@@ -86,6 +86,6 @@  discard block
 block discarded – undo
86 86
 <div id="editor"></div><!-- FIXME Do not use this div in your app! It is deprecated and will be removed in the future! -->
87 87
 <div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
88 88
 	<p>
89
-	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?>
89
+	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.')); ?>
90 90
 	</p>
91 91
 </div>
Please login to merge, or discard this patch.
lib/private/Collaboration/Collaborators/SearchResult.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -37,13 +37,13 @@  discard block
 block discarded – undo
37 37
 
38 38
 	public function addResultSet(SearchResultType $type, array $matches, array $exactMatches = null) {
39 39
 		$type = $type->getLabel();
40
-		if(!isset($this->result[$type])) {
40
+		if (!isset($this->result[$type])) {
41 41
 			$this->result[$type] = [];
42 42
 			$this->result['exact'][$type] = [];
43 43
 		}
44 44
 
45 45
 		$this->result[$type] = array_merge($this->result[$type], $matches);
46
-		if(is_array($exactMatches)) {
46
+		if (is_array($exactMatches)) {
47 47
 			$this->result['exact'][$type] = array_merge($this->result['exact'][$type], $exactMatches);
48 48
 		}
49 49
 	}
@@ -58,12 +58,12 @@  discard block
 block discarded – undo
58 58
 
59 59
 	public function hasResult(SearchResultType $type, $collaboratorId) {
60 60
 		$type = $type->getLabel();
61
-		if(!isset($this->result[$type])) {
61
+		if (!isset($this->result[$type])) {
62 62
 			return false;
63 63
 		}
64 64
 
65 65
 		$resultArrays = [$this->result['exact'][$type], $this->result[$type]];
66
-		foreach($resultArrays as $resultArray) {
66
+		foreach ($resultArrays as $resultArray) {
67 67
 			foreach ($resultArray as $result) {
68 68
 				if ($result['value']['shareWith'] === $collaboratorId) {
69 69
 					return true;
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	public function unsetResult(SearchResultType $type) {
82 82
 		$type = $type->getLabel();
83 83
 		$this->result[$type] = [];
84
-		if(isset($this->result['exact'][$type])) {
84
+		if (isset($this->result['exact'][$type])) {
85 85
 			$this->result['exact'][$type] = [];
86 86
 		}
87 87
 	}
Please login to merge, or discard this patch.
apps/user_ldap/appinfo/app.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
 $helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
40 40
 $configPrefixes = $helper->getServerConfigurationPrefixes(true);
41
-if(count($configPrefixes) > 0) {
41
+if (count($configPrefixes) > 0) {
42 42
 	$ldapWrapper = new OCA\User_LDAP\LDAP();
43 43
 	$ocConfig = \OC::$server->getConfig();
44 44
 	$notificationManager = \OC::$server->getNotificationManager();
@@ -58,10 +58,10 @@  discard block
 block discarded – undo
58 58
 	$userPluginManager = \OC::$server->query('LDAPUserPluginManager');
59 59
 	$groupPluginManager = \OC::$server->query('LDAPGroupPluginManager');
60 60
 
61
-	$userBackend  = new OCA\User_LDAP\User_Proxy(
61
+	$userBackend = new OCA\User_LDAP\User_Proxy(
62 62
 		$configPrefixes, $ldapWrapper, $ocConfig, $notificationManager, $userSession, $userPluginManager
63 63
 	);
64
-	$groupBackend  = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager);
64
+	$groupBackend = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager);
65 65
 	// register user backend
66 66
 	OC_User::useBackend($userBackend);
67 67
 
Please login to merge, or discard this patch.