Merge pull request #20391 from nextcloud/refactor/spaces-cleanup

Remove all extra whitespace PSR2 does not like

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

@@ -133,7 +133,7 @@ class RequestHandlerController extends Controller {
 			$shareType === null ||
 			!is_array($protocol) ||
 			!isset($protocol['name']) ||
-			!isset ($protocol['options']) ||
+			!isset($protocol['options']) ||
 			!is_array($protocol['options']) ||
 			!isset($protocol['options']['sharedSecret'])
 		) {

apps/comments/lib/EventHandler.php

@@ -55,7 +55,7 @@ class EventHandler implements ICommentsEventHandler {
 		}
 
 		$eventType = $event->getEvent();
-		if( $eventType === CommentsEvent::EVENT_ADD
+		if($eventType === CommentsEvent::EVENT_ADD
 		) {
 			$this->notificationHandler($event);
 			$this->activityHandler($event);

apps/comments/lib/Notification/Listener.php

@@ -65,7 +65,7 @@ class Listener {
 		$notification = $this->instantiateNotification($comment);
 
 		foreach($mentions as $uid) {
-			if( ($comment->getActorType() === 'users' && $uid === $comment->getActorId())
+			if(($comment->getActorType() === 'users' && $uid === $comment->getActorId())
 				|| !$this->userManager->userExists($uid)
 			) {
 				// do not notify unknown users or yourself
@@ -73,7 +73,7 @@ class Listener {
 			}
 
 			$notification->setUser($uid);
-			if(    $event->getEvent() === CommentsEvent::EVENT_DELETE
+			if($event->getEvent() === CommentsEvent::EVENT_DELETE
 				|| $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE)
 			{
 				$this->notificationManager->markProcessed($notification);

apps/dav/lib/CalDAV/CachedSubscription.php

@@ -135,7 +135,7 @@ class CachedSubscription extends \Sabre\CalDAV\Calendar {
 		}
 
 		$obj['acl'] = $this->getChildACL();
-		return new CachedSubscriptionObject	($this->caldavBackend, $this->calendarInfo, $obj);
+		return new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
 
 	}
 

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -805,11 +805,11 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 			foreach ($mutations as $propertyName => $propertyValue) {
 
 				switch ($propertyName) {
-					case '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' :
+					case '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp':
 						$fieldName = 'transparent';
 						$newValues[$fieldName] = (int) ($propertyValue->getValue() === 'transparent');
 						break;
-					default :
+					default:
 						$fieldName = $this->propertyMap[$propertyName];
 						$newValues[$fieldName] = $propertyValue;
 						break;
@@ -1812,13 +1812,13 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 			foreach($changes as $uri => $operation) {
 
 				switch($operation) {
-					case 1 :
+					case 1:
 						$result['added'][] = $uri;
 						break;
-					case 2 :
+					case 2:
 						$result['modified'][] = $uri;
 						break;
-					case 3 :
+					case 3:
 						$result['deleted'][] = $uri;
 						break;
 				}

apps/dav/lib/CalDAV/Publishing/PublishPlugin.php

@@ -176,7 +176,7 @@ class PublishPlugin extends ServerPlugin {
 
 		switch ($documentType) {
 
-			case '{'.self::NS_CALENDARSERVER.'}publish-calendar' :
+			case '{'.self::NS_CALENDARSERVER.'}publish-calendar':
 
 			// We can only deal with IShareableCalendar objects
 			if (!$node instanceof Calendar) {
@@ -204,7 +204,7 @@ class PublishPlugin extends ServerPlugin {
 			// Breaking the event chain
 			return false;
 
-			case '{'.self::NS_CALENDARSERVER.'}unpublish-calendar' :
+			case '{'.self::NS_CALENDARSERVER.'}unpublish-calendar':
 
 			// We can only deal with IShareableCalendar objects
 			if (!$node instanceof Calendar) {

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -369,10 +369,10 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 			foreach($mutations as $property=>$newValue) {
 
 				switch($property) {
-					case '{DAV:}displayname' :
+					case '{DAV:}displayname':
 						$updates['displayname'] = $newValue;
 						break;
-					case '{' . Plugin::NS_CARDDAV . '}addressbook-description' :
+					case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
 						$updates['description'] = $newValue;
 						break;
 				}
@@ -414,13 +414,13 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 		foreach($properties as $property=>$newValue) {
 
 			switch($property) {
-				case '{DAV:}displayname' :
+				case '{DAV:}displayname':
 					$values['displayname'] = $newValue;
 					break;
-				case '{' . Plugin::NS_CARDDAV . '}addressbook-description' :
+				case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
 					$values['description'] = $newValue;
 					break;
-				default :
+				default:
 					throw new BadRequest('Unknown property: ' . $property);
 			}
 

apps/dav/lib/CardDAV/ImageExportPlugin.php

@@ -97,7 +97,7 @@ class ImageExportPlugin extends ServerPlugin {
 		$addressbook = $this->server->tree->getNodeForPath($addressbookpath);
 
 		$response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
-		$response->setHeader('Etag', $node->getETag() );
+		$response->setHeader('Etag', $node->getETag());
 		$response->setHeader('Pragma', 'public');
 
 		try {

apps/dav/lib/Comments/CommentNode.php

@@ -131,7 +131,7 @@ class CommentNode implements \Sabre\DAV\INode, \Sabre\DAV\IProperties {
 
 	protected function checkWriteAccessOnComment() {
 		$user = $this->userSession->getUser();
-		if(    $this->comment->getActorType() !== 'users'
+		if($this->comment->getActorType() !== 'users'
 			|| is_null($user)
 			|| $this->comment->getActorId() !== $user->getUID()
 		) {

apps/dav/lib/Connector/Sabre/File.php

@@ -512,7 +512,7 @@ class File extends Node implements IFile {
 		$bytesWritten = $chunk_handler->store($info['index'], $data);
 
 		//detect aborted upload
-		if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT') {
 			if (isset($_SERVER['CONTENT_LENGTH'])) {
 				$expected = (int)$_SERVER['CONTENT_LENGTH'];
 				if ($bytesWritten !== $expected) {

apps/dav/lib/DAV/Sharing/Plugin.php

@@ -149,7 +149,7 @@ class Plugin extends ServerPlugin {
 
 			// Dealing with the 'share' document, which modified invitees on a
 			// calendar.
-			case '{' . self::NS_OWNCLOUD . '}share' :
+			case '{' . self::NS_OWNCLOUD . '}share':
 
 				// We can only deal with IShareableCalendar objects
 				if (!$node instanceof IShareable) {

apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php

@@ -59,7 +59,7 @@ class ShareRequest implements XmlDeserializable {
 		foreach ($elements as $elem) {
 			switch ($elem['name']) {
 
-				case '{' . Plugin::NS_OWNCLOUD . '}set' :
+				case '{' . Plugin::NS_OWNCLOUD . '}set':
 					$sharee = $elem['value'];
 
 					$sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
@@ -73,7 +73,7 @@ class ShareRequest implements XmlDeserializable {
 					];
 					break;
 
-				case '{' . Plugin::NS_OWNCLOUD . '}remove' :
+				case '{' . Plugin::NS_OWNCLOUD . '}remove':
 					$remove[] = $elem['value']['{DAV:}href'];
 					break;
 

apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php

@@ -192,7 +192,7 @@ class IMipPluginTest extends TestCase {
 			->with('dav', 'invitation_link_recipients', 'yes')
 			->willReturn('yes');
 
-		$message = $this->_testMessage( $veventParams );
+		$message = $this->_testMessage($veventParams);
 
 		$this->_expectSend('frodo@hobb.it', $expectsMail, $expectsMail);
 
@@ -274,8 +274,8 @@ class IMipPluginTest extends TestCase {
 			'SUMMARY' => 'Fellowship meeting',
 			'DTSTART' => new \DateTime('2018-01-01 00:00:00')
 		], $attrs));
-		$message->message->VEVENT->add( 'ORGANIZER', 'mailto:gandalf@wiz.ard' );
+		$message->message->VEVENT->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$message->message->VEVENT->add( 'ATTENDEE', 'mailto:'.$recipient, [ 'RSVP' => 'TRUE' ] );
+		$message->message->VEVENT->add('ATTENDEE', 'mailto:'.$recipient, [ 'RSVP' => 'TRUE' ]);
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
 		$message->recipient = 'mailto:'.$recipient;

apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php

@@ -62,7 +62,7 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 	}
 
 	public function getNode() {
-		return new \OCA\DAV\SystemTag\SystemTagsObjectMappingCollection (
+		return new \OCA\DAV\SystemTag\SystemTagsObjectMappingCollection(
 			111,
 			'files',
 			$this->user,

apps/encryption/lib/Controller/RecoveryController.php

@@ -121,7 +121,7 @@ class RecoveryController extends Controller {
 
 		if (empty($newPassword)) {
 			$errorMessage = (string)$this->l->t('Please provide a new recovery password');
-			return new DataResponse (['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
+			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
 		}
 
 		if (empty($confirmPassword)) {

apps/encryption/lib/Controller/StatusController.php

@@ -70,7 +70,7 @@ class StatusController extends Controller {
 
 		$status = 'error';
 		$message = 'no valid init status';
-		switch( $this->session->getStatus()) {
+		switch($this->session->getStatus()) {
 			case Session::INIT_EXECUTED:
 				$status = 'interactionNeeded';
 				$message = (string)$this->l->t(

apps/encryption/lib/Crypto/EncryptAll.php

@@ -473,11 +473,11 @@ class EncryptAll {
 	protected function createMailBody($password) {
 
 		$html = new \OC_Template("encryption", "mail", "");
-		$html->assign ('password', $password);
+		$html->assign('password', $password);
 		$htmlMail = $html->fetchPage();
 
 		$plainText = new \OC_Template("encryption", "altmail", "");
-		$plainText->assign ('password', $password);
+		$plainText->assign('password', $password);
 		$plainTextMail = $plainText->fetchPage();
 
 		return [$htmlMail, $plainTextMail];

apps/encryption/templates/altmail.php

@@ -3,7 +3,7 @@
 /** @var array $_ */
 
 print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", [$_['password']]));
-if ( isset($_['expiration']) ) {
+if (isset($_['expiration'])) {
 	print_unescaped($l->t("The share will expire on %s.", [$_['expiration']]));
 	print_unescaped("\n\n");
 }

apps/encryption/templates/settings-admin.php

@@ -13,7 +13,7 @@ style('encryption', 'settings-admin');
 			<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
 				   value="1" <?php if ($_['encryptHomeStorage']) print_unescaped('checked="checked"'); ?> />
 			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
-			<em><?php p( $l->t( "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" ) ); ?></em>
+			<em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em>
 		</p>
 		<br />
 		<?php if($_['masterKeyEnabled'] === false): ?>

apps/encryption/templates/settings-personal.php

@@ -6,49 +6,49 @@ script('encryption', 'settings-personal');
 <form id="ocDefaultEncryptionModule" class="section">
 	<h2 data-anchor-name="basic-encryption-module"><?php p($l->t('Basic encryption module')); ?></h2>
 
-	<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?>
+	<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED): ?>
 
 	<?php p($l->t("Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.")); ?>
 
-	<?php elseif ( $_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED ): ?>
+	<?php elseif ($_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED): ?>
 		<p>
 			<a name="changePKPasswd" />
 			<label for="changePrivateKeyPasswd">
-				<em><?php p( $l->t( "Your private key password no longer matches your log-in password." ) ); ?></em>
+				<em><?php p($l->t("Your private key password no longer matches your log-in password.")); ?></em>
 			</label>
 			<br />
-			<?php p( $l->t( "Set your old private key password to your current log-in password:" ) ); ?>
+			<?php p($l->t("Set your old private key password to your current log-in password:")); ?>
-			<?php if (  $_["recoveryEnabledForUser"] ):
+			<?php if ($_["recoveryEnabledForUser"]):
-					p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );
+					p($l->t(" If you don't remember your old password you can ask your administrator to recover your files."));
 			endif; ?>
 			<br />
 			<input
 				type="password"
 				name="changePrivateKeyPassword"
 				id="oldPrivateKeyPassword" />
-			<label for="oldPrivateKeyPassword"><?php p($l->t( "Old log-in password" )); ?></label>
+			<label for="oldPrivateKeyPassword"><?php p($l->t("Old log-in password")); ?></label>
 			<br />
 			<input
 				type="password"
 				name="changePrivateKeyPassword"
 				id="newPrivateKeyPassword" />
-			<label for="newRecoveryPassword"><?php p($l->t( "Current log-in password" )); ?></label>
+			<label for="newRecoveryPassword"><?php p($l->t("Current log-in password")); ?></label>
 			<br />
 			<button
 				type="button"
 				name="submitChangePrivateKeyPassword"
-				disabled><?php p($l->t( "Update Private Key Password" )); ?>
+				disabled><?php p($l->t("Update Private Key Password")); ?>
 			</button>
 			<span class="msg"></span>
 		</p>
 
-	<?php elseif ( $_["recoveryEnabled"] && $_["privateKeySet"] &&  $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL ): ?>
+	<?php elseif ($_["recoveryEnabled"] && $_["privateKeySet"] &&  $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL): ?>
 		<br />
 		<p id="userEnableRecovery">
-			<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>
+			<label for="userEnableRecovery"><?php p($l->t("Enable password recovery:")); ?></label>
 			<span class="msg"></span>
 			<br />
-			<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?></em>
+			<em><?php p($l->t("Enabling this option will allow you to reobtain access to your encrypted files in case of password loss")); ?></em>
 			<br />
 			<input
 			type="radio"
@@ -56,8 +56,8 @@ script('encryption', 'settings-personal');
 			id="userEnableRecoveryCheckbox"
 			name="userEnableRecovery"
 			value="1"
-			<?php echo ( $_["recoveryEnabledForUser"] ? 'checked="checked"' : '' ); ?> />
+			<?php echo($_["recoveryEnabledForUser"] ? 'checked="checked"' : ''); ?> />
-			<label for="userEnableRecoveryCheckbox"><?php p( $l->t( "Enabled" ) ); ?></label>
+			<label for="userEnableRecoveryCheckbox"><?php p($l->t("Enabled")); ?></label>
 			<br />
 
 			<input
@@ -66,8 +66,8 @@ script('encryption', 'settings-personal');
 			id="userDisableRecoveryCheckbox"
 			name="userEnableRecovery"
 			value="0"
-			<?php echo ( $_["recoveryEnabledForUser"] === false ? 'checked="checked"' : '' ); ?> />
+			<?php echo($_["recoveryEnabledForUser"] === false ? 'checked="checked"' : ''); ?> />
-			<label for="userDisableRecoveryCheckbox"><?php p( $l->t( "Disabled" ) ); ?></label>
+			<label for="userDisableRecoveryCheckbox"><?php p($l->t("Disabled")); ?></label>
 		</p>
 	<?php endif; ?>
 </form>

apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php

@@ -146,7 +146,7 @@ class MountPublicLinkController extends Controller {
 		$storedPassword = $share->getPassword();
 		$authenticated = $this->session->get('public_link_authenticated') === $share->getId() ||
 			$this->shareManager->checkPassword($share, $password);
-		if (!empty($storedPassword) && !$authenticated ) {
+		if (!empty($storedPassword) && !$authenticated) {
 			$response = new JSONResponse(
 				['message' => 'No permission to access the share'],
 				Http::STATUS_BAD_REQUEST

apps/files/lib/Command/Scan.php

@@ -173,7 +173,7 @@ class Scan extends Base {
 		$inputPath = $input->getOption('path');
 		if ($inputPath) {
 			$inputPath = '/' . trim($inputPath, '/');
-			list (, $user,) = explode('/', $inputPath, 3);
+			list(, $user,) = explode('/', $inputPath, 3);
 			$users = [$user];
 		} else if ($input->getOption('all')) {
 			$users = $this->userManager->search('');

apps/files/list.php

@@ -37,4 +37,3 @@ $tmpl = new OCP\Template('files', 'list', '');
 $tmpl->assign('showgridview', $showgridview && !$isIE);
 $tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
 $tmpl->printPage();
-

apps/files/simplelist.php

@@ -35,4 +35,3 @@ $tmpl = new OCP\Template('files', 'simplelist', '');
 // gridview not available for ie
 $tmpl->assign('showgridview', $showgridview && !$isIE);
 $tmpl->printPage();
-

apps/files/templates/list.php

@@ -44,7 +44,7 @@
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
 					<a class="name sort columntitle" data-sort="name">
-                        <span><?php p($l->t( 'Name' )); ?></span>
+                        <span><?php p($l->t('Name')); ?></span>
                         <span class="sort-indicator"></span>
 
                     </a>
@@ -60,7 +60,7 @@
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 			<th id="headerDate" class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 		</tr>
 	</thead>

apps/files/templates/simplelist.php

@@ -18,14 +18,14 @@
 		<tr>
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
 				</div>
 			</th>
 			<th id="headerSize" class="hidden column-size">
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 			<th id="headerDate" class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
 				<span class="selectedActions">
 				    <a href="" class="delete-selected">
 					<img class="svg" alt=""

apps/files_external/lib/Lib/Storage/FTP.php

@@ -56,7 +56,7 @@ class FTP extends StreamWrapper{
 				$this->secure = false;
 			}
 			$this->root=isset($params['root'])?$params['root']:'/';
-			if ( ! $this->root || $this->root[0]!=='/') {
+			if (! $this->root || $this->root[0]!=='/') {
 				$this->root='/'.$this->root;
 			}
 			if (substr($this->root, -1) !== '/') {

apps/files_external/lib/Lib/Storage/SFTP.php

@@ -371,7 +371,7 @@ class SFTP extends \OC\Files\Storage\Common {
 			switch($mode) {
 				case 'r':
 				case 'rb':
-					if ( !$this->file_exists($path)) {
+					if (!$this->file_exists($path)) {
 						return false;
 					}
 					SFTPReadStream::register();

apps/files_external/lib/Lib/Storage/SFTPWriteStream.php

@@ -180,4 +180,3 @@ class SFTPWriteStream implements File {
 	}
 
 }
-

apps/files_external/templates/list.php

@@ -16,7 +16,7 @@
 		<tr>
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
 				</div>
 			</th>
 			<th id="headerBackend" class="hidden column-backend">

apps/files_external/templates/settings.php

@@ -1,10 +1,10 @@
 <?php
 	use \OCA\Files_External\Lib\Backend\Backend;
-	use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
-	use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\DefinitionParameter;
-	use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Service\BackendService;
 
-	$canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting'];
+$canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting'];
 
 	$l->t("Enable encryption");
 	$l->t("Enable previews");
@@ -142,7 +142,7 @@
 							});
 						?>
 						<?php foreach ($sortedBackends as $backend): ?>
-							<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
+							<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends?>
 							<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
 						<?php endforeach; ?>
 					</select>

apps/files_external/tests/Storage/Amazons3Test.php

@@ -45,7 +45,7 @@ class Amazons3Test extends \Test\Files\Storage\Storage {
 		parent::setUp();
 
 		$this->config = include('files_external/tests/config.amazons3.php');
-		if ( ! is_array($this->config) or ! $this->config['run']) {
+		if (! is_array($this->config) or ! $this->config['run']) {
 			$this->markTestSkipped('AmazonS3 backend not configured');
 		}
 		$this->instance = new AmazonS3($this->config);

apps/files_external/tests/Storage/FtpTest.php

@@ -47,7 +47,7 @@ class FtpTest extends \Test\Files\Storage\Storage {
 
 		$id = $this->getUniqueID();
 		$this->config = include('files_external/tests/config.ftp.php');
-		if ( ! is_array($this->config) or ! $this->config['run']) {
+		if (! is_array($this->config) or ! $this->config['run']) {
 			$this->markTestSkipped('FTP backend not configured');
 		}
 		$this->config['root'] .= '/' . $id; //make sure we have an new empty folder to work in

apps/files_external/tests/Storage/OwncloudTest.php

@@ -45,7 +45,7 @@ class OwncloudTest extends \Test\Files\Storage\Storage {
 
 		$id = $this->getUniqueID();
 		$this->config = include('files_external/tests/config.php');
-		if ( ! is_array($this->config) or ! isset($this->config['owncloud']) or ! $this->config['owncloud']['run']) {
+		if (! is_array($this->config) or ! isset($this->config['owncloud']) or ! $this->config['owncloud']['run']) {
 			$this->markTestSkipped('Nextcloud backend not configured');
 		}
 		$this->config['owncloud']['root'] .= '/' . $id; //make sure we have an new empty folder to work in

apps/files_external/tests/Storage/SFTP_KeyTest.php

@@ -44,7 +44,7 @@ class SFTP_KeyTest extends \Test\Files\Storage\Storage {
 
 		$id = $this->getUniqueID();
 		$this->config = include('files_external/tests/config.php');
-		if ( ! is_array($this->config) or ! isset($this->config['sftp_key']) or ! $this->config['sftp_key']['run']) {
+		if (! is_array($this->config) or ! isset($this->config['sftp_key']) or ! $this->config['sftp_key']['run']) {
 			$this->markTestSkipped('SFTP with key backend not configured');
 		}
 		// Make sure we have an new empty folder to work in

apps/files_sharing/lib/Controller/ShareController.php

@@ -425,7 +425,7 @@ class ShareController extends AuthPublicShareController {
 		$shareTmpl['previewURL'] = $shareTmpl['downloadURL'];
 
 		if ($shareTmpl['previewSupported']) {
-			$shareTmpl['previewImage'] = $this->urlGenerator->linkToRouteAbsolute( 'files_sharing.PublicPreview.getPreview',
+			$shareTmpl['previewImage'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.PublicPreview.getPreview',
 				['x' => 200, 'y' => 200, 'file' => $shareTmpl['directory_path'], 'token' => $shareTmpl['dirToken']]);
 			$ogPreview = $shareTmpl['previewImage'];
 

apps/files_sharing/lib/Exceptions/SharingRightsException.php

@@ -25,7 +25,6 @@ namespace OCA\Files_Sharing\Exceptions;
 
 use Exception;
 
-
 /**
  * Sharing and Resharing rights.
  *
@@ -36,4 +35,3 @@ use Exception;
 class SharingRightsException extends Exception {
 
 }
-

apps/files_sharing/templates/list.php

@@ -15,14 +15,14 @@
 		<tr>
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
 				</div>
 			</th>
 			<th id="headerDate" class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Share time' )); ?></span><span class="sort-indicator"></span></a>
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Share time')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 			<th class="hidden column-expiration">
-				<a class="columntitle"><span><?php p($l->t( 'Expiration date' )); ?></span></a>
+				<a class="columntitle"><span><?php p($l->t('Expiration date')); ?></span></a>
 			</th>
 		</tr>
 	</thead>

apps/files_sharing/tests/Migration/SetPasswordColumnTest.php

@@ -109,7 +109,7 @@ class SetPasswordColumnTest extends TestCase {
 
 		foreach ($allShares as $share) {
 			if ((int)$share['share_type'] === Share::SHARE_TYPE_LINK) {
-				$this->assertNull( $share['share_with']);
+				$this->assertNull($share['share_with']);
 				$this->assertSame('shareWith', $share['password']);
 			} else {
 				$this->assertSame('shareWith', $share['share_with']);

apps/files_trashbin/templates/index.php

@@ -29,7 +29,7 @@
 			</th>
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
 					<span id="selectedActionsList" class='selectedActions'>
 						<a href="" class="actions-selected">
 							<span class="icon icon-more"></span>
@@ -39,7 +39,7 @@
 				</div>
 			</th>
 			<th id="headerDate" class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Deleted' )); ?></span><span class="sort-indicator"></span></a>
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Deleted')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 		</tr>
 	</thead>

apps/files_versions/appinfo/app.php

@@ -22,4 +22,3 @@
  */
 
 \OC::$server->query(\OCA\Files_Versions\AppInfo\Application::class);
-

apps/files_versions/appinfo/routes.php

@@ -46,4 +46,3 @@ $this->create('files_versions_ajax_getVersions', 'ajax/getVersions.php')
 	->actionInclude('files_versions/ajax/getVersions.php');
 $this->create('files_versions_ajax_rollbackVersion', 'ajax/rollbackVersion.php')
 	->actionInclude('files_versions/ajax/rollbackVersion.php');
-

apps/files_versions/lib/Storage.php

@@ -107,7 +107,7 @@ class Storage {
 			$uid = User::getUser();
 		}
 		Filesystem::initMountPoints($uid);
-		if ( $uid !== User::getUser() ) {
+		if ($uid !== User::getUser()) {
 			$info = Filesystem::getFileInfo($filename);
 			$ownerView = new View('/'.$uid.'/files');
 			try {
@@ -735,7 +735,7 @@ class Storage {
 
 			$softQuota = true;
 			$quota = $user->getQuota();
-			if ( $quota === null || $quota === 'none' ) {
+			if ($quota === null || $quota === 'none') {
 				$quota = Filesystem::free_space('/');
 				$softQuota = false;
 			} else {

apps/oauth2/lib/Controller/OauthApiController.php

@@ -99,7 +99,7 @@ class OauthApiController extends Controller {
 		}
 
 		// We handle the initial and refresh tokens the same way
-		if ($grant_type === 'refresh_token' ) {
+		if ($grant_type === 'refresh_token') {
 			$code = $refresh_token;
 		}
 

apps/settings/templates/help.php

@@ -1,5 +1,5 @@
 <?php
-\OC_Util::addStyle( 'settings', "settings" );
+\OC_Util::addStyle('settings', "settings");
 ?>
 <div id="app-navigation">
 	<ul>

apps/settings/templates/settings/admin/overview.php

@@ -51,7 +51,7 @@
 		<ul class="info hidden"></ul>
 	</div>
 	<p id="postsetupchecks-hint" class="hidden">
-		<?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer noopener" href="%1$s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%2$s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])] )); ?>
+		<?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer noopener" href="%1$s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%2$s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])])); ?>
 	</p>
 
 	<p class="extra-top-margin">

apps/settings/templates/settings/admin/sharing.php

@@ -44,10 +44,10 @@
 		<label for="shareapiDefaultInternalExpireDate"><?php p($l->t('Set default expiration date for shares'));?></label><br/>
 	</p>
 	<p id="setDefaultInternalExpireDate" class="double-indent <?php if ($_['shareDefaultInternalExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
-		<?php p($l->t( 'Expire after ' )); ?>
+		<?php p($l->t('Expire after ')); ?>
 		<input type="text" name='shareapi_internal_expire_after_n_days' id="shareapiInternalExpireAfterNDays" placeholder="<?php p('7')?>"
 			   value='<?php p($_['shareInternalExpireAfterNDays']) ?>' />
-		<?php p($l->t( 'days' )); ?>
+		<?php p($l->t('days')); ?>
 		<input type="checkbox" name="shareapi_internal_enforce_expire_date" id="shareapiInternalEnforceExpireDate" class="checkbox"
 			   value="1" <?php if ($_['shareInternalEnforceExpireDate'] === 'yes') print_unescaped('checked="checked"'); ?> />
 		<label for="shareapiInternalEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
@@ -76,10 +76,10 @@
 
 	</p>
 	<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
-		<?php p($l->t( 'Expire after ' )); ?>
+		<?php p($l->t('Expire after ')); ?>
 		<input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>"
 			   value='<?php p($_['shareExpireAfterNDays']) ?>' />
-		<?php p($l->t( 'days' )); ?>
+		<?php p($l->t('days')); ?>
 		<input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate" class="checkbox"
 			   value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') print_unescaped('checked="checked"'); ?> />
 		<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>

apps/settings/templates/settings/frame.php

@@ -22,7 +22,7 @@
  */
 
 style('settings', 'settings');
-script('settings', [ 'settings', 'admin', 'log', 'certificates'] );
+script('settings', [ 'settings', 'admin', 'log', 'certificates']);
 script('core', 'setupchecks');
 script('files', 'jquery.fileupload');
 

apps/settings/tests/Controller/CheckSetupControllerTest.php

@@ -970,7 +970,7 @@ class CheckSetupControllerTest extends TestCase {
 		$this->checker
 				->expects($this->once())
 				->method('getResults')
-				->willReturn( [ 'core' =>  [ 'EXTRA_FILE' => ['/testfile' => []], 'INVALID_HASH' =>  [ '/.idea/workspace.xml' =>  [ 'expected' => 'f1c5e2630d784bc9cb02d5a28f55d6f24d06dae2a0fee685f3c2521b050955d9d452769f61454c9ddfa9c308146ade10546cfa829794448eaffbc9a04a29d216', 'current' => 'ce08bf30bcbb879a18b49239a9bec6b8702f52452f88a9d32142cad8d2494d5735e6bfa0d8642b2762c62ca5be49f9bf4ec231d4a230559d4f3e2c471d3ea094', ], '/lib/private/integritycheck/checker.php' =>  [ 'expected' => 'c5a03bacae8dedf8b239997901ba1fffd2fe51271d13a00cc4b34b09cca5176397a89fc27381cbb1f72855fa18b69b6f87d7d5685c3b45aee373b09be54742ea', 'current' => '88a3a92c11db91dec1ac3be0e1c87f862c95ba6ffaaaa3f2c3b8f682187c66f07af3a3b557a868342ef4a271218fe1c1e300c478e6c156c5955ed53c40d06585', ], '/settings/controller/checksetupcontroller.php' =>  [ 'expected' => '3e1de26ce93c7bfe0ede7c19cb6c93cadc010340225b375607a7178812e9de163179b0dc33809f451e01f491d93f6f5aaca7929685d21594cccf8bda732327c4', 'current' => '09563164f9904a837f9ca0b5f626db56c838e5098e0ccc1d8b935f68fa03a25c5ec6f6b2d9e44a868e8b85764dafd1605522b4af8db0ae269d73432e9a01e63a', ], ], ], 'bookmarks' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'dav' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'encryption' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'external' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'federation' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_antivirus' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_drop' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_external' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_pdfviewer' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_sharing' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_trashbin' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_versions' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_videoviewer' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'firstrunwizard' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'gitsmart' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'logreader' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature could not get verified.', ], ], 'password_policy' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'provisioning_api' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'sketch' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'threatblock' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'two_factor_auth' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'user_ldap' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'user_shibboleth' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], ]);
+				->willReturn([ 'core' =>  [ 'EXTRA_FILE' => ['/testfile' => []], 'INVALID_HASH' =>  [ '/.idea/workspace.xml' =>  [ 'expected' => 'f1c5e2630d784bc9cb02d5a28f55d6f24d06dae2a0fee685f3c2521b050955d9d452769f61454c9ddfa9c308146ade10546cfa829794448eaffbc9a04a29d216', 'current' => 'ce08bf30bcbb879a18b49239a9bec6b8702f52452f88a9d32142cad8d2494d5735e6bfa0d8642b2762c62ca5be49f9bf4ec231d4a230559d4f3e2c471d3ea094', ], '/lib/private/integritycheck/checker.php' =>  [ 'expected' => 'c5a03bacae8dedf8b239997901ba1fffd2fe51271d13a00cc4b34b09cca5176397a89fc27381cbb1f72855fa18b69b6f87d7d5685c3b45aee373b09be54742ea', 'current' => '88a3a92c11db91dec1ac3be0e1c87f862c95ba6ffaaaa3f2c3b8f682187c66f07af3a3b557a868342ef4a271218fe1c1e300c478e6c156c5955ed53c40d06585', ], '/settings/controller/checksetupcontroller.php' =>  [ 'expected' => '3e1de26ce93c7bfe0ede7c19cb6c93cadc010340225b375607a7178812e9de163179b0dc33809f451e01f491d93f6f5aaca7929685d21594cccf8bda732327c4', 'current' => '09563164f9904a837f9ca0b5f626db56c838e5098e0ccc1d8b935f68fa03a25c5ec6f6b2d9e44a868e8b85764dafd1605522b4af8db0ae269d73432e9a01e63a', ], ], ], 'bookmarks' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'dav' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'encryption' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'external' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'federation' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_antivirus' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_drop' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_external' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_pdfviewer' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_sharing' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_trashbin' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_versions' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'files_videoviewer' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'firstrunwizard' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'gitsmart' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'logreader' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature could not get verified.', ], ], 'password_policy' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'provisioning_api' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'sketch' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'threatblock' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'two_factor_auth' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'user_ldap' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], 'user_shibboleth' =>  [ 'EXCEPTION' =>  [ 'class' => 'OC\\IntegrityCheck\\Exceptions\\InvalidSignatureException', 'message' => 'Signature data not found.', ], ], ]);
 
 		$expected = new DataDisplayResponse(
 				'Technical information

apps/settings/tests/Settings/Admin/ServerTest.php

@@ -40,7 +40,6 @@ use OCP\IDBConnection;
 use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
-
 /**
  * @group DB
  */

apps/systemtags/appinfo/app.php

@@ -69,4 +69,3 @@ $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
 		'name' => $l->t('Tags'),
 	];
 });
-

apps/systemtags/templates/list.php

@@ -18,14 +18,14 @@
 		<tr>
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
 				</div>
 			</th>
 			<th id="headerSize" class="hidden column-size">
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 			<th id="headerDate" class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 		</tr>
 	</thead>

apps/testing/appinfo/app.php

@@ -22,4 +22,3 @@
  */
 
 $app = new \OCA\Testing\AppInfo\Application();
-

apps/theming/appinfo/routes.php

@@ -84,4 +84,3 @@ return ['routes' => [
 		'requirements' => ['image' => '.+']
 	],
 ]];
-

apps/theming/lib/ThemingDefaults.php

@@ -198,7 +198,7 @@ class ThemingDefaults extends \OC_Defaults {
 				$divider = ' · ';
 			}
 		}
-		if($legalLinks !== '' ) {
+		if($legalLinks !== '') {
 			$footer .= '<br/>' . $legalLinks;
 		}
 
@@ -353,7 +353,7 @@ class ThemingDefaults extends \OC_Defaults {
 			} catch (AppPathNotFoundException $e) {}
 			$route = $this->urlGenerator->linkToRoute('theming.Theming.getManifest');
 		}
-		if (strpos($image, 'filetypes/') === 0 && file_exists(\OC::$SERVERROOT . '/core/img/' . $image )) {
+		if (strpos($image, 'filetypes/') === 0 && file_exists(\OC::$SERVERROOT . '/core/img/' . $image)) {
 			$route = $this->urlGenerator->linkToRoute('theming.Icon.getThemedIcon', ['app' => $app, 'image' => $image]);
 		}
 

apps/user_ldap/lib/Access.php

@@ -620,7 +620,7 @@ class Access extends LDAPUtility {
 		// outside of core user management will still cache the user as non-existing.
 		$originalTTL = $this->connection->ldapCacheTTL;
 		$this->connection->setConfiguration(['ldapCacheTTL' => 0]);
-		if( $intName !== ''
+		if($intName !== ''
 			&& (($isUser && !$this->ncUserManager->userExists($intName))
 				|| (!$isUser && !\OC::$server->getGroupManager()->groupExists($intName))
 			)
@@ -708,7 +708,7 @@ class Access extends LDAPUtility {
 
 		foreach($ldapObjects as $ldapObject) {
 			$nameByLDAP = null;
-			if(    isset($ldapObject[$nameAttribute])
+			if(isset($ldapObject[$nameAttribute])
 				&& is_array($ldapObject[$nameAttribute])
 				&& isset($ldapObject[$nameAttribute][0])
 			) {
@@ -1777,7 +1777,7 @@ class Access extends LDAPUtility {
 		if($this->detectUuidAttribute($dn, $isUser, false, $ldapRecord)) {
 			$attr = $this->connection->$uuidAttr;
 			$uuid = isset($ldapRecord[$attr]) ? $ldapRecord[$attr] : $this->readAttribute($dn, $attr);
-			if( !is_array($uuid)
+			if(!is_array($uuid)
 				&& $uuidOverride !== ''
 				&& $this->detectUuidAttribute($dn, $isUser, true, $ldapRecord))
 			{

apps/user_ldap/lib/Helper.php

@@ -305,7 +305,7 @@ class Helper {
 		$userBackend  = new User_Proxy(
 			$configPrefixes, $ldapWrapper, $ocConfig, $notificationManager, $userSession, $userPluginManager
 		);
-		$uid = $userBackend->loginName2UserName($param['uid'] );
+		$uid = $userBackend->loginName2UserName($param['uid']);
 		if($uid !== false) {
 			$param['uid'] = $uid;
 		}

apps/user_ldap/lib/User/Manager.php

@@ -264,7 +264,7 @@ class Manager {
 			return $this->usersByUid[$id];
 		}
 
-		if($this->access->stringResemblesDN($id) ) {
+		if($this->access->stringResemblesDN($id)) {
 			$uid = $this->access->dn2username($id);
 			if($uid !== false) {
 				return $this->createAndCache($id, $uid);

apps/user_ldap/lib/User/User.php

@@ -327,12 +327,12 @@ class User {
 		if ($path !== '') {
 			//if attribute's value is an absolute path take this, otherwise append it to data dir
 			//check for / at the beginning or pattern c:\ resp. c:/
-			if(   '/' !== $path[0]
+			if('/' !== $path[0]
 			   && !(3 < strlen($path) && ctype_alpha($path[0])
 				   && $path[1] === ':' && ('\\' === $path[2] || '/' === $path[2]))
 			) {
 				$path = $this->config->getSystemValue('datadirectory',
-						\OC::$SERVERROOT.'/data' ) . '/' . $path;
+						\OC::$SERVERROOT.'/data') . '/' . $path;
 			}
 			//we need it to store it in the DB as well in case a user gets
 			//deleted so we can clean up afterwards
@@ -342,7 +342,7 @@ class User {
 			return $path;
 		}
 
-		if(    !is_null($attr)
+		if(!is_null($attr)
 			&& $this->config->getAppValue('user_ldap', 'enforce_home_folder_naming_rule', true)
 		) {
 			// a naming rule attribute is defined, but it doesn't exist for that LDAP user

apps/user_ldap/templates/settings.php

@@ -83,7 +83,7 @@ style('user_ldap', 'settings');
 				<p><label for="ldap_backup_host"><?php p($l->t('Backup (Replica) Host'));?></label><input type="text" id="ldap_backup_host" name="ldap_backup_host" data-default="<?php p($_['ldap_backup_host_default']); ?>" title="<?php p($l->t('Give an optional backup host. It must be a replica of the main LDAP/AD server.'));?>"></p>
 				<p><label for="ldap_backup_port"><?php p($l->t('Backup (Replica) Port'));?></label><input type="number" id="ldap_backup_port" name="ldap_backup_port" data-default="<?php p($_['ldap_backup_port_default']); ?>"  /></p>
 				<p><label for="ldap_override_main_server"><?php p($l->t('Disable Main Server'));?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php p($_['ldap_override_main_server_default']); ?>"  title="<?php p($l->t('Only connect to the replica server.'));?>" /></p>
-				<p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('Not recommended, use it for testing only! If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', [$theme->getName()] ));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/></p>
+				<p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('Not recommended, use it for testing only! If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', [$theme->getName()]));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/></p>
 				<p><label for="ldap_cache_ttl"><?php p($l->t('Cache Time-To-Live'));?></label><input type="number" id="ldap_cache_ttl" name="ldap_cache_ttl" title="<?php p($l->t('in seconds. A change empties the cache.'));?>" data-default="<?php p($_['ldap_cache_ttl_default']); ?>" /></p>
 			</div>
 			<h3><?php p($l->t('Directory Settings'));?></h3>

apps/user_ldap/tests/Jobs/CleanUpTest.php

@@ -55,7 +55,7 @@ class CleanUpTest extends \Test\TestCase {
 		$args = $this->getMocks();
 		$args['helper']->expects($this->once())
 			->method('haveDisabledConfigurations')
-			->willReturn(true	);
+			->willReturn(true);
 
 		$args['ocConfig']->expects($this->never())
 			->method('getSystemValue');

build/integration/features/bootstrap/Sharing.php

@@ -504,11 +504,11 @@ trait Sharing {
 			$fd = $body->getRowsHash();
 
 			foreach($fd as $field => $value) {
-				if (substr($field, 0, 10 ) === "share_with"){
+				if (substr($field, 0, 10) === "share_with"){
 					$value = str_replace("REMOTE", substr($this->remoteBaseUrl, 0, -5), $value);
 					$value = str_replace("LOCAL", substr($this->localBaseUrl, 0, -5), $value);
 				}
-				if (substr($field, 0, 6 ) === "remote"){
+				if (substr($field, 0, 6) === "remote"){
 					$value = str_replace("REMOTE", substr($this->remoteBaseUrl, 0, -4), $value);
 					$value = str_replace("LOCAL", substr($this->localBaseUrl, 0, -4), $value);
 				}
@@ -742,4 +742,3 @@ trait Sharing {
 		return $sharees;
 	}
 }
-

build/integration/features/bootstrap/Trashbin.php

@@ -167,4 +167,3 @@ trait Trashbin {
 		return;
 	}
 }
-

build/license.php

@@ -234,7 +234,7 @@ With help from many libraries and frameworks including:
 				array_shift($lines);
 				continue;
 			}
-			if (strpos($line, '*/') !== false ) {
+			if (strpos($line, '*/') !== false) {
 				array_shift($lines);
 				break;
 			}

build/signed-off-checker.php

@@ -127,4 +127,3 @@ if($notSignedCommits !== []) {
 } else {
 	exit(0);
 }
-

core/Command/Background/Base.php

@@ -71,7 +71,7 @@ abstract class Base extends Command {
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$mode = $this->getMode();
-		$this->config->setAppValue( 'core', 'backgroundjobs_mode', $mode );
+		$this->config->setAppValue('core', 'backgroundjobs_mode', $mode);
 		$output->writeln("Set mode for background jobs to '$mode'");
 	}
 }

core/Command/Encryption/DecryptAll.php

@@ -125,7 +125,7 @@ class DecryptAll extends Command {
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		if ( !$input->isInteractive() ) {
+		if (!$input->isInteractive()) {
 			$output->writeln('Invalid TTY.');
 			$output->writeln('If you are trying to execute the command in a Docker ');
 			$output->writeln("container, do not forget to execute 'docker exec' with");

core/Command/Encryption/EncryptAll.php

@@ -106,7 +106,7 @@ class EncryptAll extends Command {
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		if ( !$input->isInteractive() ) {
+		if (!$input->isInteractive()) {
 			$output->writeln('Invalid TTY.');
 			$output->writeln('If you are trying to execute the command in a Docker ');
 			$output->writeln("container, do not forget to execute 'docker exec' with");

core/Command/TwoFactorAuth/State.php

@@ -62,7 +62,7 @@ class State extends Base {
 
 		$providerStates = $this->registry->getProviderStates($user);
 		$filtered = $this->filterEnabledDisabledUnknownProviders($providerStates);
-		list ($enabled, $disabled) = $filtered;
+		list($enabled, $disabled) = $filtered;
 
 		if (!empty($enabled)) {
 			$output->writeln("Two-factor authentication is enabled for user $uid");

core/Controller/SetupController.php

@@ -109,7 +109,7 @@ class SetupController {
 	}
 
 	private function finishSetup(bool $installRecommended) {
-		if( file_exists( $this->autoConfigFile )) {
+		if(file_exists($this->autoConfigFile)) {
 			unlink($this->autoConfigFile);
 		}
 		\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
@@ -130,11 +130,11 @@ class SetupController {
 	}
 
 	public function loadAutoConfig($post) {
-		if( file_exists($this->autoConfigFile)) {
+		if(file_exists($this->autoConfigFile)) {
 			\OCP\Util::writeLog('core', 'Autoconfig file found, setting up Nextcloud…', ILogger::INFO);
 			$AUTOCONFIG = [];
 			include $this->autoConfigFile;
-			$post = array_merge ($post, $AUTOCONFIG);
+			$post = array_merge($post, $AUTOCONFIG);
 		}
 
 		$dbIsSet = isset($post['dbtype']);

core/templates/403.php

@@ -11,7 +11,7 @@ if(!isset($_)) {//standalone  page is not supported anymore - redirect to /
 ?>
 <ul>
 	<li class='error'>
-		<?php p($l->t( 'Access forbidden' )); ?><br>
+		<?php p($l->t('Access forbidden')); ?><br>
 		<p class='hint'><?php if(isset($_['message'])) p($_['message'])?></p>
 	</li>
 </ul>

core/templates/installation.php

@@ -35,35 +35,35 @@ script('core', [
 	</fieldset>
 	<?php endif; ?>
 	<fieldset id="adminaccount">
-		<legend><?php print_unescaped($l->t( 'Create an <strong>admin account</strong>' )); ?></legend>
+		<legend><?php print_unescaped($l->t('Create an <strong>admin account</strong>')); ?></legend>
 		<p class="grouptop">
 			<input type="text" name="adminlogin" id="adminlogin"
-				placeholder="<?php p($l->t( 'Username' )); ?>"
+				placeholder="<?php p($l->t('Username')); ?>"
 				value="<?php p($_['adminlogin']); ?>"
 				autocomplete="off" autocapitalize="none" autocorrect="off" autofocus required>
-			<label for="adminlogin" class="infield"><?php p($l->t( 'Username' )); ?></label>
+			<label for="adminlogin" class="infield"><?php p($l->t('Username')); ?></label>
 		</p>
 		<p class="groupbottom">
 			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass"
-				placeholder="<?php p($l->t( 'Password' )); ?>"
+				placeholder="<?php p($l->t('Password')); ?>"
 				value="<?php p($_['adminpass']); ?>"
 				autocomplete="off" autocapitalize="none" autocorrect="off" required>
-			<label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label>
+			<label for="adminpass" class="infield"><?php p($l->t('Password')); ?></label>
 			<input type="checkbox" id="show" class="hidden-visually" name="show">
-			<label for="show" class="hidden-visually"><?php p($l->t( 'Show password')); ?></label>
+			<label for="show" class="hidden-visually"><?php p($l->t('Show password')); ?></label>
 		</p>
 	</fieldset>
 
 	<?php if(!$_['directoryIsSet'] or !$_['dbIsSet'] or count($_['errors']) > 0): ?>
 	<fieldset id="advancedHeader">
-		<legend><a id="showAdvanced" tabindex="0" href="#"><?php p($l->t( 'Storage & database' )); ?><img src="<?php print_unescaped(image_path('', 'actions/caret-white.svg')); ?>" /></a></legend>
+		<legend><a id="showAdvanced" tabindex="0" href="#"><?php p($l->t('Storage & database')); ?><img src="<?php print_unescaped(image_path('', 'actions/caret-white.svg')); ?>" /></a></legend>
 	</fieldset>
 	<?php endif; ?>
 
 	<?php if(!$_['directoryIsSet'] or count($_['errors']) > 0): ?>
 	<fieldset id="datadirField">
 		<div id="datadirContent">
-			<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
+			<label for="directory"><?php p($l->t('Data folder')); ?></label>
 			<input type="text" name="directory" id="directory"
 				placeholder="<?php p(OC::$SERVERROOT.'/data'); ?>"
 				value="<?php p($_['directory']); ?>"
@@ -75,16 +75,16 @@ script('core', [
 	<?php if(!$_['dbIsSet'] or count($_['errors']) > 0): ?>
 	<fieldset id='databaseBackend'>
 		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
-			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
+			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite?>
-		<legend><?php p($l->t( 'Configure the database' )); ?></legend>
+		<legend><?php p($l->t('Configure the database')); ?></legend>
 		<div id="selectDbType">
 		<?php foreach($_['databases'] as $type => $label): ?>
 		<?php if(count($_['databases']) === 1): ?>
 		<p class="info">
-			<?php p($l->t( 'Only %s is available.', [$label] )); ?>
+			<?php p($l->t('Only %s is available.', [$label])); ?>
-			<?php p($l->t( 'Install and activate additional PHP modules to choose other database types.' )); ?><br>
+			<?php p($l->t('Install and activate additional PHP modules to choose other database types.')); ?><br>
 			<a href="<?php print_unescaped(link_to_docs('admin-source_install')); ?>" target="_blank" rel="noreferrer noopener">
-				<?php p($l->t( 'For more details check out the documentation.' )); ?> ↗</a>
+				<?php p($l->t('For more details check out the documentation.')); ?> ↗</a>
 		</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>">
 		<?php else: ?>
@@ -100,25 +100,25 @@ script('core', [
 		<fieldset id='databaseField'>
 		<div id="use_other_db">
 			<p class="grouptop">
-				<label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label>
+				<label for="dbuser" class="infield"><?php p($l->t('Database user')); ?></label>
 				<input type="text" name="dbuser" id="dbuser"
-					placeholder="<?php p($l->t( 'Database user' )); ?>"
+					placeholder="<?php p($l->t('Database user')); ?>"
 					value="<?php p($_['dbuser']); ?>"
 					autocomplete="off" autocapitalize="none" autocorrect="off">
 			</p>
 			<p class="groupmiddle">
 				<input type="password" name="dbpass" id="dbpass" data-typetoggle="#dbpassword-toggle"
-					placeholder="<?php p($l->t( 'Database password' )); ?>"
+					placeholder="<?php p($l->t('Database password')); ?>"
 					value="<?php p($_['dbpass']); ?>"
 					autocomplete="off" autocapitalize="none" autocorrect="off">
-				<label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
+				<label for="dbpass" class="infield"><?php p($l->t('Database password')); ?></label>
 				<input type="checkbox" id="dbpassword-toggle" class="hidden-visually" name="dbpassword-toggle">
 				<label for="dbpassword-toggle"></label>
 			</p>
 			<p class="groupmiddle">
-				<label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label>
+				<label for="dbname" class="infield"><?php p($l->t('Database name')); ?></label>
 				<input type="text" name="dbname" id="dbname"
-					placeholder="<?php p($l->t( 'Database name' )); ?>"
+					placeholder="<?php p($l->t('Database name')); ?>"
 					value="<?php p($_['dbname']); ?>"
 					autocomplete="off" autocapitalize="none" autocorrect="off"
 					pattern="[0-9a-zA-Z$_-]+">
@@ -126,23 +126,23 @@ script('core', [
 			<?php if($_['hasOracle']): ?>
 			<div id="use_oracle_db">
 				<p class="groupmiddle">
-					<label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label>
+					<label for="dbtablespace" class="infield"><?php p($l->t('Database tablespace')); ?></label>
 					<input type="text" name="dbtablespace" id="dbtablespace"
-						placeholder="<?php p($l->t( 'Database tablespace' )); ?>"
+						placeholder="<?php p($l->t('Database tablespace')); ?>"
 						value="<?php p($_['dbtablespace']); ?>"
 						autocomplete="off" autocapitalize="none" autocorrect="off">
 				</p>
 			</div>
 			<?php endif; ?>
 			<p class="groupbottom">
-				<label for="dbhost" class="infield"><?php p($l->t( 'Database host' )); ?></label>
+				<label for="dbhost" class="infield"><?php p($l->t('Database host')); ?></label>
 				<input type="text" name="dbhost" id="dbhost"
-					placeholder="<?php p($l->t( 'Database host' )); ?>"
+					placeholder="<?php p($l->t('Database host')); ?>"
 					value="<?php p($_['dbhost']); ?>"
 					autocomplete="off" autocapitalize="none" autocorrect="off">
 			</p>
 			<p class="info">
-				<?php p($l->t( 'Please specify the port number along with the host name (e.g., localhost:5432).' )); ?>
+				<?php p($l->t('Please specify the port number along with the host name (e.g., localhost:5432).')); ?>
 			</p>
 		</div>
 		</fieldset>
@@ -162,15 +162,15 @@ script('core', [
 		<p class="info">
 			<input type="checkbox" id="install-recommended-apps" name="install-recommended-apps" class="checkbox checkbox--white" checked>
 			<label for="install-recommended-apps">
-				<?php p($l->t( 'Install recommended apps' )); ?>
+				<?php p($l->t('Install recommended apps')); ?>
-				<span><?php p($l->t( 'Calendar, Contacts, Talk, Mail & OnlyOffice' )); ?></span>
+				<span><?php p($l->t('Calendar, Contacts, Talk, Mail & OnlyOffice')); ?></span>
 			</label>
 		</p>
 	</fieldset>
 
 	<div class="icon-loading-dark float-spinner">&nbsp;</div>
 
-	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>"></div>
+	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t('Finish setup')); ?>" data-finishing="<?php p($l->t('Finishing …')); ?>"></div>
 
 	<p class="info">
 		<span class="icon-info-white"></span>

core/templates/layout.guest.php

@@ -30,7 +30,7 @@
 		<?php }?>
 		<div class="wrapper">
 			<div class="v-align">
-				<?php if ($_['bodyid'] === 'body-login' ): ?>
+				<?php if ($_['bodyid'] === 'body-login'): ?>
 					<header role="banner">
 						<div id="header">
 							<div class="logo">

core/templates/layout.user.php

@@ -84,7 +84,7 @@
 								<?php foreach($_['navigation'] as $entry): ?>
 									<li data-id="<?php p($entry['id']); ?>">
 									<a href="<?php print_unescaped($entry['href']); ?>"
-										<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>
+										<?php if($entry['active']): ?> class="active"<?php endif; ?>
 										aria-label="<?php p($entry['name']); ?>">
 										<svg width="16" height="16" viewBox="0 0 16 16" alt="">
 											<defs><filter id="invertMenuMore-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>
@@ -139,7 +139,7 @@
 					<?php foreach($_['settingsnavigation'] as $entry):?>
 						<li data-id="<?php p($entry['id']); ?>">
 							<a href="<?php print_unescaped($entry['href']); ?>"
-								<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
+								<?php if($entry["active"]): ?> class="active"<?php endif; ?>>
 								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
 								<?php p($entry['name']) ?>
 							</a>

core/templates/update.admin.php

@@ -49,7 +49,7 @@
 		<p id="update-progress-message-error" class="hidden"></p>
 		<ul id="update-progress-message-warnings" class="hidden"></ul>
 		<p id="update-progress-message"></p>
-		<a class="update-show-detailed"><?php p($l->t( 'Detailed logs' )); ?> <span class="icon-caret-white"></span></a>
+		<a class="update-show-detailed"><?php p($l->t('Detailed logs')); ?> <span class="icon-caret-white"></span></a>
 		<div id="update-progress-detailed" class="hidden"></div>
 	</div>
 </div>

core/templates/update.use-cli.php

@@ -14,8 +14,8 @@
 
 	<?php if ($_['tooBig']) { ?>
 		<div class="warning updateAnyways">
-			<p><?php p($l->t('I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure.' )); ?></p>
+			<p><?php p($l->t('I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure.')); ?></p>
-			<a href="?IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup=IAmSuperSureToDoThis" class="button updateAnywaysButton"><?php p($l->t('Upgrade via web on my own risk' )); ?></a>
+			<a href="?IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup=IAmSuperSureToDoThis" class="button updateAnywaysButton"><?php p($l->t('Upgrade via web on my own risk')); ?></a>
 		</div>
 	<?php } ?>
 

lib/base.php

@@ -265,7 +265,7 @@ class OC {
 					$l->t('Cannot write into "config" directory!'),
 					$l->t('This can usually be fixed by giving the webserver write access to the config directory.') . '. '
 					. $l->t('Or, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it. See %s',
-					[ $urlGenerator->linkToDocs('admin-config') ] ),
+					[ $urlGenerator->linkToDocs('admin-config') ]),
 					503
 				);
 			}
@@ -863,7 +863,7 @@ class OC {
 
 	private static function registerAppRestrictionsHooks() {
 		$groupManager = self::$server->query(\OCP\IGroupManager::class);
-		$groupManager->listen ('\OC\Group', 'postDelete', function (\OCP\IGroup $group) {
+		$groupManager->listen('\OC\Group', 'postDelete', function (\OCP\IGroup $group) {
 			$appManager = self::$server->getAppManager();
 			$apps = $appManager->getEnabledAppsForGroup($group);
 			foreach ($apps as $appId) {

lib/private/AppFramework/Http/Request.php

@@ -327,8 +327,8 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 		// There's a few headers that seem to end up in the top-level
 		// server array.
 		switch ($name) {
-			case 'CONTENT_TYPE' :
+			case 'CONTENT_TYPE':
-			case 'CONTENT_LENGTH' :
+			case 'CONTENT_LENGTH':
 			case 'REMOTE_ADDR':
 				if (isset($this->server[$name])) {
 					return $this->server[$name];
@@ -811,7 +811,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 		$encoding = mb_detect_encoding($pathInfo, ['UTF-8', 'ISO-8859-1']);
 
 		switch($encoding) {
-			case 'ISO-8859-1' :
+			case 'ISO-8859-1':
 				$pathInfo = utf8_encode($pathInfo);
 		}
 		// end copy

lib/private/Avatar/Avatar.php

@@ -300,7 +300,7 @@ abstract class Avatar implements IAvatar {
 		$hash = strtolower($hash);
 
 		// Already a md5 hash?
-		if( preg_match('/^([0-9a-f]{4}-?){8}$/', $hash, $matches) !== 1 ) {
+		if(preg_match('/^([0-9a-f]{4}-?){8}$/', $hash, $matches) !== 1) {
 			$hash = md5($hash);
 		}
 

lib/private/Collaboration/Collaborators/RemotePlugin.php

@@ -96,7 +96,7 @@ class RemotePlugin implements ISearchPlugin {
 					/**
 					 * Add local share if remote cloud id matches a local user ones
 					 */
-					if ($localUser !== null && $remoteUser !== $this->userId && $cloudId === $localUser->getCloudId() ) {
+					if ($localUser !== null && $remoteUser !== $this->userId && $cloudId === $localUser->getCloudId()) {
 						$result['wide'][] = [
 							'label' => $contact['FN'],
 							'uuid' => $contact['UID'],

lib/private/Color.php

@@ -24,7 +24,9 @@
 namespace OC;
 
 class Color {
-	public $r, $g, $b;
+	public $r;
+	public $g;
+	public $b;
 	public function __construct($r, $g, $b) {
 		$this->r = $r;
 		$this->g = $g;

lib/private/Config.php

@@ -239,14 +239,14 @@ class Config {
 		$content .= var_export($this->cache, true);
 		$content .= ";\n";
 
-		touch ($this->configFilePath);
+		touch($this->configFilePath);
 		$filePointer = fopen($this->configFilePath, 'r+');
 
 		// Prevent others not to read the config
 		chmod($this->configFilePath, 0640);
 
 		// File does not exist, this can happen when doing a fresh install
-		if(!is_resource ($filePointer)) {
+		if(!is_resource($filePointer)) {
 			throw new HintException(
 				"Can't write into config directory!",
 				'This can usually be fixed by giving the webserver write access to the config directory.');
@@ -258,7 +258,7 @@ class Config {
 		}
 
 		// Write the config and release the lock
-		ftruncate ($filePointer, 0);
+		ftruncate($filePointer, 0);
 		fwrite($filePointer, $content);
 		fflush($filePointer);
 		flock($filePointer, LOCK_UN);

lib/private/DB/AdapterPgSql.php

@@ -35,8 +35,8 @@ class AdapterPgSql extends Adapter {
 
 	const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)';
 	public function fixupStatement($statement) {
-		$statement = str_replace( '`', '"', $statement );
+		$statement = str_replace('`', '"', $statement);
-		$statement = str_ireplace( 'UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement );
+		$statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
 		return $statement;
 	}
 

lib/private/DB/AdapterSqlite.php

@@ -43,10 +43,10 @@ class AdapterSqlite extends Adapter {
 
 	public function fixupStatement($statement) {
 		$statement = preg_replace('/`(\w+)` ILIKE \?/', 'LOWER($1) LIKE LOWER(?)', $statement);
-		$statement = str_replace( '`', '"', $statement );
+		$statement = str_replace('`', '"', $statement);
-		$statement = str_ireplace( 'NOW()', 'datetime(\'now\')', $statement );
+		$statement = str_ireplace('NOW()', 'datetime(\'now\')', $statement);
 		$statement = str_ireplace('GREATEST(', 'MAX(', $statement);
-		$statement = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement );
+		$statement = str_ireplace('UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement);
 		return $statement;
 	}
 

lib/private/DB/Connection.php

@@ -395,7 +395,7 @@ class Connection extends ReconnectWrapper implements IDBConnection {
 	 * @return string
 	 */
 	protected function replaceTablePrefix($statement) {
-		return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
+		return str_replace('*PREFIX*', $this->tablePrefix, $statement);
 	}
 
 	/**

lib/private/Encryption/Util.php

@@ -253,7 +253,7 @@ class Util {
 	public function stripPartialFileExtension($path) {
 		$extension = pathinfo($path, PATHINFO_EXTENSION);
 
-		if ( $extension === 'part') {
+		if ($extension === 'part') {
 
 			$newLength = strlen($path) - 5; // 5 = strlen(".part")
 			$fPath = substr($path, 0, $newLength);

lib/private/Files/ObjectStore/HomeObjectStoreStorage.php

@@ -34,7 +34,7 @@ class HomeObjectStoreStorage extends ObjectStoreStorage implements \OCP\Files\IH
 	 * @param array $params
 	 */
 	public function __construct($params) {
-		if ( ! isset($params['user']) || ! $params['user'] instanceof User) {
+		if (! isset($params['user']) || ! $params['user'] instanceof User) {
 			throw new \Exception('missing user object in parameters');
 		}
 		$this->user = $params['user'];

lib/private/Files/View.php

@@ -670,7 +670,7 @@ class View {
 				list($storage, $internalPath) = $this->resolvePath($path);
 				$target = $storage->fopen($internalPath, 'w');
 				if ($target) {
-					list (, $result) = \OC_Helper::streamCopy($data, $target);
+					list(, $result) = \OC_Helper::streamCopy($data, $target);
 					fclose($target);
 					fclose($data);
 

lib/private/Group/Database.php

@@ -194,7 +194,7 @@ class Database extends ABackend
 		$this->fixDI();
 
 		// No duplicate entries!
-		if( !$this->inGroup( $uid, $gid )) {
+		if(!$this->inGroup($uid, $gid)) {
 			$qb = $this->dbConn->getQueryBuilder();
 			$qb->insert('group_user')
 				->setValue('uid', $qb->createNamedParameter($uid))
@@ -250,7 +250,7 @@ class Database extends ABackend
 			->execute();
 
 		$groups = [];
-		while( $row = $cursor->fetch()) {
+		while($row = $cursor->fetch()) {
 			$groups[] = $row['gid'];
 			$this->groupCache[$row['gid']] = $row['gid'];
 		}

lib/private/Installer.php

@@ -479,7 +479,7 @@ class Installer {
 	 * this has to be done by the function oc_app_uninstall().
 	 */
 	public function removeApp($appId) {
-		if($this->isDownloaded( $appId )) {
+		if($this->isDownloaded($appId)) {
 			if (\OC::$server->getAppManager()->isShipped($appId)) {
 				return false;
 			}
@@ -528,10 +528,10 @@ class Installer {
 		$config = \OC::$server->getConfig();
 		$errors = [];
 		foreach(\OC::$APPSROOTS as $app_dir) {
-			if($dir = opendir( $app_dir['path'] )) {
+			if($dir = opendir($app_dir['path'])) {
-				while( false !== ( $filename = readdir( $dir ))) {
+				while(false !== ($filename = readdir($dir))) {
-					if( $filename[0] !== '.' and is_dir($app_dir['path']."/$filename") ) {
+					if($filename[0] !== '.' and is_dir($app_dir['path']."/$filename")) {
-						if( file_exists( $app_dir['path']."/$filename/appinfo/info.xml" )) {
+						if(file_exists($app_dir['path']."/$filename/appinfo/info.xml")) {
 							if($config->getAppValue($filename, "installed_version", null) === null) {
 								$info=OC_App::getAppInfo($filename);
 								$enabled = isset($info['default_enable']);
@@ -556,7 +556,7 @@ class Installer {
 						}
 					}
 				}
-				closedir( $dir );
+				closedir($dir);
 			}
 		}
 
@@ -623,7 +623,7 @@ class Installer {
 	 * @param string $script
 	 */
 	private static function includeAppScript($script) {
-		if ( file_exists($script) ){
+		if (file_exists($script)){
 			include $script;
 		}
 	}

lib/private/L10N/Factory.php

@@ -526,10 +526,10 @@ class Factory implements IFactory {
 			return $this->pluralFunctions[$string];
 		}
 
-		if (preg_match( '/^\s*nplurals\s*=\s*(\d+)\s*;\s*plural=(.*)$/u', $string, $matches)) {
+		if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s*plural=(.*)$/u', $string, $matches)) {
 			// sanitize
-			$nplurals = preg_replace( '/[^0-9]/', '', $matches[1] );
+			$nplurals = preg_replace('/[^0-9]/', '', $matches[1]);
-			$plural = preg_replace( '#[^n0-9:\(\)\?\|\&=!<>+*/\%-]#', '', $matches[2] );
+			$plural = preg_replace('#[^n0-9:\(\)\?\|\&=!<>+*/\%-]#', '', $matches[2]);
 
 			$body = str_replace(
 				[ 'plural', 'n', '$n$plurals', ],
@@ -545,7 +545,7 @@ class Factory implements IFactory {
 			$length = strlen($body);
 			for($i = 0; $i < $length; $i++) {
 				$ch = $body[$i];
-				switch ( $ch ) {
+				switch ($ch) {
 					case '?':
 						$res .= ' ? (';
 						$p++;
@@ -554,7 +554,7 @@ class Factory implements IFactory {
 						$res .= ') : (';
 						break;
 					case ';':
-						$res .= str_repeat( ')', $p ) . ';';
+						$res .= str_repeat(')', $p) . ';';
 						$p = 0;
 						break;
 					default:
@@ -627,7 +627,7 @@ class Factory implements IFactory {
 		ksort($commonLanguages);
 
 		// sort now by displayed language not the iso-code
-		usort( $languages, function ($a, $b) {
+		usort($languages, function ($a, $b) {
 			if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
 				// If a doesn't have a name, but b does, list b before a
 				return 1;

lib/private/Mail/Mailer.php

@@ -47,7 +47,6 @@ use OCP\Mail\IMailer;
 use OCP\Mail\IMessage;
 use OCP\Mail\Events\BeforeMessageSent;
 
-
 /**
  * Class Mailer provides some basic functions to create a mail message that can be used in combination with
  * \OC\Mail\Message.

lib/private/Search.php

@@ -53,7 +53,7 @@ class Search implements ISearch {
 		$results = [];
 		foreach($this->providers as $provider) {
 			/** @var $provider Provider */
-			if ( ! $provider->providesResultsFor($inApps) ) {
+			if (! $provider->providesResultsFor($inApps)) {
 				continue;
 			}
 			if ($provider instanceof PagedProvider) {
@@ -109,7 +109,7 @@ class Search implements ISearch {
 	 * Create instances of all the registered search providers
 	 */
 	private function initProviders() {
-		if( ! empty($this->providers) ) {
+		if(! empty($this->providers)) {
 			return;
 		}
 		foreach($this->registeredProviders as $provider) {

lib/private/Share/Share.php

@@ -854,7 +854,7 @@ class Share extends Constants {
 			}
 			// Add display names to result
 			$row['share_with_displayname'] = $row['share_with'];
-			if ( isset($row['share_with']) && $row['share_with'] != '' &&
+			if (isset($row['share_with']) && $row['share_with'] != '' &&
 				$row['share_type'] === self::SHARE_TYPE_USER) {
 				$shareWithUser = \OC::$server->getUserManager()->get($row['share_with']);
 				$row['share_with_displayname'] = $shareWithUser === null ? $row['share_with'] : $shareWithUser->getDisplayName();
@@ -869,7 +869,7 @@ class Share extends Constants {
 					}
 				}
 			}
-			if ( isset($row['uid_owner']) && $row['uid_owner'] != '') {
+			if (isset($row['uid_owner']) && $row['uid_owner'] != '') {
 				$ownerUser = \OC::$server->getUserManager()->get($row['uid_owner']);
 				$row['displayname_owner'] = $ownerUser === null ? $row['uid_owner'] : $ownerUser->getDisplayName();
 			}
@@ -1018,7 +1018,7 @@ class Share extends Constants {
 				// for file/folder shares we need to compare file_source, otherwise we compare item_source
 				// only group shares if they already point to the same target, otherwise the file where shared
 				// before grouping of shares was added. In this case we don't group them toi avoid confusions
-				if (( $fileSharing && $item['file_source'] === $r['file_source'] && $item['file_target'] === $r['file_target']) ||
+				if (($fileSharing && $item['file_source'] === $r['file_source'] && $item['file_target'] === $r['file_target']) ||
 					(!$fileSharing && $item['item_source'] === $r['item_source'] && $item['item_target'] === $r['item_target'])) {
 					// add the first item to the list of grouped shares
 					if (!isset($result[$key]['grouped'])) {

lib/private/Tags.php

@@ -306,7 +306,7 @@ class Tags implements ITags {
 		}
 
 		if(!is_null($result)) {
-			while( $row = $result->fetchRow()) {
+			while($row = $result->fetchRow()) {
 				$id = (int)$row['objid'];
 
 				if ($this->includeShared) {
@@ -452,7 +452,7 @@ class Tags implements ITags {
 			if(!$this->hasTag($name) && $name !== '') {
 				$newones[] = new Tag($this->user, $this->type, $name);
 			}
-			if(!is_null($id) ) {
+			if(!is_null($id)) {
 				// Insert $objectid, $categoryid  pairs if not exist.
 				self::$relations[] = ['objid' => $id, 'tag' => $name];
 			}
@@ -550,7 +550,7 @@ class Tags implements ITags {
 			try {
 				$stmt = \OC_DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` '
 					. 'WHERE `categoryid` = ?');
-				while( $row = $result->fetchRow()) {
+				while($row = $result->fetchRow()) {
 					try {
 						$stmt->execute([$row['id']]);
 					} catch(\Exception $e) {

lib/private/Template/Base.php

@@ -65,7 +65,7 @@ class Base {
 	 */
 	protected function getAppTemplateDirs($theme, $app, $serverRoot, $app_dir) {
 		// Check if the app is in the app folder or in the root
-		if( file_exists($app_dir.'/templates/' )) {
+		if(file_exists($app_dir.'/templates/')) {
 			return [
 				$serverRoot.'/themes/'.$theme.'/apps/'.$app.'/templates/',
 				$app_dir.'/templates/',
@@ -115,7 +115,7 @@ class Base {
 	 * $_[$key][$position] in the template.
 	 */
 	public function append($key, $value) {
-		if( array_key_exists( $key, $this->vars )) {
+		if(array_key_exists($key, $this->vars)) {
 			$this->vars[$key][] = $value;
 		}
 		else{
@@ -131,7 +131,7 @@ class Base {
 	 */
 	public function printPage() {
 		$data = $this->fetchPage();
-		if( $data === false ) {
+		if($data === false) {
 			return false;
 		}
 		else{
@@ -168,7 +168,7 @@ class Base {
 		$theme = $this->theme;
 
 		if(!is_null($additionalParams)) {
-			$_ = array_merge( $additionalParams, $this->vars );
+			$_ = array_merge($additionalParams, $this->vars);
 			foreach ($_ as $var => $value) {
 				${$var} = $value;
 			}

lib/private/TemplateLayout.php

@@ -75,7 +75,7 @@ class TemplateLayout extends \OC_Template {
 
 		// Decide which page we show
 		if($renderAs === 'user') {
-			parent::__construct( 'core', 'layout.user' );
+			parent::__construct('core', 'layout.user');
 			if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
 				$this->assign('bodyid', 'body-settings');
 			}else{
@@ -83,22 +83,22 @@ class TemplateLayout extends \OC_Template {
 			}
 
 			// Add navigation entry
-			$this->assign( 'application', '');
+			$this->assign('application', '');
-			$this->assign( 'appid', $appId );
+			$this->assign('appid', $appId);
 			$navigation = \OC::$server->getNavigationManager()->getAll();
-			$this->assign( 'navigation', $navigation);
+			$this->assign('navigation', $navigation);
 			$settingsNavigation = \OC::$server->getNavigationManager()->getAll('settings');
-			$this->assign( 'settingsnavigation', $settingsNavigation);
+			$this->assign('settingsnavigation', $settingsNavigation);
 			foreach($navigation as $entry) {
 				if ($entry['active']) {
-					$this->assign( 'application', $entry['name'] );
+					$this->assign('application', $entry['name']);
 					break;
 				}
 			}
 
 			foreach($settingsNavigation as $entry) {
 				if ($entry['active']) {
-					$this->assign( 'application', $entry['name'] );
+					$this->assign('application', $entry['name']);
 					break;
 				}
 			}
@@ -139,7 +139,7 @@ class TemplateLayout extends \OC_Template {
 			$this->assign('user_uid', \OC_User::getUser());
 		} else if ($renderAs === 'public') {
 			parent::__construct('core', 'layout.public');
-			$this->assign( 'appid', $appId );
+			$this->assign('appid', $appId);
 			$this->assign('bodyid', 'body-public');
 
 			/** @var IRegistry $subscription */
@@ -196,7 +196,7 @@ class TemplateLayout extends \OC_Template {
 		foreach($jsFiles as $info) {
 			$web = $info[1];
 			$file = $info[2];
-			$this->append( 'jsfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
+			$this->append('jsfiles', $web.'/'.$file . $this->getVersionHashSuffix());
 		}
 
 		try {
@@ -229,14 +229,14 @@ class TemplateLayout extends \OC_Template {
 			$file = $info[2];
 
 			if (substr($file, -strlen('print.css')) === 'print.css') {
-				$this->append( 'printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
+				$this->append('printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix());
 			} else {
 				$suffix = $this->getVersionHashSuffix($web, $file);
 
 				if (strpos($file, '?v=') == false) {
-					$this->append( 'cssfiles', $web.'/'.$file . $suffix);
+					$this->append('cssfiles', $web.'/'.$file . $suffix);
 				} else {
-					$this->append( 'cssfiles', $web.'/'.$file . '-' . substr($suffix, 3));
+					$this->append('cssfiles', $web.'/'.$file . '-' . substr($suffix, 3));
 				}
 
 			}

lib/private/URLGenerator.php

@@ -122,7 +122,7 @@ class URLGenerator implements IURLGenerator {
 	public function linkTo(string $app, string $file, array $args = []): string {
 		$frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
 
-		if( $app !== '' ) {
+		if($app !== '') {
 			$app_path = \OC_App::getAppPath($app);
 			// Check if the app is in the app folder
 			if ($app_path && file_exists($app_path . '/' . $file)) {

lib/private/User/Backend.php

@@ -150,7 +150,7 @@ abstract class Backend implements UserInterface {
 	public function getDisplayNames($search = '', $limit = null, $offset = null) {
 		$displayNames = [];
 		$users = $this->getUsers($search, $limit, $offset);
-		foreach ( $users as $user) {
+		foreach ($users as $user) {
 			$displayNames[$user] = $user;
 		}
 		return $displayNames;

lib/private/User/Session.php

@@ -459,7 +459,7 @@ class Session implements IUserSession, Emitter {
 		}
 
 		// Try to login with this username and password
-		if (!$this->login($user, $password) ) {
+		if (!$this->login($user, $password)) {
 
 			// Failed, maybe the user used their email address
 			$users = $this->manager->getByEmail($user);