nextcloud / server

lib/public/Mail/IMessage.php

Indentation +54 added lines, -54 removed lines

@@ -32,64 +32,64 @@
  */
 interface IMessage {
 
-	/**
-	 * @param IAttachment $attachment
-	 * @return IMessage
-	 * @since 13.0.0
-	 */
-	public function attach(IAttachment $attachment): IMessage;
+    /**
+     * @param IAttachment $attachment
+     * @return IMessage
+     * @since 13.0.0
+     */
+    public function attach(IAttachment $attachment): IMessage;
 
-	/**
-	 * Set the from address of this message.
-	 *
-	 * If no "From" address is used \OC\Mail\Mailer will use mail_from_address and mail_domain from config.php
-	 *
-	 * @param array $addresses Example: array('sender@domain.org', 'other@domain.org' => 'A name')
-	 * @return IMessage
-	 * @since 13.0.0
-	 */
-	public function setFrom(array $addresses): IMessage;
+    /**
+     * Set the from address of this message.
+     *
+     * If no "From" address is used \OC\Mail\Mailer will use mail_from_address and mail_domain from config.php
+     *
+     * @param array $addresses Example: array('sender@domain.org', 'other@domain.org' => 'A name')
+     * @return IMessage
+     * @since 13.0.0
+     */
+    public function setFrom(array $addresses): IMessage;
 
-	/**
-	 * Set the Reply-To address of this message
-	 *
-	 * @param array $addresses
-	 * @return IMessage
-	 * @since 13.0.0
-	 */
-	public function setReplyTo(array $addresses): IMessage;
+    /**
+     * Set the Reply-To address of this message
+     *
+     * @param array $addresses
+     * @return IMessage
+     * @since 13.0.0
+     */
+    public function setReplyTo(array $addresses): IMessage;
 
-	/**
-	 * Set the to addresses of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return IMessage
-	 * @since 13.0.0
-	 */
-	public function setTo(array $recipients): IMessage;
+    /**
+     * Set the to addresses of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return IMessage
+     * @since 13.0.0
+     */
+    public function setTo(array $recipients): IMessage;
 
-	/**
-	 * Set the CC recipients of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return IMessage
-	 * @since 13.0.0
-	 */
-	public function setCc(array $recipients): IMessage;
+    /**
+     * Set the CC recipients of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return IMessage
+     * @since 13.0.0
+     */
+    public function setCc(array $recipients): IMessage;
 
-	/**
-	 * Set the BCC recipients of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return IMessage
-	 * @since 13.0.0
-	 */
-	public function setBcc(array $recipients): IMessage;
+    /**
+     * Set the BCC recipients of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return IMessage
+     * @since 13.0.0
+     */
+    public function setBcc(array $recipients): IMessage;
 
-	/**
-	 * @param IEMailTemplate $emailTemplate
-	 * @return IMessage
-	 * @since 13.0.0
-	 */
-	public function useTemplate(IEMailTemplate $emailTemplate): IMessage;
+    /**
+     * @param IEMailTemplate $emailTemplate
+     * @return IMessage
+     * @since 13.0.0
+     */
+    public function useTemplate(IEMailTemplate $emailTemplate): IMessage;
 }

lib/public/Mail/IEMailTemplate.php

Indentation +103 added lines, -103 removed lines

@@ -56,117 +56,117 @@
  */
 interface IEMailTemplate {
 
-	/**
-	 * Sets the subject of the email
-	 *
-	 * @param string $subject
-	 *
-	 * @since 13.0.0
-	 */
-	public function setSubject(string $subject);
+    /**
+     * Sets the subject of the email
+     *
+     * @param string $subject
+     *
+     * @since 13.0.0
+     */
+    public function setSubject(string $subject);
 
-	/**
-	 * Adds a header to the email
-	 *
-	 * @since 12.0.0
-	 */
-	public function addHeader();
+    /**
+     * Adds a header to the email
+     *
+     * @since 12.0.0
+     */
+    public function addHeader();
 
-	/**
-	 * Adds a heading to the email
-	 *
-	 * @param string $title
-	 * @param string|bool $plainTitle Title that is used in the plain text email
-	 *   if empty the $title is used, if false none will be used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addHeading(string $title, $plainTitle = '');
+    /**
+     * Adds a heading to the email
+     *
+     * @param string $title
+     * @param string|bool $plainTitle Title that is used in the plain text email
+     *   if empty the $title is used, if false none will be used
+     *
+     * @since 12.0.0
+     */
+    public function addHeading(string $title, $plainTitle = '');
 
-	/**
-	 * Adds a paragraph to the body of the email
-	 *
-	 * @param string $text; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string|bool $plainText Text that is used in the plain text email
-	 *   if empty the $text is used, if false none will be used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addBodyText(string $text, $plainText = '');
+    /**
+     * Adds a paragraph to the body of the email
+     *
+     * @param string $text; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
+     * @param string|bool $plainText Text that is used in the plain text email
+     *   if empty the $text is used, if false none will be used
+     *
+     * @since 12.0.0
+     */
+    public function addBodyText(string $text, $plainText = '');
 
-	/**
-	 * Adds a list item to the body of the email
-	 *
-	 * @param string $text; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $metaInfo; Note: When $plainMetaInfo falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $icon Absolute path, must be 16*16 pixels
-	 * @param string|bool $plainText Text that is used in the plain text email
-	 *   if empty the $text is used, if false none will be used
-	 * @param string|bool $plainMetaInfo Meta info that is used in the plain text email
-	 *   if empty the $metaInfo is used, if false none will be used
-	 * @since 12.0.0
-	 */
-	public function addBodyListItem(string $text, string $metaInfo = '', string $icon = '', $plainText = '', $plainMetaInfo = '');
+    /**
+     * Adds a list item to the body of the email
+     *
+     * @param string $text; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $metaInfo; Note: When $plainMetaInfo falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $icon Absolute path, must be 16*16 pixels
+     * @param string|bool $plainText Text that is used in the plain text email
+     *   if empty the $text is used, if false none will be used
+     * @param string|bool $plainMetaInfo Meta info that is used in the plain text email
+     *   if empty the $metaInfo is used, if false none will be used
+     * @since 12.0.0
+     */
+    public function addBodyListItem(string $text, string $metaInfo = '', string $icon = '', $plainText = '', $plainMetaInfo = '');
 
-	/**
-	 * Adds a button group of two buttons to the body of the email
-	 *
-	 * @param string $textLeft Text of left button; Note: When $plainTextLeft falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $urlLeft URL of left button
-	 * @param string $textRight Text of right button; Note: When $plainTextRight falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $urlRight URL of right button
-	 * @param string $plainTextLeft Text of left button that is used in the plain text version - if empty the $textLeft is used
-	 * @param string $plainTextRight Text of right button that is used in the plain text version - if empty the $textRight is used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addBodyButtonGroup(string $textLeft, string $urlLeft, string $textRight, string $urlRight, string $plainTextLeft = '', string $plainTextRight = '');
+    /**
+     * Adds a button group of two buttons to the body of the email
+     *
+     * @param string $textLeft Text of left button; Note: When $plainTextLeft falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $urlLeft URL of left button
+     * @param string $textRight Text of right button; Note: When $plainTextRight falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $urlRight URL of right button
+     * @param string $plainTextLeft Text of left button that is used in the plain text version - if empty the $textLeft is used
+     * @param string $plainTextRight Text of right button that is used in the plain text version - if empty the $textRight is used
+     *
+     * @since 12.0.0
+     */
+    public function addBodyButtonGroup(string $textLeft, string $urlLeft, string $textRight, string $urlRight, string $plainTextLeft = '', string $plainTextRight = '');
 
-	/**
-	 * Adds a button to the body of the email
-	 *
-	 * @param string $text Text of button; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $url URL of button
-	 * @param string $plainText Text of button in plain text version
-	 * 		if empty the $text is used, if false none will be used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addBodyButton(string $text, string $url, $plainText = '');
+    /**
+     * Adds a button to the body of the email
+     *
+     * @param string $text Text of button; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $url URL of button
+     * @param string $plainText Text of button in plain text version
+     * 		if empty the $text is used, if false none will be used
+     *
+     * @since 12.0.0
+     */
+    public function addBodyButton(string $text, string $url, $plainText = '');
 
-	/**
-	 * Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email
-	 *
-	 * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically sent email" will be used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addFooter(string $text = '');
+    /**
+     * Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email
+     *
+     * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically sent email" will be used
+     *
+     * @since 12.0.0
+     */
+    public function addFooter(string $text = '');
 
-	/**
-	 * Returns the rendered email subject as string
-	 *
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 */
-	public function renderSubject(): string;
+    /**
+     * Returns the rendered email subject as string
+     *
+     * @return string
+     *
+     * @since 13.0.0
+     */
+    public function renderSubject(): string;
 
-	/**
-	 * Returns the rendered HTML email as string
-	 *
-	 * @return string
-	 *
-	 * @since 12.0.0
-	 */
-	public function renderHtml(): string;
+    /**
+     * Returns the rendered HTML email as string
+     *
+     * @return string
+     *
+     * @since 12.0.0
+     */
+    public function renderHtml(): string;
 
-	/**
-	 * Returns the rendered plain text email as string
-	 *
-	 * @return string
-	 *
-	 * @since 12.0.0
-	 */
-	public function renderText(): string;
+    /**
+     * Returns the rendered plain text email as string
+     *
+     * @return string
+     *
+     * @since 12.0.0
+     */
+    public function renderText(): string;
 }

lib/private/Security/CSRF/CsrfTokenGenerator.php

Indentation +17 added lines, -17 removed lines

@@ -32,23 +32,23 @@
  * @package OC\Security\CSRF
  */
 class CsrfTokenGenerator {
-	/** @var ISecureRandom  */
-	private $random;
+    /** @var ISecureRandom  */
+    private $random;
 
-	/**
-	 * @param ISecureRandom $random
-	 */
-	public function __construct(ISecureRandom $random) {
-		$this->random = $random;
-	}
+    /**
+     * @param ISecureRandom $random
+     */
+    public function __construct(ISecureRandom $random) {
+        $this->random = $random;
+    }
 
-	/**
-	 * Generate a new CSRF token.
-	 *
-	 * @param int $length Length of the token in characters.
-	 * @return string
-	 */
-	public function generateToken(int $length = 32): string {
-		return $this->random->generate($length);
-	}
+    /**
+     * Generate a new CSRF token.
+     *
+     * @param int $length Length of the token in characters.
+     * @return string
+     */
+    public function generateToken(int $length = 32): string {
+        return $this->random->generate($length);
+    }
 }

lib/private/Security/IdentityProof/Key.php

Indentation +18 added lines, -18 removed lines

@@ -25,25 +25,25 @@
 namespace OC\Security\IdentityProof;
 
 class Key {
-	/** @var string */
-	private $publicKey;
-	/** @var string */
-	private $privateKey;
+    /** @var string */
+    private $publicKey;
+    /** @var string */
+    private $privateKey;
 
-	/**
-	 * @param string $publicKey
-	 * @param string $privateKey
-	 */
-	public function __construct(string $publicKey, string $privateKey) {
-		$this->publicKey = $publicKey;
-		$this->privateKey = $privateKey;
-	}
+    /**
+     * @param string $publicKey
+     * @param string $privateKey
+     */
+    public function __construct(string $publicKey, string $privateKey) {
+        $this->publicKey = $publicKey;
+        $this->privateKey = $privateKey;
+    }
 
-	public function getPrivate(): string {
-		return $this->privateKey;
-	}
+    public function getPrivate(): string {
+        return $this->privateKey;
+    }
 
-	public function getPublic(): string {
-		return $this->publicKey;
-	}
+    public function getPublic(): string {
+        return $this->publicKey;
+    }
 }

apps/dav/lib/Upload/ChunkingPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
 
 		// casted to string because cast to float cause equality for non equal numbers
 		// and integer has the problem of limited size on 32 bit systems
-		if ((string)$expectedSize !== (string)$actualSize) {
+		if ((string) $expectedSize !== (string) $actualSize) {
 			throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes");
 		}
 	}

Indentation +78 added lines, -78 removed lines

@@ -32,93 +32,93 @@
 
 class ChunkingPlugin extends ServerPlugin {
 
-	/** @var Server */
-	private $server;
-	/** @var FutureFile */
-	private $sourceNode;
+    /** @var Server */
+    private $server;
+    /** @var FutureFile */
+    private $sourceNode;
 
-	/**
-	 * @inheritdoc
-	 */
-	public function initialize(Server $server) {
-		$server->on('beforeMove', [$this, 'beforeMove']);
-		$this->server = $server;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function initialize(Server $server) {
+        $server->on('beforeMove', [$this, 'beforeMove']);
+        $this->server = $server;
+    }
 
-	/**
-	 * @param string $sourcePath source path
-	 * @param string $destination destination path
-	 * @return bool|void
-	 * @throws BadRequest
-	 * @throws NotFound
-	 */
-	public function beforeMove($sourcePath, $destination) {
-		$this->sourceNode = $this->server->tree->getNodeForPath($sourcePath);
-		if (!$this->sourceNode instanceof FutureFile) {
-			// skip handling as the source is not a chunked FutureFile
-			return;
-		}
+    /**
+     * @param string $sourcePath source path
+     * @param string $destination destination path
+     * @return bool|void
+     * @throws BadRequest
+     * @throws NotFound
+     */
+    public function beforeMove($sourcePath, $destination) {
+        $this->sourceNode = $this->server->tree->getNodeForPath($sourcePath);
+        if (!$this->sourceNode instanceof FutureFile) {
+            // skip handling as the source is not a chunked FutureFile
+            return;
+        }
 
-		try {
-			/** @var INode $destinationNode */
-			$destinationNode = $this->server->tree->getNodeForPath($destination);
-			if ($destinationNode instanceof Directory) {
-				throw new BadRequest("The given destination $destination is a directory.");
-			}
-		} catch (NotFound $e) {
-			// If the destination does not exist yet it's not a directory either ;)
-		}
+        try {
+            /** @var INode $destinationNode */
+            $destinationNode = $this->server->tree->getNodeForPath($destination);
+            if ($destinationNode instanceof Directory) {
+                throw new BadRequest("The given destination $destination is a directory.");
+            }
+        } catch (NotFound $e) {
+            // If the destination does not exist yet it's not a directory either ;)
+        }
 
-		$this->verifySize();
-		return $this->performMove($sourcePath, $destination);
-	}
+        $this->verifySize();
+        return $this->performMove($sourcePath, $destination);
+    }
 
-	/**
-	 * Move handler for future file.
-	 *
-	 * This overrides the default move behavior to prevent Sabre
-	 * to delete the target file before moving. Because deleting would
-	 * lose the file id and metadata.
-	 *
-	 * @param string $path source path
-	 * @param string $destination destination path
-	 * @return bool|void false to stop handling, void to skip this handler
-	 */
-	public function performMove($path, $destination) {
-		if (!$this->server->tree->nodeExists($destination)) {
-			// skip and let the default handler do its work
-			return;
-		}
+    /**
+     * Move handler for future file.
+     *
+     * This overrides the default move behavior to prevent Sabre
+     * to delete the target file before moving. Because deleting would
+     * lose the file id and metadata.
+     *
+     * @param string $path source path
+     * @param string $destination destination path
+     * @return bool|void false to stop handling, void to skip this handler
+     */
+    public function performMove($path, $destination) {
+        if (!$this->server->tree->nodeExists($destination)) {
+            // skip and let the default handler do its work
+            return;
+        }
 
-		// do a move manually, skipping Sabre's default "delete" for existing nodes
-		$this->server->tree->move($path, $destination);
+        // do a move manually, skipping Sabre's default "delete" for existing nodes
+        $this->server->tree->move($path, $destination);
 
-		// trigger all default events (copied from CorePlugin::move)
-		$this->server->emit('afterMove', [$path, $destination]);
-		$this->server->emit('afterUnbind', [$path]);
-		$this->server->emit('afterBind', [$destination]);
+        // trigger all default events (copied from CorePlugin::move)
+        $this->server->emit('afterMove', [$path, $destination]);
+        $this->server->emit('afterUnbind', [$path]);
+        $this->server->emit('afterBind', [$destination]);
 
-		$response = $this->server->httpResponse;
-		$response->setHeader('Content-Length', '0');
-		$response->setStatus(204);
+        $response = $this->server->httpResponse;
+        $response->setHeader('Content-Length', '0');
+        $response->setStatus(204);
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * @throws BadRequest
-	 */
-	private function verifySize() {
-		$expectedSize = $this->server->httpRequest->getHeader('OC-Total-Length');
-		if ($expectedSize === null) {
-			return;
-		}
-		$actualSize = $this->sourceNode->getSize();
+    /**
+     * @throws BadRequest
+     */
+    private function verifySize() {
+        $expectedSize = $this->server->httpRequest->getHeader('OC-Total-Length');
+        if ($expectedSize === null) {
+            return;
+        }
+        $actualSize = $this->sourceNode->getSize();
 
-		// casted to string because cast to float cause equality for non equal numbers
-		// and integer has the problem of limited size on 32 bit systems
-		if ((string)$expectedSize !== (string)$actualSize) {
-			throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes");
-		}
-	}
+        // casted to string because cast to float cause equality for non equal numbers
+        // and integer has the problem of limited size on 32 bit systems
+        if ((string)$expectedSize !== (string)$actualSize) {
+            throw new BadRequest("Chunks on server do not sum up to $expectedSize but to $actualSize bytes");
+        }
+    }
 }

core/Controller/SearchController.php

Indentation +15 added lines, -15 removed lines

@@ -31,23 +31,23 @@
 
 class SearchController extends Controller {
 
-	/** @var ISearch */
-	private $searcher;
+    /** @var ISearch */
+    private $searcher;
 
-	public function __construct(string $appName,
-								IRequest $request,
-								ISearch $search) {
-		parent::__construct($appName, $request);
+    public function __construct(string $appName,
+                                IRequest $request,
+                                ISearch $search) {
+        parent::__construct($appName, $request);
 
-		$this->searcher = $search;
-	}
+        $this->searcher = $search;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 */
-	public function search(string $query, array $inApps = [], int $page = 1, int $size = 30): JSONResponse {
-		$results = $this->searcher->searchPaged($query, $inApps, $page, $size);
+    /**
+     * @NoAdminRequired
+     */
+    public function search(string $query, array $inApps = [], int $page = 1, int $size = 30): JSONResponse {
+        $results = $this->searcher->searchPaged($query, $inApps, $page, $size);
 
-		return new JSONResponse($results);
-	}
+        return new JSONResponse($results);
+    }
 }

lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php

Indentation +366 added lines, -366 removed lines

@@ -37,396 +37,396 @@
 use OCP\IDBConnection;
 
 class ExpressionBuilder implements IExpressionBuilder {
-	/** @var \Doctrine\DBAL\Query\Expression\ExpressionBuilder */
-	protected $expressionBuilder;
+    /** @var \Doctrine\DBAL\Query\Expression\ExpressionBuilder */
+    protected $expressionBuilder;
 
-	/** @var QuoteHelper */
-	protected $helper;
+    /** @var QuoteHelper */
+    protected $helper;
 
-	/** @var IDBConnection */
-	protected $connection;
+    /** @var IDBConnection */
+    protected $connection;
 
-	/** @var FunctionBuilder */
-	protected $functionBuilder;
+    /** @var FunctionBuilder */
+    protected $functionBuilder;
 
-	/**
-	 * Initializes a new <tt>ExpressionBuilder</tt>.
-	 *
-	 * @param IDBConnection $connection
-	 * @param IQueryBuilder $queryBuilder
-	 */
-	public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder) {
-		$this->connection = $connection;
-		$this->helper = new QuoteHelper();
-		$this->expressionBuilder = new DoctrineExpressionBuilder($connection);
-		$this->functionBuilder = $queryBuilder->func();
-	}
+    /**
+     * Initializes a new <tt>ExpressionBuilder</tt>.
+     *
+     * @param IDBConnection $connection
+     * @param IQueryBuilder $queryBuilder
+     */
+    public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder) {
+        $this->connection = $connection;
+        $this->helper = new QuoteHelper();
+        $this->expressionBuilder = new DoctrineExpressionBuilder($connection);
+        $this->functionBuilder = $queryBuilder->func();
+    }
 
-	/**
-	 * Creates a conjunction of the given boolean expressions.
-	 *
-	 * Example:
-	 *
-	 *     [php]
-	 *     // (u.type = ?) AND (u.role = ?)
-	 *     $expr->andX('u.type = ?', 'u.role = ?'));
-	 *
-	 * @param mixed ...$x Optional clause. Defaults = null, but requires
-	 *                 at least one defined when converting to string.
-	 *
-	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
-	 */
-	public function andX(...$x) {
-		$compositeExpression = call_user_func_array([$this->expressionBuilder, 'andX'], $x);
-		return new CompositeExpression($compositeExpression);
-	}
+    /**
+     * Creates a conjunction of the given boolean expressions.
+     *
+     * Example:
+     *
+     *     [php]
+     *     // (u.type = ?) AND (u.role = ?)
+     *     $expr->andX('u.type = ?', 'u.role = ?'));
+     *
+     * @param mixed ...$x Optional clause. Defaults = null, but requires
+     *                 at least one defined when converting to string.
+     *
+     * @return \OCP\DB\QueryBuilder\ICompositeExpression
+     */
+    public function andX(...$x) {
+        $compositeExpression = call_user_func_array([$this->expressionBuilder, 'andX'], $x);
+        return new CompositeExpression($compositeExpression);
+    }
 
-	/**
-	 * Creates a disjunction of the given boolean expressions.
-	 *
-	 * Example:
-	 *
-	 *     [php]
-	 *     // (u.type = ?) OR (u.role = ?)
-	 *     $qb->where($qb->expr()->orX('u.type = ?', 'u.role = ?'));
-	 *
-	 * @param mixed ...$x Optional clause. Defaults = null, but requires
-	 *                 at least one defined when converting to string.
-	 *
-	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
-	 */
-	public function orX(...$x) {
-		$compositeExpression = call_user_func_array([$this->expressionBuilder, 'orX'], $x);
-		return new CompositeExpression($compositeExpression);
-	}
+    /**
+     * Creates a disjunction of the given boolean expressions.
+     *
+     * Example:
+     *
+     *     [php]
+     *     // (u.type = ?) OR (u.role = ?)
+     *     $qb->where($qb->expr()->orX('u.type = ?', 'u.role = ?'));
+     *
+     * @param mixed ...$x Optional clause. Defaults = null, but requires
+     *                 at least one defined when converting to string.
+     *
+     * @return \OCP\DB\QueryBuilder\ICompositeExpression
+     */
+    public function orX(...$x) {
+        $compositeExpression = call_user_func_array([$this->expressionBuilder, 'orX'], $x);
+        return new CompositeExpression($compositeExpression);
+    }
 
-	/**
-	 * Creates a comparison expression.
-	 *
-	 * @param mixed $x The left expression.
-	 * @param string $operator One of the IExpressionBuilder::* constants.
-	 * @param mixed $y The right expression.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function comparison($x, $operator, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->comparison($x, $operator, $y);
-	}
+    /**
+     * Creates a comparison expression.
+     *
+     * @param mixed $x The left expression.
+     * @param string $operator One of the IExpressionBuilder::* constants.
+     * @param mixed $y The right expression.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function comparison($x, $operator, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->comparison($x, $operator, $y);
+    }
 
-	/**
-	 * Creates an equality comparison expression with the given arguments.
-	 *
-	 * First argument is considered the left expression and the second is the right expression.
-	 * When converted to string, it will generated a <left expr> = <right expr>. Example:
-	 *
-	 *     [php]
-	 *     // u.id = ?
-	 *     $expr->eq('u.id', '?');
-	 *
-	 * @param mixed $x The left expression.
-	 * @param mixed $y The right expression.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function eq($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->eq($x, $y);
-	}
+    /**
+     * Creates an equality comparison expression with the given arguments.
+     *
+     * First argument is considered the left expression and the second is the right expression.
+     * When converted to string, it will generated a <left expr> = <right expr>. Example:
+     *
+     *     [php]
+     *     // u.id = ?
+     *     $expr->eq('u.id', '?');
+     *
+     * @param mixed $x The left expression.
+     * @param mixed $y The right expression.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function eq($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->eq($x, $y);
+    }
 
-	/**
-	 * Creates a non equality comparison expression with the given arguments.
-	 * First argument is considered the left expression and the second is the right expression.
-	 * When converted to string, it will generated a <left expr> <> <right expr>. Example:
-	 *
-	 *     [php]
-	 *     // u.id <> 1
-	 *     $q->where($q->expr()->neq('u.id', '1'));
-	 *
-	 * @param mixed $x The left expression.
-	 * @param mixed $y The right expression.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function neq($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->neq($x, $y);
-	}
+    /**
+     * Creates a non equality comparison expression with the given arguments.
+     * First argument is considered the left expression and the second is the right expression.
+     * When converted to string, it will generated a <left expr> <> <right expr>. Example:
+     *
+     *     [php]
+     *     // u.id <> 1
+     *     $q->where($q->expr()->neq('u.id', '1'));
+     *
+     * @param mixed $x The left expression.
+     * @param mixed $y The right expression.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function neq($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->neq($x, $y);
+    }
 
-	/**
-	 * Creates a lower-than comparison expression with the given arguments.
-	 * First argument is considered the left expression and the second is the right expression.
-	 * When converted to string, it will generated a <left expr> < <right expr>. Example:
-	 *
-	 *     [php]
-	 *     // u.id < ?
-	 *     $q->where($q->expr()->lt('u.id', '?'));
-	 *
-	 * @param mixed $x The left expression.
-	 * @param mixed $y The right expression.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function lt($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->lt($x, $y);
-	}
+    /**
+     * Creates a lower-than comparison expression with the given arguments.
+     * First argument is considered the left expression and the second is the right expression.
+     * When converted to string, it will generated a <left expr> < <right expr>. Example:
+     *
+     *     [php]
+     *     // u.id < ?
+     *     $q->where($q->expr()->lt('u.id', '?'));
+     *
+     * @param mixed $x The left expression.
+     * @param mixed $y The right expression.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function lt($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->lt($x, $y);
+    }
 
-	/**
-	 * Creates a lower-than-equal comparison expression with the given arguments.
-	 * First argument is considered the left expression and the second is the right expression.
-	 * When converted to string, it will generated a <left expr> <= <right expr>. Example:
-	 *
-	 *     [php]
-	 *     // u.id <= ?
-	 *     $q->where($q->expr()->lte('u.id', '?'));
-	 *
-	 * @param mixed $x The left expression.
-	 * @param mixed $y The right expression.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function lte($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->lte($x, $y);
-	}
+    /**
+     * Creates a lower-than-equal comparison expression with the given arguments.
+     * First argument is considered the left expression and the second is the right expression.
+     * When converted to string, it will generated a <left expr> <= <right expr>. Example:
+     *
+     *     [php]
+     *     // u.id <= ?
+     *     $q->where($q->expr()->lte('u.id', '?'));
+     *
+     * @param mixed $x The left expression.
+     * @param mixed $y The right expression.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function lte($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->lte($x, $y);
+    }
 
-	/**
-	 * Creates a greater-than comparison expression with the given arguments.
-	 * First argument is considered the left expression and the second is the right expression.
-	 * When converted to string, it will generated a <left expr> > <right expr>. Example:
-	 *
-	 *     [php]
-	 *     // u.id > ?
-	 *     $q->where($q->expr()->gt('u.id', '?'));
-	 *
-	 * @param mixed $x The left expression.
-	 * @param mixed $y The right expression.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function gt($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->gt($x, $y);
-	}
+    /**
+     * Creates a greater-than comparison expression with the given arguments.
+     * First argument is considered the left expression and the second is the right expression.
+     * When converted to string, it will generated a <left expr> > <right expr>. Example:
+     *
+     *     [php]
+     *     // u.id > ?
+     *     $q->where($q->expr()->gt('u.id', '?'));
+     *
+     * @param mixed $x The left expression.
+     * @param mixed $y The right expression.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function gt($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->gt($x, $y);
+    }
 
-	/**
-	 * Creates a greater-than-equal comparison expression with the given arguments.
-	 * First argument is considered the left expression and the second is the right expression.
-	 * When converted to string, it will generated a <left expr> >= <right expr>. Example:
-	 *
-	 *     [php]
-	 *     // u.id >= ?
-	 *     $q->where($q->expr()->gte('u.id', '?'));
-	 *
-	 * @param mixed $x The left expression.
-	 * @param mixed $y The right expression.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function gte($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->gte($x, $y);
-	}
+    /**
+     * Creates a greater-than-equal comparison expression with the given arguments.
+     * First argument is considered the left expression and the second is the right expression.
+     * When converted to string, it will generated a <left expr> >= <right expr>. Example:
+     *
+     *     [php]
+     *     // u.id >= ?
+     *     $q->where($q->expr()->gte('u.id', '?'));
+     *
+     * @param mixed $x The left expression.
+     * @param mixed $y The right expression.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function gte($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->gte($x, $y);
+    }
 
-	/**
-	 * Creates an IS NULL expression with the given arguments.
-	 *
-	 * @param string $x The field in string format to be restricted by IS NULL.
-	 *
-	 * @return string
-	 */
-	public function isNull($x) {
-		$x = $this->helper->quoteColumnName($x);
-		return $this->expressionBuilder->isNull($x);
-	}
+    /**
+     * Creates an IS NULL expression with the given arguments.
+     *
+     * @param string $x The field in string format to be restricted by IS NULL.
+     *
+     * @return string
+     */
+    public function isNull($x) {
+        $x = $this->helper->quoteColumnName($x);
+        return $this->expressionBuilder->isNull($x);
+    }
 
-	/**
-	 * Creates an IS NOT NULL expression with the given arguments.
-	 *
-	 * @param string $x The field in string format to be restricted by IS NOT NULL.
-	 *
-	 * @return string
-	 */
-	public function isNotNull($x) {
-		$x = $this->helper->quoteColumnName($x);
-		return $this->expressionBuilder->isNotNull($x);
-	}
+    /**
+     * Creates an IS NOT NULL expression with the given arguments.
+     *
+     * @param string $x The field in string format to be restricted by IS NOT NULL.
+     *
+     * @return string
+     */
+    public function isNotNull($x) {
+        $x = $this->helper->quoteColumnName($x);
+        return $this->expressionBuilder->isNotNull($x);
+    }
 
-	/**
-	 * Creates a LIKE() comparison expression with the given arguments.
-	 *
-	 * @param string $x Field in string format to be inspected by LIKE() comparison.
-	 * @param mixed $y Argument to be used in LIKE() comparison.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function like($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->like($x, $y);
-	}
+    /**
+     * Creates a LIKE() comparison expression with the given arguments.
+     *
+     * @param string $x Field in string format to be inspected by LIKE() comparison.
+     * @param mixed $y Argument to be used in LIKE() comparison.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function like($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->like($x, $y);
+    }
 
-	/**
-	 * Creates a ILIKE() comparison expression with the given arguments.
-	 *
-	 * @param string $x Field in string format to be inspected by ILIKE() comparison.
-	 * @param mixed $y Argument to be used in ILIKE() comparison.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function iLike($x, $y, $type = null) {
-		return $this->expressionBuilder->like($this->functionBuilder->lower($x), $this->functionBuilder->lower($y));
-	}
+    /**
+     * Creates a ILIKE() comparison expression with the given arguments.
+     *
+     * @param string $x Field in string format to be inspected by ILIKE() comparison.
+     * @param mixed $y Argument to be used in ILIKE() comparison.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function iLike($x, $y, $type = null) {
+        return $this->expressionBuilder->like($this->functionBuilder->lower($x), $this->functionBuilder->lower($y));
+    }
 
-	/**
-	 * Creates a NOT LIKE() comparison expression with the given arguments.
-	 *
-	 * @param string $x Field in string format to be inspected by NOT LIKE() comparison.
-	 * @param mixed $y Argument to be used in NOT LIKE() comparison.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function notLike($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->notLike($x, $y);
-	}
+    /**
+     * Creates a NOT LIKE() comparison expression with the given arguments.
+     *
+     * @param string $x Field in string format to be inspected by NOT LIKE() comparison.
+     * @param mixed $y Argument to be used in NOT LIKE() comparison.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function notLike($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->notLike($x, $y);
+    }
 
-	/**
-	 * Creates a IN () comparison expression with the given arguments.
-	 *
-	 * @param string $x The field in string format to be inspected by IN() comparison.
-	 * @param string|array $y The placeholder or the array of values to be used by IN() comparison.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function in($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnNames($y);
-		return $this->expressionBuilder->in($x, $y);
-	}
+    /**
+     * Creates a IN () comparison expression with the given arguments.
+     *
+     * @param string $x The field in string format to be inspected by IN() comparison.
+     * @param string|array $y The placeholder or the array of values to be used by IN() comparison.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function in($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnNames($y);
+        return $this->expressionBuilder->in($x, $y);
+    }
 
-	/**
-	 * Creates a NOT IN () comparison expression with the given arguments.
-	 *
-	 * @param string $x The field in string format to be inspected by NOT IN() comparison.
-	 * @param string|array $y The placeholder or the array of values to be used by NOT IN() comparison.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function notIn($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnNames($y);
-		return $this->expressionBuilder->notIn($x, $y);
-	}
+    /**
+     * Creates a NOT IN () comparison expression with the given arguments.
+     *
+     * @param string $x The field in string format to be inspected by NOT IN() comparison.
+     * @param string|array $y The placeholder or the array of values to be used by NOT IN() comparison.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function notIn($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnNames($y);
+        return $this->expressionBuilder->notIn($x, $y);
+    }
 
-	/**
-	 * Creates a $x = '' statement, because Oracle needs a different check
-	 *
-	 * @param string $x The field in string format to be inspected by the comparison.
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function emptyString($x) {
-		return $this->eq($x, $this->literal('', IQueryBuilder::PARAM_STR));
-	}
+    /**
+     * Creates a $x = '' statement, because Oracle needs a different check
+     *
+     * @param string $x The field in string format to be inspected by the comparison.
+     * @return string
+     * @since 13.0.0
+     */
+    public function emptyString($x) {
+        return $this->eq($x, $this->literal('', IQueryBuilder::PARAM_STR));
+    }
 
-	/**
-	 * Creates a `$x <> ''` statement, because Oracle needs a different check
-	 *
-	 * @param string $x The field in string format to be inspected by the comparison.
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function nonEmptyString($x) {
-		return $this->neq($x, $this->literal('', IQueryBuilder::PARAM_STR));
-	}
+    /**
+     * Creates a `$x <> ''` statement, because Oracle needs a different check
+     *
+     * @param string $x The field in string format to be inspected by the comparison.
+     * @return string
+     * @since 13.0.0
+     */
+    public function nonEmptyString($x) {
+        return $this->neq($x, $this->literal('', IQueryBuilder::PARAM_STR));
+    }
 
-	/**
-	 * Binary AND Operator copies a bit to the result if it exists in both operands.
-	 *
-	 * @param string|ILiteral $x The field or value to check
-	 * @param int $y Bitmap that must be set
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function bitwiseAnd($x, $y) {
-		return new QueryFunction($this->connection->getDatabasePlatform()->getBitAndComparisonExpression(
-			$this->helper->quoteColumnName($x),
-			$y
-		));
-	}
+    /**
+     * Binary AND Operator copies a bit to the result if it exists in both operands.
+     *
+     * @param string|ILiteral $x The field or value to check
+     * @param int $y Bitmap that must be set
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function bitwiseAnd($x, $y) {
+        return new QueryFunction($this->connection->getDatabasePlatform()->getBitAndComparisonExpression(
+            $this->helper->quoteColumnName($x),
+            $y
+        ));
+    }
 
-	/**
-	 * Binary OR Operator copies a bit if it exists in either operand.
-	 *
-	 * @param string|ILiteral $x The field or value to check
-	 * @param int $y Bitmap that must be set
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function bitwiseOr($x, $y) {
-		return new QueryFunction($this->connection->getDatabasePlatform()->getBitOrComparisonExpression(
-			$this->helper->quoteColumnName($x),
-			$y
-		));
-	}
+    /**
+     * Binary OR Operator copies a bit if it exists in either operand.
+     *
+     * @param string|ILiteral $x The field or value to check
+     * @param int $y Bitmap that must be set
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function bitwiseOr($x, $y) {
+        return new QueryFunction($this->connection->getDatabasePlatform()->getBitOrComparisonExpression(
+            $this->helper->quoteColumnName($x),
+            $y
+        ));
+    }
 
-	/**
-	 * Quotes a given input parameter.
-	 *
-	 * @param mixed $input The parameter to be quoted.
-	 * @param mixed|null $type One of the IQueryBuilder::PARAM_* constants
-	 *
-	 * @return ILiteral
-	 */
-	public function literal($input, $type = null) {
-		return new Literal($this->expressionBuilder->literal($input, $type));
-	}
+    /**
+     * Quotes a given input parameter.
+     *
+     * @param mixed $input The parameter to be quoted.
+     * @param mixed|null $type One of the IQueryBuilder::PARAM_* constants
+     *
+     * @return ILiteral
+     */
+    public function literal($input, $type = null) {
+        return new Literal($this->expressionBuilder->literal($input, $type));
+    }
 
-	/**
-	 * Returns a IQueryFunction that casts the column to the given type
-	 *
-	 * @param string $column
-	 * @param mixed $type One of IQueryBuilder::PARAM_*
-	 * @return string
-	 */
-	public function castColumn($column, $type) {
-		return new QueryFunction(
-			$this->helper->quoteColumnName($column)
-		);
-	}
+    /**
+     * Returns a IQueryFunction that casts the column to the given type
+     *
+     * @param string $column
+     * @param mixed $type One of IQueryBuilder::PARAM_*
+     * @return string
+     */
+    public function castColumn($column, $type) {
+        return new QueryFunction(
+            $this->helper->quoteColumnName($column)
+        );
+    }
 }

lib/public/BackgroundJob.php

Indentation +13 added lines, -13 removed lines

@@ -32,18 +32,18 @@
  * @deprecated 14.0.0
  */
 class BackgroundJob {
-	/**
-	 * @since 5.0.0
-	 * @deprecated 14.0.0
-	 */
-	public static function getExecutionType() {
-		return '';
-	}
+    /**
+     * @since 5.0.0
+     * @deprecated 14.0.0
+     */
+    public static function getExecutionType() {
+        return '';
+    }
 
-	/**
-	 * @since 5.0.0
-	 * @deprecated 14.0.0
-	 */
-	public static function setExecutionType($type) {
-	}
+    /**
+     * @since 5.0.0
+     * @deprecated 14.0.0
+     */
+    public static function setExecutionType($type) {
+    }
 }

lib/private/Files/Storage/Flysystem.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
 	}
 
 	protected function buildPath($path) {
-		$fullPath = \OC\Files\Filesystem::normalizePath($this->root . '/' . $path);
+		$fullPath = \OC\Files\Filesystem::normalizePath($this->root.'/'.$path);
 		return ltrim($fullPath, '/');
 	}
 
@@ -163,7 +163,7 @@ 
 		} catch (FileNotFoundException $e) {
 			return false;
 		}
-		$names = array_map(function ($object) {
+		$names = array_map(function($object) {
 			return $object['basename'];
 		}, $content);
 		return IteratorDirectory::wrap($names);
@@ -209,7 +209,7 @@ 
 					$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
 				}
 				$source = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath) {
+				return CallbackWrapper::wrap($source, null, null, function() use ($tmpFile, $fullPath) {
 					$this->flysystem->putStream($fullPath, fopen($tmpFile, 'r'));
 					unlink($tmpFile);
 				});

Indentation +202 added lines, -202 removed lines

@@ -36,224 +36,224 @@
  * To use: subclass and call $this->buildFlysystem with the flysystem adapter of choice
  */
 abstract class Flysystem extends Common {
-	/**
-	 * @var Filesystem
-	 */
-	protected $flysystem;
+    /**
+     * @var Filesystem
+     */
+    protected $flysystem;
 
-	/**
-	 * @var string
-	 */
-	protected $root = '';
+    /**
+     * @var string
+     */
+    protected $root = '';
 
-	/**
-	 * Initialize the storage backend with a flyssytem adapter
-	 *
-	 * @param \League\Flysystem\AdapterInterface $adapter
-	 */
-	protected function buildFlySystem(AdapterInterface $adapter) {
-		$this->flysystem = new Filesystem($adapter);
-		$this->flysystem->addPlugin(new GetWithMetadata());
-	}
+    /**
+     * Initialize the storage backend with a flyssytem adapter
+     *
+     * @param \League\Flysystem\AdapterInterface $adapter
+     */
+    protected function buildFlySystem(AdapterInterface $adapter) {
+        $this->flysystem = new Filesystem($adapter);
+        $this->flysystem->addPlugin(new GetWithMetadata());
+    }
 
-	protected function buildPath($path) {
-		$fullPath = \OC\Files\Filesystem::normalizePath($this->root . '/' . $path);
-		return ltrim($fullPath, '/');
-	}
+    protected function buildPath($path) {
+        $fullPath = \OC\Files\Filesystem::normalizePath($this->root . '/' . $path);
+        return ltrim($fullPath, '/');
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function file_get_contents($path) {
-		return $this->flysystem->read($this->buildPath($path));
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function file_get_contents($path) {
+        return $this->flysystem->read($this->buildPath($path));
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function file_put_contents($path, $data) {
-		return $this->flysystem->put($this->buildPath($path), $data);
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function file_put_contents($path, $data) {
+        return $this->flysystem->put($this->buildPath($path), $data);
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function file_exists($path) {
-		return $this->flysystem->has($this->buildPath($path));
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function file_exists($path) {
+        return $this->flysystem->has($this->buildPath($path));
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function unlink($path) {
-		if ($this->is_dir($path)) {
-			return $this->rmdir($path);
-		}
-		try {
-			return $this->flysystem->delete($this->buildPath($path));
-		} catch (FileNotFoundException $e) {
-			return false;
-		}
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function unlink($path) {
+        if ($this->is_dir($path)) {
+            return $this->rmdir($path);
+        }
+        try {
+            return $this->flysystem->delete($this->buildPath($path));
+        } catch (FileNotFoundException $e) {
+            return false;
+        }
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function rename($source, $target) {
-		if ($this->file_exists($target)) {
-			$this->unlink($target);
-		}
-		return $this->flysystem->rename($this->buildPath($source), $this->buildPath($target));
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function rename($source, $target) {
+        if ($this->file_exists($target)) {
+            $this->unlink($target);
+        }
+        return $this->flysystem->rename($this->buildPath($source), $this->buildPath($target));
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function copy($source, $target) {
-		if ($this->file_exists($target)) {
-			$this->unlink($target);
-		}
-		return $this->flysystem->copy($this->buildPath($source), $this->buildPath($target));
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function copy($source, $target) {
+        if ($this->file_exists($target)) {
+            $this->unlink($target);
+        }
+        return $this->flysystem->copy($this->buildPath($source), $this->buildPath($target));
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function filesize($path) {
-		if ($this->is_dir($path)) {
-			return 0;
-		} else {
-			return $this->flysystem->getSize($this->buildPath($path));
-		}
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function filesize($path) {
+        if ($this->is_dir($path)) {
+            return 0;
+        } else {
+            return $this->flysystem->getSize($this->buildPath($path));
+        }
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function mkdir($path) {
-		if ($this->file_exists($path)) {
-			return false;
-		}
-		return $this->flysystem->createDir($this->buildPath($path));
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function mkdir($path) {
+        if ($this->file_exists($path)) {
+            return false;
+        }
+        return $this->flysystem->createDir($this->buildPath($path));
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function filemtime($path) {
-		return $this->flysystem->getTimestamp($this->buildPath($path));
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function filemtime($path) {
+        return $this->flysystem->getTimestamp($this->buildPath($path));
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function rmdir($path) {
-		try {
-			return @$this->flysystem->deleteDir($this->buildPath($path));
-		} catch (FileNotFoundException $e) {
-			return false;
-		}
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function rmdir($path) {
+        try {
+            return @$this->flysystem->deleteDir($this->buildPath($path));
+        } catch (FileNotFoundException $e) {
+            return false;
+        }
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function opendir($path) {
-		try {
-			$content = $this->flysystem->listContents($this->buildPath($path));
-		} catch (FileNotFoundException $e) {
-			return false;
-		}
-		$names = array_map(function ($object) {
-			return $object['basename'];
-		}, $content);
-		return IteratorDirectory::wrap($names);
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function opendir($path) {
+        try {
+            $content = $this->flysystem->listContents($this->buildPath($path));
+        } catch (FileNotFoundException $e) {
+            return false;
+        }
+        $names = array_map(function ($object) {
+            return $object['basename'];
+        }, $content);
+        return IteratorDirectory::wrap($names);
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function fopen($path, $mode) {
-		$fullPath = $this->buildPath($path);
-		$useExisting = true;
-		switch ($mode) {
-			case 'r':
-			case 'rb':
-				try {
-					return $this->flysystem->readStream($fullPath);
-				} catch (FileNotFoundException $e) {
-					return false;
-				}
-			case 'w':
-			case 'w+':
-			case 'wb':
-			case 'wb+':
-				$useExisting = false;
-				// no break
-			case 'a':
-			case 'ab':
-			case 'r+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				//emulate these
-				if ($useExisting and $this->file_exists($path)) {
-					if (!$this->isUpdatable($path)) {
-						return false;
-					}
-					$tmpFile = $this->getCachedFile($path);
-				} else {
-					if (!$this->isCreatable(dirname($path))) {
-						return false;
-					}
-					$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
-				}
-				$source = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath) {
-					$this->flysystem->putStream($fullPath, fopen($tmpFile, 'r'));
-					unlink($tmpFile);
-				});
-		}
-		return false;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function fopen($path, $mode) {
+        $fullPath = $this->buildPath($path);
+        $useExisting = true;
+        switch ($mode) {
+            case 'r':
+            case 'rb':
+                try {
+                    return $this->flysystem->readStream($fullPath);
+                } catch (FileNotFoundException $e) {
+                    return false;
+                }
+            case 'w':
+            case 'w+':
+            case 'wb':
+            case 'wb+':
+                $useExisting = false;
+                // no break
+            case 'a':
+            case 'ab':
+            case 'r+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                //emulate these
+                if ($useExisting and $this->file_exists($path)) {
+                    if (!$this->isUpdatable($path)) {
+                        return false;
+                    }
+                    $tmpFile = $this->getCachedFile($path);
+                } else {
+                    if (!$this->isCreatable(dirname($path))) {
+                        return false;
+                    }
+                    $tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
+                }
+                $source = fopen($tmpFile, $mode);
+                return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath) {
+                    $this->flysystem->putStream($fullPath, fopen($tmpFile, 'r'));
+                    unlink($tmpFile);
+                });
+        }
+        return false;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function touch($path, $mtime = null) {
-		if ($this->file_exists($path)) {
-			return false;
-		} else {
-			$this->file_put_contents($path, '');
-			return true;
-		}
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function touch($path, $mtime = null) {
+        if ($this->file_exists($path)) {
+            return false;
+        } else {
+            $this->file_put_contents($path, '');
+            return true;
+        }
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function stat($path) {
-		$info = $this->flysystem->getWithMetadata($this->buildPath($path), ['timestamp', 'size']);
-		return [
-			'mtime' => $info['timestamp'],
-			'size' => $info['size']
-		];
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function stat($path) {
+        $info = $this->flysystem->getWithMetadata($this->buildPath($path), ['timestamp', 'size']);
+        return [
+            'mtime' => $info['timestamp'],
+            'size' => $info['size']
+        ];
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function filetype($path) {
-		if ($path === '' or $path === '/' or $path === '.') {
-			return 'dir';
-		}
-		try {
-			$info = $this->flysystem->getMetadata($this->buildPath($path));
-		} catch (FileNotFoundException $e) {
-			return false;
-		}
-		return $info['type'];
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function filetype($path) {
+        if ($path === '' or $path === '/' or $path === '.') {
+            return 'dir';
+        }
+        try {
+            $info = $this->flysystem->getMetadata($this->buildPath($path));
+        } catch (FileNotFoundException $e) {
+            return false;
+        }
+        return $info['type'];
+    }
 }