nextcloud / server

lib/private/Preview/IMagickSupport.php

Indentation +31 added lines, -31 removed lines

@@ -6,35 +6,35 @@
 use OCP\ICacheFactory;
 
 class IMagickSupport {
-	private ICache $cache;
-	private ?\Imagick $imagick;
-
-	public function __construct(ICacheFactory $cacheFactory) {
-		$this->cache = $cacheFactory->createLocal('imagick');
-
-		if (extension_loaded('imagick')) {
-			$this->imagick = new \Imagick();
-		} else {
-			$this->imagick = null;
-		}
-	}
-
-	public function hasExtension(): bool {
-		return !is_null($this->imagick);
-	}
-
-	public function supportsFormat(string $format): bool {
-		if (is_null($this->imagick)) {
-			return false;
-		}
-
-		$cached = $this->cache->get($format);
-		if (!is_null($cached)) {
-			return $cached;
-		}
-
-		$formatSupported = count($this->imagick->queryFormats($format)) === 1;
-		$this->cache->set($format, $cached);
-		return $formatSupported;
-	}
+    private ICache $cache;
+    private ?\Imagick $imagick;
+
+    public function __construct(ICacheFactory $cacheFactory) {
+        $this->cache = $cacheFactory->createLocal('imagick');
+
+        if (extension_loaded('imagick')) {
+            $this->imagick = new \Imagick();
+        } else {
+            $this->imagick = null;
+        }
+    }
+
+    public function hasExtension(): bool {
+        return !is_null($this->imagick);
+    }
+
+    public function supportsFormat(string $format): bool {
+        if (is_null($this->imagick)) {
+            return false;
+        }
+
+        $cached = $this->cache->get($format);
+        if (!is_null($cached)) {
+            return $cached;
+        }
+
+        $formatSupported = count($this->imagick->queryFormats($format)) === 1;
+        $this->cache->set($format, $cached);
+        return $formatSupported;
+    }
 }

lib/private/DB/BacktraceDebugStack.php

Indentation +6 added lines, -6 removed lines

@@ -26,10 +26,10 @@
 use Doctrine\DBAL\Logging\DebugStack;
 
 class BacktraceDebugStack extends DebugStack {
-	public function startQuery($sql, ?array $params = null, ?array $types = null) {
-		parent::startQuery($sql, $params, $types);
-		$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-		$this->queries[$this->currentQuery]['backtrace'] = $backtrace;
-		$this->queries[$this->currentQuery]['start'] = $this->start;
-	}
+    public function startQuery($sql, ?array $params = null, ?array $types = null) {
+        parent::startQuery($sql, $params, $types);
+        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+        $this->queries[$this->currentQuery]['backtrace'] = $backtrace;
+        $this->queries[$this->currentQuery]['start'] = $this->start;
+    }
 }

lib/private/Memcache/WithLocalCache.php

Indentation +42 added lines, -42 removed lines

@@ -9,46 +9,46 @@
  * Wrap a cache instance with an extra later of local, in-memory caching
  */
 class WithLocalCache implements ICache {
-	private ICache $inner;
-	private CappedMemoryCache $cached;
-
-	public function __construct(ICache $inner, int $localCapacity = 512) {
-		$this->inner = $inner;
-		$this->cached = new CappedMemoryCache($localCapacity);
-	}
-
-	public function get($key) {
-		if (isset($this->cached[$key])) {
-			return $this->cached[$key];
-		} else {
-			$value = $this->inner->get($key);
-			if (!is_null($value)) {
-				$this->cached[$key] = $value;
-			}
-			return $value;
-		}
-	}
-
-	public function set($key, $value, $ttl = 0) {
-		$this->cached[$key] = $value;
-		return $this->inner->set($key, $value, $ttl);
-	}
-
-	public function hasKey($key) {
-		return isset($this->cached[$key]) || $this->inner->hasKey($key);
-	}
-
-	public function remove($key) {
-		unset($this->cached[$key]);
-		return $this->inner->remove($key);
-	}
-
-	public function clear($prefix = '') {
-		$this->cached->clear();
-		return $this->inner->clear($prefix);
-	}
-
-	public static function isAvailable(): bool {
-		return false;
-	}
+    private ICache $inner;
+    private CappedMemoryCache $cached;
+
+    public function __construct(ICache $inner, int $localCapacity = 512) {
+        $this->inner = $inner;
+        $this->cached = new CappedMemoryCache($localCapacity);
+    }
+
+    public function get($key) {
+        if (isset($this->cached[$key])) {
+            return $this->cached[$key];
+        } else {
+            $value = $this->inner->get($key);
+            if (!is_null($value)) {
+                $this->cached[$key] = $value;
+            }
+            return $value;
+        }
+    }
+
+    public function set($key, $value, $ttl = 0) {
+        $this->cached[$key] = $value;
+        return $this->inner->set($key, $value, $ttl);
+    }
+
+    public function hasKey($key) {
+        return isset($this->cached[$key]) || $this->inner->hasKey($key);
+    }
+
+    public function remove($key) {
+        unset($this->cached[$key]);
+        return $this->inner->remove($key);
+    }
+
+    public function clear($prefix = '') {
+        $this->cached->clear();
+        return $this->inner->clear($prefix);
+    }
+
+    public static function isAvailable(): bool {
+        return false;
+    }
 }

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

Indentation +59 added lines, -59 removed lines

@@ -34,67 +34,67 @@
 use Sabre\HTTP\RequestInterface;
 
 class LockPlugin extends ServerPlugin {
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
 
-	/**
-	 * State of the lock
-	 *
-	 * @var bool
-	 */
-	private $isLocked;
+    /**
+     * State of the lock
+     *
+     * @var bool
+     */
+    private $isLocked;
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('beforeMethod:*', [$this, 'getLock'], 50);
-		$this->server->on('afterMethod:*', [$this, 'releaseLock'], 50);
-		$this->isLocked = false;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('beforeMethod:*', [$this, 'getLock'], 50);
+        $this->server->on('afterMethod:*', [$this, 'releaseLock'], 50);
+        $this->isLocked = false;
+    }
 
-	public function getLock(RequestInterface $request) {
-		// we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
-		// so instead we limit ourselves to the PUT method manually
-		if ($request->getMethod() !== 'PUT') {
-			return;
-		}
-		try {
-			$node = $this->server->tree->getNodeForPath($request->getPath());
-		} catch (NotFound $e) {
-			return;
-		}
-		if ($node instanceof Node) {
-			try {
-				$node->acquireLock(ILockingProvider::LOCK_SHARED);
-			} catch (LockedException $e) {
-				throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-			}
-			$this->isLocked = true;
-		}
-	}
+    public function getLock(RequestInterface $request) {
+        // we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
+        // so instead we limit ourselves to the PUT method manually
+        if ($request->getMethod() !== 'PUT') {
+            return;
+        }
+        try {
+            $node = $this->server->tree->getNodeForPath($request->getPath());
+        } catch (NotFound $e) {
+            return;
+        }
+        if ($node instanceof Node) {
+            try {
+                $node->acquireLock(ILockingProvider::LOCK_SHARED);
+            } catch (LockedException $e) {
+                throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+            }
+            $this->isLocked = true;
+        }
+    }
 
-	public function releaseLock(RequestInterface $request) {
-		// don't try to release the lock if we never locked one
-		if ($this->isLocked === false) {
-			return;
-		}
-		if ($request->getMethod() !== 'PUT') {
-			return;
-		}
-		try {
-			$node = $this->server->tree->getNodeForPath($request->getPath());
-		} catch (NotFound $e) {
-			return;
-		}
-		if ($node instanceof Node) {
-			$node->releaseLock(ILockingProvider::LOCK_SHARED);
-			$this->isLocked = false;
-		}
-	}
+    public function releaseLock(RequestInterface $request) {
+        // don't try to release the lock if we never locked one
+        if ($this->isLocked === false) {
+            return;
+        }
+        if ($request->getMethod() !== 'PUT') {
+            return;
+        }
+        try {
+            $node = $this->server->tree->getNodeForPath($request->getPath());
+        } catch (NotFound $e) {
+            return;
+        }
+        if ($node instanceof Node) {
+            $node->releaseLock(ILockingProvider::LOCK_SHARED);
+            $this->isLocked = false;
+        }
+    }
 }

lib/public/Group/Events/BeforeGroupChangedEvent.php

Indentation +54 added lines, -54 removed lines

@@ -32,63 +32,63 @@
  * @since 26.0.0
  */
 class BeforeGroupChangedEvent extends Event {
-	private IGroup $group;
-	private string $feature;
-	/** @var mixed */
-	private $value;
-	/** @var mixed */
-	private $oldValue;
+    private IGroup $group;
+    private string $feature;
+    /** @var mixed */
+    private $value;
+    /** @var mixed */
+    private $oldValue;
 
-	/**
-	 * @since 26.0.0
-	 */
-	public function __construct(IGroup $group,
-		string $feature,
-		$value,
-		$oldValue = null) {
-		parent::__construct();
-		$this->group = $group;
-		$this->feature = $feature;
-		$this->value = $value;
-		$this->oldValue = $oldValue;
-	}
+    /**
+     * @since 26.0.0
+     */
+    public function __construct(IGroup $group,
+        string $feature,
+        $value,
+        $oldValue = null) {
+        parent::__construct();
+        $this->group = $group;
+        $this->feature = $feature;
+        $this->value = $value;
+        $this->oldValue = $oldValue;
+    }
 
-	/**
-	 *
-	 * @since 26.0.0
-	 *
-	 * @return IGroup
-	 */
-	public function getGroup(): IGroup {
-		return $this->group;
-	}
+    /**
+     *
+     * @since 26.0.0
+     *
+     * @return IGroup
+     */
+    public function getGroup(): IGroup {
+        return $this->group;
+    }
 
-	/**
-	 *
-	 * @since 26.0.0
-	 *
-	 * @return string
-	 */
-	public function getFeature(): string {
-		return $this->feature;
-	}
+    /**
+     *
+     * @since 26.0.0
+     *
+     * @return string
+     */
+    public function getFeature(): string {
+        return $this->feature;
+    }
 
-	/**
-	 * @since 26.0.0
-	 *
-	 * @return mixed
-	 */
-	public function getValue() {
-		return $this->value;
-	}
+    /**
+     * @since 26.0.0
+     *
+     * @return mixed
+     */
+    public function getValue() {
+        return $this->value;
+    }
 
-	/**
-	 *
-	 * @since 26.0.0
-	 *
-	 * @return mixed
-	 */
-	public function getOldValue() {
-		return $this->oldValue;
-	}
+    /**
+     *
+     * @since 26.0.0
+     *
+     * @return mixed
+     */
+    public function getOldValue() {
+        return $this->oldValue;
+    }
 }

lib/public/App/Events/AppEnableEvent.php

Indentation +28 added lines, -28 removed lines

@@ -31,32 +31,32 @@
  * @since 27.0.0
  */
 class AppEnableEvent extends Event {
-	private string $appId;
-	/** @var string[] */
-	private array $groupIds;
-
-	/**
-	 * @param string[] $groupIds
-	 * @since 27.0.0
-	 */
-	public function __construct(string $appId, array $groupIds = []) {
-		parent::__construct();
-
-		$this->appId = $appId;
-		$this->groupIds = $groupIds;
-	}
-
-	/**
-	 * @since 27.0.0
-	 */
-	public function getAppId(): string {
-		return $this->appId;
-	}
-
-	/**
-	 * @since 27.0.0
-	 */
-	public function getGroupIds(): array {
-		return $this->groupIds;
-	}
+    private string $appId;
+    /** @var string[] */
+    private array $groupIds;
+
+    /**
+     * @param string[] $groupIds
+     * @since 27.0.0
+     */
+    public function __construct(string $appId, array $groupIds = []) {
+        parent::__construct();
+
+        $this->appId = $appId;
+        $this->groupIds = $groupIds;
+    }
+
+    /**
+     * @since 27.0.0
+     */
+    public function getAppId(): string {
+        return $this->appId;
+    }
+
+    /**
+     * @since 27.0.0
+     */
+    public function getGroupIds(): array {
+        return $this->groupIds;
+    }
 }

lib/public/App/Events/AppDisableEvent.php

Indentation +14 added lines, -14 removed lines

@@ -31,21 +31,21 @@
  * @since 27.0.0
  */
 class AppDisableEvent extends Event {
-	private string $appId;
+    private string $appId;
 
-	/**
-	 * @since 27.0.0
-	 */
-	public function __construct(string $appId) {
-		parent::__construct();
+    /**
+     * @since 27.0.0
+     */
+    public function __construct(string $appId) {
+        parent::__construct();
 
-		$this->appId = $appId;
-	}
+        $this->appId = $appId;
+    }
 
-	/**
-	 * @since 27.0.0
-	 */
-	public function getAppId(): string {
-		return $this->appId;
-	}
+    /**
+     * @since 27.0.0
+     */
+    public function getAppId(): string {
+        return $this->appId;
+    }
 }

lib/private/Files/Search/QueryOptimizer/QueryOptimizerStep.php

Indentation +26 added lines, -26 removed lines

@@ -27,31 +27,31 @@
 use OCP\Files\Search\ISearchOperator;
 
 class QueryOptimizerStep {
-	/**
-	 * Allow optimizer steps to inspect the entire query before starting processing
-	 *
-	 * @param ISearchOperator $operator
-	 * @return void
-	 */
-	public function inspectOperator(ISearchOperator $operator): void {
-		if ($operator instanceof ISearchBinaryOperator) {
-			foreach ($operator->getArguments() as $argument) {
-				$this->inspectOperator($argument);
-			}
-		}
-	}
+    /**
+     * Allow optimizer steps to inspect the entire query before starting processing
+     *
+     * @param ISearchOperator $operator
+     * @return void
+     */
+    public function inspectOperator(ISearchOperator $operator): void {
+        if ($operator instanceof ISearchBinaryOperator) {
+            foreach ($operator->getArguments() as $argument) {
+                $this->inspectOperator($argument);
+            }
+        }
+    }
 
-	/**
-	 * Allow optimizer steps to modify query operators
-	 *
-	 * @param ISearchOperator $operator
-	 * @return void
-	 */
-	public function processOperator(ISearchOperator &$operator) {
-		if ($operator instanceof ISearchBinaryOperator) {
-			foreach ($operator->getArguments() as $argument) {
-				$this->processOperator($argument);
-			}
-		}
-	}
+    /**
+     * Allow optimizer steps to modify query operators
+     *
+     * @param ISearchOperator $operator
+     * @return void
+     */
+    public function processOperator(ISearchOperator &$operator) {
+        if ($operator instanceof ISearchBinaryOperator) {
+            foreach ($operator->getArguments() as $argument) {
+                $this->processOperator($argument);
+            }
+        }
+    }
 }

lib/private/Files/SimpleFS/NewSimpleFile.php

Indentation +192 added lines, -192 removed lines

@@ -34,196 +34,196 @@
 use OCP\Files\SimpleFS\ISimpleFile;
 
 class NewSimpleFile implements ISimpleFile {
-	private Folder $parentFolder;
-	private string $name;
-	private ?File $file = null;
-
-	/**
-	 * File constructor.
-	 */
-	public function __construct(Folder $parentFolder, string $name) {
-		$this->parentFolder = $parentFolder;
-		$this->name = $name;
-	}
-
-	/**
-	 * Get the name
-	 */
-	public function getName(): string {
-		return $this->name;
-	}
-
-	/**
-	 * Get the size in bytes
-	 */
-	public function getSize(): int|float {
-		if ($this->file) {
-			return $this->file->getSize();
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * Get the ETag
-	 */
-	public function getETag(): string {
-		if ($this->file) {
-			return $this->file->getEtag();
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Get the last modification time
-	 */
-	public function getMTime(): int {
-		if ($this->file) {
-			return $this->file->getMTime();
-		} else {
-			return time();
-		}
-	}
-
-	/**
-	 * Get the content
-	 *
-	 * @throws NotFoundException
-	 * @throws NotPermittedException
-	 */
-	public function getContent(): string {
-		if ($this->file) {
-			$result = $this->file->getContent();
-
-			if ($result === false) {
-				$this->checkFile();
-			}
-
-			return $result;
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Overwrite the file
-	 *
-	 * @param string|resource $data
-	 * @throws NotPermittedException
-	 * @throws NotFoundException
-	 */
-	public function putContent($data): void {
-		try {
-			if ($this->file) {
-				$this->file->putContent($data);
-			} else {
-				$this->file = $this->parentFolder->newFile($this->name, $data);
-			}
-		} catch (NotFoundException $e) {
-			$this->checkFile();
-		}
-	}
-
-	/**
-	 * Sometimes there are some issues with the AppData. Most of them are from
-	 * user error. But we should handle them gracefully anyway.
-	 *
-	 * If for some reason the current file can't be found. We remove it.
-	 * Then traverse up and check all folders if they exists. This so that the
-	 * next request will have a valid appdata structure again.
-	 *
-	 * @throws NotFoundException
-	 */
-	private function checkFile(): void {
-		if (!$this->file) {
-			throw new NotFoundException('File not set');
-		}
-
-		$cur = $this->file;
-
-		while ($cur->stat() === false) {
-			$parent = $cur->getParent();
-			try {
-				$cur->delete();
-			} catch (NotFoundException $e) {
-				// Just continue then
-			}
-			$cur = $parent;
-		}
-
-		if ($cur !== $this->file) {
-			throw new NotFoundException('File does not exist');
-		}
-	}
-
-
-	/**
-	 * Delete the file
-	 *
-	 * @throws NotPermittedException
-	 */
-	public function delete(): void {
-		if ($this->file) {
-			$this->file->delete();
-		}
-	}
-
-	/**
-	 * Get the MimeType
-	 *
-	 * @return string
-	 */
-	public function getMimeType(): string {
-		if ($this->file) {
-			return $this->file->getMimeType();
-		} else {
-			return 'text/plain';
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getExtension(): string {
-		if ($this->file) {
-			return $this->file->getExtension();
-		} else {
-			return \pathinfo($this->name, PATHINFO_EXTENSION);
-		}
-	}
-
-	/**
-	 * Open the file as stream for reading, resulting resource can be operated as stream like the result from php's own fopen
-	 *
-	 * @return resource|false
-	 * @throws \OCP\Files\NotPermittedException
-	 * @since 14.0.0
-	 */
-	public function read() {
-		if ($this->file) {
-			return $this->file->fopen('r');
-		} else {
-			return fopen('php://temp', 'r');
-		}
-	}
-
-	/**
-	 * Open the file as stream for writing, resulting resource can be operated as stream like the result from php's own fopen
-	 *
-	 * @return resource|bool
-	 * @throws \OCP\Files\NotPermittedException
-	 * @since 14.0.0
-	 */
-	public function write() {
-		if ($this->file) {
-			return $this->file->fopen('w');
-		} else {
-			$source = fopen('php://temp', 'w+');
-			return CallbackWrapper::wrap($source, null, null, null, null, function () use ($source) {
-				rewind($source);
-				$this->putContent($source);
-			});
-		}
-	}
+    private Folder $parentFolder;
+    private string $name;
+    private ?File $file = null;
+
+    /**
+     * File constructor.
+     */
+    public function __construct(Folder $parentFolder, string $name) {
+        $this->parentFolder = $parentFolder;
+        $this->name = $name;
+    }
+
+    /**
+     * Get the name
+     */
+    public function getName(): string {
+        return $this->name;
+    }
+
+    /**
+     * Get the size in bytes
+     */
+    public function getSize(): int|float {
+        if ($this->file) {
+            return $this->file->getSize();
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Get the ETag
+     */
+    public function getETag(): string {
+        if ($this->file) {
+            return $this->file->getEtag();
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Get the last modification time
+     */
+    public function getMTime(): int {
+        if ($this->file) {
+            return $this->file->getMTime();
+        } else {
+            return time();
+        }
+    }
+
+    /**
+     * Get the content
+     *
+     * @throws NotFoundException
+     * @throws NotPermittedException
+     */
+    public function getContent(): string {
+        if ($this->file) {
+            $result = $this->file->getContent();
+
+            if ($result === false) {
+                $this->checkFile();
+            }
+
+            return $result;
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Overwrite the file
+     *
+     * @param string|resource $data
+     * @throws NotPermittedException
+     * @throws NotFoundException
+     */
+    public function putContent($data): void {
+        try {
+            if ($this->file) {
+                $this->file->putContent($data);
+            } else {
+                $this->file = $this->parentFolder->newFile($this->name, $data);
+            }
+        } catch (NotFoundException $e) {
+            $this->checkFile();
+        }
+    }
+
+    /**
+     * Sometimes there are some issues with the AppData. Most of them are from
+     * user error. But we should handle them gracefully anyway.
+     *
+     * If for some reason the current file can't be found. We remove it.
+     * Then traverse up and check all folders if they exists. This so that the
+     * next request will have a valid appdata structure again.
+     *
+     * @throws NotFoundException
+     */
+    private function checkFile(): void {
+        if (!$this->file) {
+            throw new NotFoundException('File not set');
+        }
+
+        $cur = $this->file;
+
+        while ($cur->stat() === false) {
+            $parent = $cur->getParent();
+            try {
+                $cur->delete();
+            } catch (NotFoundException $e) {
+                // Just continue then
+            }
+            $cur = $parent;
+        }
+
+        if ($cur !== $this->file) {
+            throw new NotFoundException('File does not exist');
+        }
+    }
+
+
+    /**
+     * Delete the file
+     *
+     * @throws NotPermittedException
+     */
+    public function delete(): void {
+        if ($this->file) {
+            $this->file->delete();
+        }
+    }
+
+    /**
+     * Get the MimeType
+     *
+     * @return string
+     */
+    public function getMimeType(): string {
+        if ($this->file) {
+            return $this->file->getMimeType();
+        } else {
+            return 'text/plain';
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getExtension(): string {
+        if ($this->file) {
+            return $this->file->getExtension();
+        } else {
+            return \pathinfo($this->name, PATHINFO_EXTENSION);
+        }
+    }
+
+    /**
+     * Open the file as stream for reading, resulting resource can be operated as stream like the result from php's own fopen
+     *
+     * @return resource|false
+     * @throws \OCP\Files\NotPermittedException
+     * @since 14.0.0
+     */
+    public function read() {
+        if ($this->file) {
+            return $this->file->fopen('r');
+        } else {
+            return fopen('php://temp', 'r');
+        }
+    }
+
+    /**
+     * Open the file as stream for writing, resulting resource can be operated as stream like the result from php's own fopen
+     *
+     * @return resource|bool
+     * @throws \OCP\Files\NotPermittedException
+     * @since 14.0.0
+     */
+    public function write() {
+        if ($this->file) {
+            return $this->file->fopen('w');
+        } else {
+            $source = fopen('php://temp', 'w+');
+            return CallbackWrapper::wrap($source, null, null, null, null, function () use ($source) {
+                rewind($source);
+                $this->putContent($source);
+            });
+        }
+    }
 }