Code quality/no spaces inside parenthesis

.php_cs

@@ -45,6 +45,8 @@ return PhpCsFixer\Config::create()
         'array_syntax' => ['syntax' => 'short'],
         'combine_consecutive_issets' => true,
         'combine_consecutive_unsets' => true,
+        'no_spaces_inside_parenthesis' => true,
+        'no_extra_consecutive_blank_lines' => true,
        ])
     ->setFinder($finder)
 ;

apps/comments/lib/Dav/CommentNode.php

@@ -22,7 +22,6 @@
 
 namespace OCA\Comments\Dav;
 
-
 use OCP\Comments\IComment;
 use OCP\Comments\ICommentsManager;
 use OCP\Comments\MessageTooLongException;
@@ -118,7 +117,7 @@ static public function getPropertyNames() {
 
 	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/comments/lib/Dav/CommentsPlugin.php

@@ -187,7 +187,7 @@ public function onReport($reportName, $report, $uri) {
 		foreach($results as $node) {
 			$nodePath = $this->server->getRequestUri() . '/' . $node->comment->getId();
 			$resultSet = $this->server->getPropertiesForPath($nodePath, CommentNode::getPropertyNames());
-			if(isset($resultSet[0], $resultSet[0][200])  ) {
+			if(isset($resultSet[0], $resultSet[0][200])) {
 				$responses[] = new Response(
 					$this->server->getBaseUri() . $nodePath,
 					[200 => $resultSet[0][200]],
@@ -254,6 +254,4 @@ private function createComment($objectType, $objectId, $data, $contentType = 'ap
 		}
 	}
 
-
-
 }

apps/comments/tests/unit/Dav/CommentsPluginTest.php

@@ -738,6 +738,4 @@ public function testOnReport() {
 		$this->plugin->onReport(CommentsPluginImplementation::REPORT_NAME, $parameters, '/' . $path);
 	}
 
-
-
 }

apps/dav/appinfo/Migrations/Version20170202213905.php

@@ -28,7 +28,6 @@
 use OCP\IUserManager;
 use OCP\Migration\ISqlMigration;
 
-
 /*
  * Resolve userid/propertypath into fileid
  * Update all entries with actual fileid if possible

apps/dav/appinfo/v1/caldav.php

@@ -82,7 +82,7 @@
 $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
 $server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
 $server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
-$server->addPlugin(new OCA\DAV\CalDAV\Schedule\IMipPlugin( \OC::$server->getMailer(), \OC::$server->getLogger(), \OC::$server->getRequest()));
+$server->addPlugin(new OCA\DAV\CalDAV\Schedule\IMipPlugin(\OC::$server->getMailer(), \OC::$server->getLogger(), \OC::$server->getRequest()));
 $server->addPlugin(new ExceptionLoggerPlugin('caldav', \OC::$server->getLogger()));
 
 // And off we go!

apps/dav/lib/Avatars/AvatarHome.php

@@ -19,10 +19,8 @@
  *
  */
 
-
 namespace OCA\DAV\Avatars;
 
-
 use OCP\IAvatarManager;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\MethodNotAllowed;
@@ -115,5 +113,4 @@ function getLastModified() {
 		return null;
 	}
 
-
 }

apps/dav/lib/Avatars/AvatarNode.php

@@ -19,10 +19,8 @@
  *
  */
 
-
 namespace OCA\DAV\Avatars;
 
-
 use OCP\IAvatar;
 use Sabre\DAV\File;
 

apps/dav/lib/CalDAV/CalendarObject.php

@@ -19,10 +19,8 @@
  *
  */
 
-
 namespace OCA\DAV\CalDAV;
 
-
 use Sabre\VObject\Component;
 use Sabre\VObject\Property;
 use Sabre\VObject\Reader;

apps/dav/lib/CalDAV/Schedule/Plugin.php

@@ -19,10 +19,8 @@
  *
  */
 
-
 namespace OCA\DAV\CalDAV\Schedule;
 
-
 class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
 
 	public function getAddressesForPrincipal($principal) {

apps/dav/lib/Capabilities.php

@@ -19,7 +19,6 @@
  *
  */
 
-
 namespace OCA\DAV;
 
 use OCP\Capabilities\ICapability;

apps/dav/lib/CardDAV/AddressBookImpl.php

@@ -241,7 +241,7 @@ protected function vCard2Array($uri, VCard $vCard) {
 				$result[$property->name] = $property->getValue();
 			}
 		}
-		if ($this->addressBookInfo['principaluri'] === 'principals/system/system' ) {
+		if ($this->addressBookInfo['principaluri'] === 'principals/system/system') {
 			$result['isSystemBook'] = true;
 			if ($this->addressBookInfo['uri'] === 'system') {
 				$result['isLocalSystemBook'] = true;

apps/dav/lib/CardDAV/Converter.php

@@ -37,7 +37,7 @@ public function createCardFromUser(IUser $user) {
 
 		$uid = $user->getUID();
 		$displayName = $user->getDisplayName();
-		$displayName = empty($displayName ) ? $uid : $displayName;
+		$displayName = empty($displayName) ? $uid : $displayName;
 		$emailAddress = $user->getEMailAddress();
 		$cloudId = $user->getCloudId();
 		$image = $this->getAvatarImage($user);
@@ -71,7 +71,7 @@ public function createCardFromUser(IUser $user) {
 	public function updateCard(VCard $vCard, IUser $user) {
 		$uid = $user->getUID();
 		$displayName = $user->getDisplayName();
-		$displayName = empty($displayName ) ? $uid : $displayName;
+		$displayName = empty($displayName) ? $uid : $displayName;
 		$emailAddress = $user->getEMailAddress();
 		$cloudId = $user->getCloudId();
 		$image = $this->getAvatarImage($user);

apps/dav/lib/CardDAV/SyncService.php

@@ -280,5 +280,4 @@ public function syncInstance(\Closure $progressCallback = null) {
 		}
 	}
 
-
 }

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

@@ -46,7 +46,6 @@
 
 class Auth extends AbstractBasic {
 
-
 	const DAV_AUTHENTICATED = 'AUTHENTICATED_TO_DAV_BACKEND';
 
 	/** @var ISession */

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

@@ -500,7 +500,6 @@ private function createFileChunked($data) {
 					/** @var \OC\Files\Storage\Storage $targetStorage */
 					list($partStorage, $partInternalPath) = $this->fileView->resolvePath($partFile);
 
-
 					$chunk_handler->file_assemble($partStorage, $partInternalPath);
 
 					if (!self::isChecksumValid($partStorage, $partInternalPath)) {
@@ -547,8 +546,7 @@ private function createFileChunked($data) {
 				// FIXME: should call refreshInfo but can't because $this->path is not the of the final file
 				$info = $this->fileView->getFileInfo($targetPath);
 
-
-				if (isset($partStorage, $partInternalPath)  ) {
+				if (isset($partStorage, $partInternalPath)) {
 					$checksums = $partStorage->getMetaData($partInternalPath)['checksum'];
 				} else {
 					$checksums = $targetStorage->getMetaData($targetInternalPath)['checksum'];

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

@@ -51,7 +51,6 @@ public function __construct(IConfig $config = null) {
 		}
 	}
 
-
 	/**
 	 * This initializes the plugin.
 	 *

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

@@ -41,7 +41,6 @@
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
 
-
 abstract class Node implements \Sabre\DAV\INode {
 
 	/**

apps/dav/lib/DAV/CopyPlugin.php

@@ -19,7 +19,6 @@
  *
  */
 
-
 namespace OCA\DAV\DAV;
 
 use OCA\DAV\Connector\Sabre\Exception\Forbidden;

apps/dav/lib/Files/ICopySource.php

@@ -19,10 +19,8 @@
  *
  */
 
-
 namespace OCA\DAV\Files;
 
-
 /**
  * Interface ICopySource
  * This interface allows special handling of copy operations based on the copy source.

apps/dav/lib/Files/IFileNode.php

@@ -19,10 +19,8 @@
  *
  */
 
-
 namespace OCA\DAV\Files;
 
-
 use OCP\Files\Node;
 
 interface IFileNode {

apps/dav/lib/Files/IProvidesAdditionalHeaders.php

@@ -19,10 +19,8 @@
  *
  */
 
-
 namespace OCA\DAV\Files;
 
-
 /**
  * Interface IProvidesAdditionalHeaders
  * This interface allows to add additional headers to the response

apps/dav/lib/Meta/MetaFile.php

@@ -19,10 +19,8 @@
  *
  */
 
-
 namespace OCA\DAV\Meta;
 
-
 use OC\Files\Meta\MetaFileVersionNode;
 use OCA\DAV\Files\ICopySource;
 use OCA\DAV\Files\IProvidesAdditionalHeaders;

apps/dav/lib/Meta/MetaFolder.php

@@ -19,10 +19,8 @@
  *
  */
 
-
 namespace OCA\DAV\Meta;
 
-
 use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\Node;

apps/dav/lib/Meta/RootCollection.php

@@ -19,10 +19,8 @@
  *
  */
 
-
 namespace OCA\DAV\Meta;
 
-
 use OC\Files\Meta\MetaFileIdNode;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;

apps/dav/lib/SystemTag/SystemTagPlugin.php

@@ -207,7 +207,6 @@ private function createTag($data, $contentType = 'application/json') {
 		}
 	}
 
-
 	/**
 	 * Retrieves system tag properties
 	 *

apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php

@@ -64,7 +64,6 @@ class SystemTagsObjectMappingCollection implements ICollection {
 	 */
 	private $user;
 
-
 	/**
 	 * Constructor
 	 *

apps/dav/lib/Upload/AssemblyStream.php

@@ -207,7 +207,6 @@ public function stream_close() {
 		return true;
 	}
 
-
 	/**
 	 * Load the source from the stream context and return the context options
 	 *

apps/dav/lib/Upload/ChunkLocationProvider.php

@@ -19,10 +19,8 @@
  *
  */
 
-
 namespace OCA\DAV\Upload;
 
-
 use OC\Files\Mount\MountPoint;
 use OC\Files\Storage\Local;
 use OCP\Files\Config\IMountProvider;

apps/dav/lib/Upload/ChunkingPlugin.php

@@ -19,10 +19,8 @@
  *
  */
 
-
 namespace OCA\DAV\Upload;
 
-
 use Sabre\DAV\Exception\BadRequest;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;

apps/dav/lib/Upload/ChunkingPluginZsync.php

@@ -18,7 +18,6 @@
  */
 namespace OCA\DAV\Upload;
 
-
 use OCA\DAV\Connector\Sabre\File;
 use Sabre\DAV\Exception\BadRequest;
 use Sabre\DAV\Server;

apps/dav/tests/unit/AppInfo/PluginManagerTest.php

@@ -35,7 +35,6 @@ class PluginManagerTest extends TestCase {
 	public function test() {
 		$server = $this->createMock(ServerContainer::class);
 
-
 		$appManager = $this->createMock(IAppManager::class);
 		$appManager->method('getInstalledApps')
 			->willReturn(['adavapp', 'adavapp2']);

apps/dav/tests/unit/Avatars/AvatarHomeTest.php

@@ -19,10 +19,8 @@
  *
  */
 
-
 namespace OCA\DAV\Tests\Unit\Avatars;
 
-
 use OCA\DAV\Avatars\AvatarHome;
 use OCA\DAV\Avatars\AvatarNode;
 use OCP\IAvatar;

apps/dav/tests/unit/Avatars/AvatarNodeTest.php

@@ -19,10 +19,8 @@
  *
  */
 
-
 namespace OCA\DAV\Tests\Unit\Avatars;
 
-
 use OCA\DAV\Avatars\AvatarNode;
 use OCP\IAvatar;
 use OCP\IImage;

apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php

@@ -145,5 +145,4 @@ protected function createPublicCalendar() {
 		return $calendar;
 	}
 
-
 }

apps/dav/tests/unit/CalDAV/Publishing/PublisherTest.php

@@ -58,7 +58,6 @@ public function testSerializeNotPublished() {
 			<x1:pre-publish-url xmlns:d="DAV:" xmlns:x1="' . self::NS_CALENDARSERVER . '">urltopublish</x1:pre-publish-url>', $xml);
 	}
 
-
 	protected $elementMap = [];
 	protected $namespaceMap = ['DAV:' => 'd'];
 	protected $contextUri = '/';

apps/dav/tests/unit/CardDAV/AddressBookImplTest.php

@@ -22,10 +22,8 @@
  *
  */
 
-
 namespace OCA\DAV\Tests\unit\CardDAV;
 
-
 use OCA\DAV\CardDAV\AddressBook;
 use OCA\DAV\CardDAV\AddressBookImpl;
 use OCA\DAV\CardDAV\CardDavBackend;

apps/dav/tests/unit/CardDAV/CardDavBackendTest.php

@@ -89,7 +89,6 @@ public function setUp() {
 		$query = $this->db->getQueryBuilder();
 		$query->delete('cards')->execute();
 
-
 		$this->tearDown();
 	}