nextcloud / server

apps/dav/lib/CardDAV/ImageExportPlugin.php

Indentation +81 added lines, -81 removed lines

@@ -33,85 +33,85 @@
 
 class ImageExportPlugin extends ServerPlugin {
 
-	/** @var Server */
-	protected $server;
-	/** @var PhotoCache */
-	private $cache;
-
-	/**
-	 * ImageExportPlugin constructor.
-	 *
-	 * @param PhotoCache $cache
-	 */
-	public function __construct(PhotoCache $cache) {
-		$this->cache = $cache;
-	}
-
-	/**
-	 * Initializes the plugin and registers event handlers
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		$this->server->on('method:GET', [$this, 'httpGet'], 90);
-	}
-
-	/**
-	 * Intercepts GET requests on addressbook urls ending with ?photo.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function httpGet(RequestInterface $request, ResponseInterface $response) {
-		$queryParams = $request->getQueryParameters();
-		// TODO: in addition to photo we should also add logo some point in time
-		if (!array_key_exists('photo', $queryParams)) {
-			return true;
-		}
-
-		$size = isset($queryParams['size']) ? (int)$queryParams['size'] : -1;
-
-		$path = $request->getPath();
-		$node = $this->server->tree->getNodeForPath($path);
-
-		if (!($node instanceof Card)) {
-			return true;
-		}
-
-		$this->server->transactionType = 'carddav-image-export';
-
-		// Checking ACL, if available.
-		if ($aclPlugin = $this->server->getPlugin('acl')) {
-			/** @var \Sabre\DAVACL\Plugin $aclPlugin */
-			$aclPlugin->checkPrivileges($path, '{DAV:}read');
-		}
-
-		// Fetch addressbook
-		$addressbookpath = explode('/', $path);
-		array_pop($addressbookpath);
-		$addressbookpath = implode('/', $addressbookpath);
-		/** @var AddressBook $addressbook */
-		$addressbook = $this->server->tree->getNodeForPath($addressbookpath);
-
-		$response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
-		$response->setHeader('Etag', $node->getETag());
-		$response->setHeader('Pragma', 'public');
-
-		try {
-			$file = $this->cache->get($addressbook->getResourceId(), $node->getName(), $size, $node);
-			$response->setHeader('Content-Type', $file->getMimeType());
-			$fileName = $node->getName() . '.' . PhotoCache::ALLOWED_CONTENT_TYPES[$file->getMimeType()];
-			$response->setHeader('Content-Disposition', "attachment; filename=$fileName");
-			$response->setStatus(200);
-
-			$response->setBody($file->getContent());
-		} catch (NotFoundException $e) {
-			$response->setStatus(404);
-		}
-
-		return false;
-	}
+    /** @var Server */
+    protected $server;
+    /** @var PhotoCache */
+    private $cache;
+
+    /**
+     * ImageExportPlugin constructor.
+     *
+     * @param PhotoCache $cache
+     */
+    public function __construct(PhotoCache $cache) {
+        $this->cache = $cache;
+    }
+
+    /**
+     * Initializes the plugin and registers event handlers
+     *
+     * @param Server $server
+     * @return void
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        $this->server->on('method:GET', [$this, 'httpGet'], 90);
+    }
+
+    /**
+     * Intercepts GET requests on addressbook urls ending with ?photo.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function httpGet(RequestInterface $request, ResponseInterface $response) {
+        $queryParams = $request->getQueryParameters();
+        // TODO: in addition to photo we should also add logo some point in time
+        if (!array_key_exists('photo', $queryParams)) {
+            return true;
+        }
+
+        $size = isset($queryParams['size']) ? (int)$queryParams['size'] : -1;
+
+        $path = $request->getPath();
+        $node = $this->server->tree->getNodeForPath($path);
+
+        if (!($node instanceof Card)) {
+            return true;
+        }
+
+        $this->server->transactionType = 'carddav-image-export';
+
+        // Checking ACL, if available.
+        if ($aclPlugin = $this->server->getPlugin('acl')) {
+            /** @var \Sabre\DAVACL\Plugin $aclPlugin */
+            $aclPlugin->checkPrivileges($path, '{DAV:}read');
+        }
+
+        // Fetch addressbook
+        $addressbookpath = explode('/', $path);
+        array_pop($addressbookpath);
+        $addressbookpath = implode('/', $addressbookpath);
+        /** @var AddressBook $addressbook */
+        $addressbook = $this->server->tree->getNodeForPath($addressbookpath);
+
+        $response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
+        $response->setHeader('Etag', $node->getETag());
+        $response->setHeader('Pragma', 'public');
+
+        try {
+            $file = $this->cache->get($addressbook->getResourceId(), $node->getName(), $size, $node);
+            $response->setHeader('Content-Type', $file->getMimeType());
+            $fileName = $node->getName() . '.' . PhotoCache::ALLOWED_CONTENT_TYPES[$file->getMimeType()];
+            $response->setHeader('Content-Disposition', "attachment; filename=$fileName");
+            $response->setStatus(200);
+
+            $response->setBody($file->getContent());
+        } catch (NotFoundException $e) {
+            $response->setStatus(404);
+        }
+
+        return false;
+    }
 }

apps/settings/lib/Controller/ReasonsController.php

Indentation +11 added lines, -11 removed lines

@@ -30,17 +30,17 @@
 
 class ReasonsController extends Controller {
 
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 */
-	public function getPdf() {
-		$data = file_get_contents(__DIR__ . '/../../data/Reasons to use Nextcloud.pdf');
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     */
+    public function getPdf() {
+        $data = file_get_contents(__DIR__ . '/../../data/Reasons to use Nextcloud.pdf');
 
-		$resp = new DataDisplayResponse($data);
-		$resp->addHeader('Content-Type', 'application/pdf');
+        $resp = new DataDisplayResponse($data);
+        $resp->addHeader('Content-Type', 'application/pdf');
 
-		return $resp;
-	}
+        return $resp;
+    }
 }

apps/settings/templates/settings/personal/development.notice.php

Indentation +51 added lines, -51 removed lines

@@ -4,66 +4,66 @@
 	</p>
 	<p>
 		<?php print_unescaped(str_replace(
-			[
-				'{communityopen}',
-				'{githubopen}',
-				'{licenseopen}',
-				'{linkclose}',
-			],
-			[
-				'<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer noopener">',
-				'<a href="https://github.com/nextcloud" target="_blank" rel="noreferrer noopener">',
-				'<a href="https://www.gnu.org/licenses/agpl-3.0.html" target="_blank" rel="noreferrer noopener">',
-				'</a>',
-			],
-			$l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.')
-		)); ?>
+            [
+                '{communityopen}',
+                '{githubopen}',
+                '{licenseopen}',
+                '{linkclose}',
+            ],
+            [
+                '<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer noopener">',
+                '<a href="https://github.com/nextcloud" target="_blank" rel="noreferrer noopener">',
+                '<a href="https://www.gnu.org/licenses/agpl-3.0.html" target="_blank" rel="noreferrer noopener">',
+                '</a>',
+            ],
+            $l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.')
+        )); ?>
 	</p>
 
 	<p class="social-button">
 		<?php print_unescaped(str_replace(
-			[
-				'{facebookimage}',
-				'{twitterimage}',
-				'{mastodonimage}',
-				'{rssimage}',
-				'{mailimage}',
-				'{facebookopen}',
-				'{twitteropen}',
-				'{mastodonopen}',
-				'{rssopen}',
-				'{newsletteropen}',
-				'{linkclose}',
-				'{facebooktext}',
-				'{twittertext}',
-				'{mastodontext}',
-				'{rsstext}',
-				'{mailtext}',
-			],
-			[
-				image_path('core', 'facebook.svg'),
-				image_path('core', 'twitter.svg'),
-				image_path('core', 'mastodon.svg'),
-				image_path('core', 'rss.svg'),
-				image_path('core', 'mail.svg'),
-				'<a target="_blank" rel="noreferrer noopener" href="https://www.facebook.com/Nextclouders/">',
-				'<a target="_blank" rel="noreferrer noopener" href="https://twitter.com/nextclouders">',
-				'<a target="_blank" rel="noreferrer noopener" href="https://mastodon.xyz/@nextcloud">',
-				'<a target="_blank" rel="noreferrer noopener" href="https://nextcloud.com/news/">',
-				'<a target="_blank" rel="noreferrer noopener" href="https://newsletter.nextcloud.com/?p=subscribe&amp;id=1">',
-				'</a>',
-				$l->t('Like our Facebook page'),
-				$l->t('Follow us on Twitter'),
-				$l->t('Follow us on Mastodon'),
-				$l->t('Check out our blog'),
-				$l->t('Subscribe to our newsletter'),
+            [
+                '{facebookimage}',
+                '{twitterimage}',
+                '{mastodonimage}',
+                '{rssimage}',
+                '{mailimage}',
+                '{facebookopen}',
+                '{twitteropen}',
+                '{mastodonopen}',
+                '{rssopen}',
+                '{newsletteropen}',
+                '{linkclose}',
+                '{facebooktext}',
+                '{twittertext}',
+                '{mastodontext}',
+                '{rsstext}',
+                '{mailtext}',
+            ],
+            [
+                image_path('core', 'facebook.svg'),
+                image_path('core', 'twitter.svg'),
+                image_path('core', 'mastodon.svg'),
+                image_path('core', 'rss.svg'),
+                image_path('core', 'mail.svg'),
+                '<a target="_blank" rel="noreferrer noopener" href="https://www.facebook.com/Nextclouders/">',
+                '<a target="_blank" rel="noreferrer noopener" href="https://twitter.com/nextclouders">',
+                '<a target="_blank" rel="noreferrer noopener" href="https://mastodon.xyz/@nextcloud">',
+                '<a target="_blank" rel="noreferrer noopener" href="https://nextcloud.com/news/">',
+                '<a target="_blank" rel="noreferrer noopener" href="https://newsletter.nextcloud.com/?p=subscribe&amp;id=1">',
+                '</a>',
+                $l->t('Like our Facebook page'),
+                $l->t('Follow us on Twitter'),
+                $l->t('Follow us on Mastodon'),
+                $l->t('Check out our blog'),
+                $l->t('Subscribe to our newsletter'),
 
-			],
+            ],
 '{facebookopen}<img width="50" src="{facebookimage}" title="{facebooktext}" alt="{facebooktext}">{linkclose}
 {twitteropen}<img width="50" src="{twitterimage}" title="{twittertext}" alt="{twittertext}">{linkclose}
 {mastodonopen}<img width="50" src="{mastodonimage}" title="{mastodontext}" alt="{mastodontext}">{linkclose}
 {rssopen}<img class="img-circle" width="50" src="{rssimage}" title="{rsstext}" alt="{rsstext}">{linkclose}
 {newsletteropen}<img width="50" src="{mailimage}" title="{mailtext}" alt="{mailtext}">{linkclose}'
-		)); ?>
+        )); ?>
 	</p>
 </div>

apps/user_status/lib/Migration/Version0002Date20200902144824.php

Indentation +18 added lines, -18 removed lines

@@ -36,22 +36,22 @@
  */
 class Version0002Date20200902144824 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 20.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$statusTable = $schema->getTable('user_status');
-
-		$statusTable->addIndex(['status_timestamp'], 'user_status_tstmp_ix');
-		$statusTable->addIndex(['is_user_defined', 'status'], 'user_status_iud_ix');
-
-		return $schema;
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 20.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $statusTable = $schema->getTable('user_status');
+
+        $statusTable->addIndex(['status_timestamp'], 'user_status_tstmp_ix');
+        $statusTable->addIndex(['is_user_defined', 'status'], 'user_status_iud_ix');
+
+        return $schema;
+    }
 }

apps/files/lib/Activity/Settings/FileChanged.php

Indentation +35 added lines, -35 removed lines

@@ -25,45 +25,45 @@
 namespace OCA\Files\Activity\Settings;
 
 class FileChanged extends FileActivitySettings {
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'file_changed';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'file_changed';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A file or folder has been <strong>changed</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A file or folder has been <strong>changed</strong>');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 2;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 2;
+    }
 
-	public function canChangeMail() {
-		return true;
-	}
+    public function canChangeMail() {
+        return true;
+    }
 
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 
-	public function canChangeNotification() {
-		return true;
-	}
+    public function canChangeNotification() {
+        return true;
+    }
 
-	public function isDefaultEnabledNotification() {
-		return false;
-	}
+    public function isDefaultEnabledNotification() {
+        return false;
+    }
 }

lib/public/Files/Storage/IWriteStreamStorage.php

Indentation +11 added lines, -11 removed lines

@@ -34,15 +34,15 @@
  * @since 15.0.0
  */
 interface IWriteStreamStorage extends IStorage {
-	/**
-	 * Write the data from a stream to a file
-	 *
-	 * @param string $path
-	 * @param resource $stream
-	 * @param int|null $size the size of the stream if known in advance
-	 * @return int the number of bytes written
-	 * @throws GenericFileException
-	 * @since 15.0.0
-	 */
-	public function writeStream(string $path, $stream, int $size = null): int;
+    /**
+     * Write the data from a stream to a file
+     *
+     * @param string $path
+     * @param resource $stream
+     * @param int|null $size the size of the stream if known in advance
+     * @return int the number of bytes written
+     * @throws GenericFileException
+     * @since 15.0.0
+     */
+    public function writeStream(string $path, $stream, int $size = null): int;
 }

lib/public/Activity/IManager.php

Indentation +139 added lines, -139 removed lines

@@ -35,143 +35,143 @@
  * @since 6.0.0
  */
 interface IManager {
-	/**
-	 * Generates a new IEvent object
-	 *
-	 * Make sure to call at least the following methods before sending it to the
-	 * app with via the publish() method:
-	 *  - setApp()
-	 *  - setType()
-	 *  - setAffectedUser()
-	 *  - setSubject()
-	 *  - setObject()
-	 *
-	 * @return IEvent
-	 * @since 8.2.0
-	 */
-	public function generateEvent(): IEvent;
-
-	/**
-	 * Publish an event to the activity consumers
-	 *
-	 * Make sure to call at least the following methods before sending an Event:
-	 *  - setApp()
-	 *  - setType()
-	 *  - setAffectedUser()
-	 *  - setSubject()
-	 *  - setObject()
-	 *
-	 * @param IEvent $event
-	 * @throws \BadMethodCallException if required values have not been set
-	 * @since 8.2.0
-	 */
-	public function publish(IEvent $event): void;
-
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * activity consumers are actually requested
-	 *
-	 * $callable has to return an instance of \OCP\Activity\IConsumer
-	 *
-	 * @param \Closure $callable
-	 * @since 6.0.0
-	 */
-	public function registerConsumer(\Closure $callable): void;
-
-	/**
-	 * @param string $filter Class must implement OCA\Activity\IFilter
-	 * @since 11.0.0
-	 */
-	public function registerFilter(string $filter): void;
-
-	/**
-	 * @return IFilter[]
-	 * @since 11.0.0
-	 */
-	public function getFilters(): array;
-
-	/**
-	 * @param string $id
-	 * @return IFilter
-	 * @throws \InvalidArgumentException when the filter was not found
-	 * @since 11.0.0
-	 */
-	public function getFilterById(string $id): IFilter;
-
-	/**
-	 * @param string $setting Class must implement OCA\Activity\ISetting
-	 * @since 11.0.0
-	 */
-	public function registerSetting(string $setting): void;
-
-	/**
-	 * @return ActivitySettings[]
-	 * @since 11.0.0
-	 */
-	public function getSettings(): array;
-
-	/**
-	 * @param string $provider Class must implement OCA\Activity\IProvider
-	 * @since 11.0.0
-	 */
-	public function registerProvider(string $provider): void;
-
-	/**
-	 * @return IProvider[]
-	 * @since 11.0.0
-	 */
-	public function getProviders(): array;
-
-	/**
-	 * @param string $id
-	 * @return ActivitySettings
-	 * @throws \InvalidArgumentException when the setting was not found
-	 * @since 11.0.0
-	 */
-	public function getSettingById(string $id): ActivitySettings;
-
-	/**
-	 * @param string $type
-	 * @param int $id
-	 * @since 8.2.0
-	 */
-	public function setFormattingObject(string $type, int $id): void;
-
-	/**
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function isFormattingFilteredObject(): bool;
-
-	/**
-	 * @param bool $status Set to true, when parsing events should not use SVG icons
-	 * @since 12.0.1
-	 */
-	public function setRequirePNG(bool $status): void;
-
-	/**
-	 * @return bool
-	 * @since 12.0.1
-	 */
-	public function getRequirePNG(): bool;
-
-	/**
-	 * Set the user we need to use
-	 *
-	 * @param string|null $currentUserId
-	 * @throws \UnexpectedValueException If the user is invalid
-	 * @since 9.0.1
-	 */
-	public function setCurrentUserId(string $currentUserId = null): void;
-
-	/**
-	 * Get the user we need to use
-	 *
-	 * Either the user is logged in, or we try to get it from the token
-	 *
-	 * @return string
-	 * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique
-	 * @since 8.1.0
-	 */
-	public function getCurrentUserId(): string;
+    /**
+     * Generates a new IEvent object
+     *
+     * Make sure to call at least the following methods before sending it to the
+     * app with via the publish() method:
+     *  - setApp()
+     *  - setType()
+     *  - setAffectedUser()
+     *  - setSubject()
+     *  - setObject()
+     *
+     * @return IEvent
+     * @since 8.2.0
+     */
+    public function generateEvent(): IEvent;
+
+    /**
+     * Publish an event to the activity consumers
+     *
+     * Make sure to call at least the following methods before sending an Event:
+     *  - setApp()
+     *  - setType()
+     *  - setAffectedUser()
+     *  - setSubject()
+     *  - setObject()
+     *
+     * @param IEvent $event
+     * @throws \BadMethodCallException if required values have not been set
+     * @since 8.2.0
+     */
+    public function publish(IEvent $event): void;
+
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * activity consumers are actually requested
+     *
+     * $callable has to return an instance of \OCP\Activity\IConsumer
+     *
+     * @param \Closure $callable
+     * @since 6.0.0
+     */
+    public function registerConsumer(\Closure $callable): void;
+
+    /**
+     * @param string $filter Class must implement OCA\Activity\IFilter
+     * @since 11.0.0
+     */
+    public function registerFilter(string $filter): void;
+
+    /**
+     * @return IFilter[]
+     * @since 11.0.0
+     */
+    public function getFilters(): array;
+
+    /**
+     * @param string $id
+     * @return IFilter
+     * @throws \InvalidArgumentException when the filter was not found
+     * @since 11.0.0
+     */
+    public function getFilterById(string $id): IFilter;
+
+    /**
+     * @param string $setting Class must implement OCA\Activity\ISetting
+     * @since 11.0.0
+     */
+    public function registerSetting(string $setting): void;
+
+    /**
+     * @return ActivitySettings[]
+     * @since 11.0.0
+     */
+    public function getSettings(): array;
+
+    /**
+     * @param string $provider Class must implement OCA\Activity\IProvider
+     * @since 11.0.0
+     */
+    public function registerProvider(string $provider): void;
+
+    /**
+     * @return IProvider[]
+     * @since 11.0.0
+     */
+    public function getProviders(): array;
+
+    /**
+     * @param string $id
+     * @return ActivitySettings
+     * @throws \InvalidArgumentException when the setting was not found
+     * @since 11.0.0
+     */
+    public function getSettingById(string $id): ActivitySettings;
+
+    /**
+     * @param string $type
+     * @param int $id
+     * @since 8.2.0
+     */
+    public function setFormattingObject(string $type, int $id): void;
+
+    /**
+     * @return bool
+     * @since 8.2.0
+     */
+    public function isFormattingFilteredObject(): bool;
+
+    /**
+     * @param bool $status Set to true, when parsing events should not use SVG icons
+     * @since 12.0.1
+     */
+    public function setRequirePNG(bool $status): void;
+
+    /**
+     * @return bool
+     * @since 12.0.1
+     */
+    public function getRequirePNG(): bool;
+
+    /**
+     * Set the user we need to use
+     *
+     * @param string|null $currentUserId
+     * @throws \UnexpectedValueException If the user is invalid
+     * @since 9.0.1
+     */
+    public function setCurrentUserId(string $currentUserId = null): void;
+
+    /**
+     * Get the user we need to use
+     *
+     * Either the user is logged in, or we try to get it from the token
+     *
+     * @return string
+     * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique
+     * @since 8.1.0
+     */
+    public function getCurrentUserId(): string;
 }

lib/private/Repair/RepairInvalidShares.php

Indentation +85 added lines, -85 removed lines

@@ -33,89 +33,89 @@
  * Repairs shares with invalid data
  */
 class RepairInvalidShares implements IRepairStep {
-	public const CHUNK_SIZE = 200;
-
-	/** @var \OCP\IConfig */
-	protected $config;
-
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \OCP\IDBConnection $connection
-	 */
-	public function __construct($config, $connection) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
-
-	public function getName() {
-		return 'Repair invalid shares';
-	}
-
-	/**
-	 * Adjust file share permissions
-	 */
-	private function adjustFileSharePermissions(IOutput $out) {
-		$mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
-		$builder = $this->connection->getQueryBuilder();
-
-		$permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
-		$builder
-			->update('share')
-			->set('permissions', $permsFunc)
-			->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
-			->andWhere($builder->expr()->neq('permissions', $permsFunc));
-
-		$updatedEntries = $builder->execute();
-		if ($updatedEntries > 0) {
-			$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
-		}
-	}
-
-	/**
-	 * Remove shares where the parent share does not exist anymore
-	 */
-	private function removeSharesNonExistingParent(IOutput $out) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.parent')
-			->from('share', 's1')
-			->where($query->expr()->isNotNull('s1.parent'))
-				->andWhere($query->expr()->isNull('s2.id'))
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
-			->groupBy('s1.parent')
-			->setMaxResults(self::CHUNK_SIZE);
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('share')
-			->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
-
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$deletedInLastChunk = 0;
-			$result = $query->execute();
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
-					->execute();
-			}
-			$result->closeCursor();
-		}
-
-		if ($deletedEntries) {
-			$out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
-		}
-	}
-
-	public function run(IOutput $out) {
-		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
-			$this->adjustFileSharePermissions($out);
-		}
-
-		$this->removeSharesNonExistingParent($out);
-	}
+    public const CHUNK_SIZE = 200;
+
+    /** @var \OCP\IConfig */
+    protected $config;
+
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param \OCP\IDBConnection $connection
+     */
+    public function __construct($config, $connection) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
+
+    public function getName() {
+        return 'Repair invalid shares';
+    }
+
+    /**
+     * Adjust file share permissions
+     */
+    private function adjustFileSharePermissions(IOutput $out) {
+        $mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
+        $builder = $this->connection->getQueryBuilder();
+
+        $permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
+        $builder
+            ->update('share')
+            ->set('permissions', $permsFunc)
+            ->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
+            ->andWhere($builder->expr()->neq('permissions', $permsFunc));
+
+        $updatedEntries = $builder->execute();
+        if ($updatedEntries > 0) {
+            $out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+        }
+    }
+
+    /**
+     * Remove shares where the parent share does not exist anymore
+     */
+    private function removeSharesNonExistingParent(IOutput $out) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.parent')
+            ->from('share', 's1')
+            ->where($query->expr()->isNotNull('s1.parent'))
+                ->andWhere($query->expr()->isNull('s2.id'))
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
+            ->groupBy('s1.parent')
+            ->setMaxResults(self::CHUNK_SIZE);
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('share')
+            ->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
+
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $deletedInLastChunk = 0;
+            $result = $query->execute();
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
+
+        if ($deletedEntries) {
+            $out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
+        }
+    }
+
+    public function run(IOutput $out) {
+        $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
+            $this->adjustFileSharePermissions($out);
+        }
+
+        $this->removeSharesNonExistingParent($out);
+    }
 }

lib/private/Files/Cache/NullWatcher.php

Indentation +19 added lines, -19 removed lines

@@ -24,30 +24,30 @@
 namespace OC\Files\Cache;
 
 class NullWatcher extends Watcher {
-	private $policy;
+    private $policy;
 
-	public function __construct() {
-	}
+    public function __construct() {
+    }
 
-	public function setPolicy($policy) {
-		$this->policy = $policy;
-	}
+    public function setPolicy($policy) {
+        $this->policy = $policy;
+    }
 
-	public function getPolicy() {
-		return $this->policy;
-	}
+    public function getPolicy() {
+        return $this->policy;
+    }
 
-	public function checkUpdate($path, $cachedEntry = null) {
-		return false;
-	}
+    public function checkUpdate($path, $cachedEntry = null) {
+        return false;
+    }
 
-	public function update($path, $cachedData) {
-	}
+    public function update($path, $cachedData) {
+    }
 
-	public function needsUpdate($path, $cachedData) {
-		return false;
-	}
+    public function needsUpdate($path, $cachedData) {
+        return false;
+    }
 
-	public function cleanFolder($path) {
-	}
+    public function cleanFolder($path) {
+    }
 }