nextcloud / server

lib/public/AppFramework/Db/Entity.php

Indentation +205 added lines, -205 removed lines

@@ -31,224 +31,224 @@
  */
 abstract class Entity {
 
-	public $id;
+    public $id;
 
-	private $_updatedFields = array();
-	private $_fieldTypes = array('id' => 'integer');
+    private $_updatedFields = array();
+    private $_fieldTypes = array('id' => 'integer');
 
 
-	/**
-	 * Simple alternative constructor for building entities from a request
-	 * @param array $params the array which was obtained via $this->params('key')
-	 * in the controller
-	 * @return Entity
-	 * @since 7.0.0
-	 */
-	public static function fromParams(array $params) {
-		$instance = new static();
+    /**
+     * Simple alternative constructor for building entities from a request
+     * @param array $params the array which was obtained via $this->params('key')
+     * in the controller
+     * @return Entity
+     * @since 7.0.0
+     */
+    public static function fromParams(array $params) {
+        $instance = new static();
 
-		foreach($params as $key => $value) {
-			$method = 'set' . ucfirst($key);
-			$instance->$method($value);
-		}
+        foreach($params as $key => $value) {
+            $method = 'set' . ucfirst($key);
+            $instance->$method($value);
+        }
 
-		return $instance;
-	}
+        return $instance;
+    }
 
 
-	/**
-	 * Maps the keys of the row array to the attributes
-	 * @param array $row the row to map onto the entity
-	 * @since 7.0.0
-	 */
-	public static function fromRow(array $row){
-		$instance = new static();
+    /**
+     * Maps the keys of the row array to the attributes
+     * @param array $row the row to map onto the entity
+     * @since 7.0.0
+     */
+    public static function fromRow(array $row){
+        $instance = new static();
 
-		foreach($row as $key => $value){
-			$prop = ucfirst($instance->columnToProperty($key));
-			$setter = 'set' . $prop;
-			$instance->$setter($value);
-		}
+        foreach($row as $key => $value){
+            $prop = ucfirst($instance->columnToProperty($key));
+            $setter = 'set' . $prop;
+            $instance->$setter($value);
+        }
 
-		$instance->resetUpdatedFields();
+        $instance->resetUpdatedFields();
 
-		return $instance;
-	}
+        return $instance;
+    }
 
 
-	/**
-	 * @return array with attribute and type
-	 * @since 7.0.0
-	 */
-	public function getFieldTypes() {
-		return $this->_fieldTypes;
-	}
+    /**
+     * @return array with attribute and type
+     * @since 7.0.0
+     */
+    public function getFieldTypes() {
+        return $this->_fieldTypes;
+    }
 
 	
-	/**
-	 * Marks the entity as clean needed for setting the id after the insertion
-	 * @since 7.0.0
-	 */
-	public function resetUpdatedFields(){
-		$this->_updatedFields = array();
-	}
-
-	/**
-	 * Generic setter for properties
-	 * @since 7.0.0
-	 */
-	protected function setter($name, $args) {
-		// setters should only work for existing attributes
-		if(property_exists($this, $name)){
-			if($this->$name === $args[0]) {
-				return;
-			}
-			$this->markFieldUpdated($name);
-
-			// if type definition exists, cast to correct type
-			if($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
-				settype($args[0], $this->_fieldTypes[$name]);
-			}
-			$this->$name = $args[0];
-
-		} else {
-			throw new \BadFunctionCallException($name . 
-				' is not a valid attribute');
-		}
-	}
-
-	/**
-	 * Generic getter for properties
-	 * @since 7.0.0
-	 */
-	protected function getter($name) {
-		// getters should only work for existing attributes
-		if(property_exists($this, $name)){
-			return $this->$name;
-		} else {
-			throw new \BadFunctionCallException($name . 
-				' is not a valid attribute');
-		}
-	}
-
-
-	/**
-	 * Each time a setter is called, push the part after set
-	 * into an array: for instance setId will save Id in the 
-	 * updated fields array so it can be easily used to create the
-	 * getter method
-	 * @since 7.0.0
-	 */
-	public function __call($methodName, $args){
-		$attr = lcfirst( substr($methodName, 3) );
-
-		if(strpos($methodName, 'set') === 0){
-			$this->setter($attr, $args);
-		} elseif(strpos($methodName, 'get') === 0) {
-			return $this->getter($attr);
-		} else {
-			throw new \BadFunctionCallException($methodName . 
-					' does not exist');
-		}
-
-	}
-
-
-	/**
-	 * Mark am attribute as updated
-	 * @param string $attribute the name of the attribute
-	 * @since 7.0.0
-	 */
-	protected function markFieldUpdated($attribute){
-		$this->_updatedFields[$attribute] = true;
-	}
-
-
-	/**
-	 * Transform a database columnname to a property 
-	 * @param string $columnName the name of the column
-	 * @return string the property name
-	 * @since 7.0.0
-	 */
-	public function columnToProperty($columnName){
-		$parts = explode('_', $columnName);
-		$property = null;
-
-		foreach($parts as $part){
-			if($property === null){
-				$property = $part;
-			} else {
-				$property .= ucfirst($part);
-			}
-		}
-
-		return $property;
-	}
-
-
-	/**
-	 * Transform a property to a database column name
-	 * @param string $property the name of the property
-	 * @return string the column name
-	 * @since 7.0.0
-	 */
-	public function propertyToColumn($property){
-		$parts = preg_split('/(?=[A-Z])/', $property);
-		$column = null;
-
-		foreach($parts as $part){
-			if($column === null){
-				$column = $part;
-			} else {
-				$column .= '_' . lcfirst($part);
-			}
-		}
-
-		return $column;
-	}
-
-
-	/**
-	 * @return array array of updated fields for update query
-	 * @since 7.0.0
-	 */
-	public function getUpdatedFields(){
-		return $this->_updatedFields;
-	}
-
-
-	/**
-	 * Adds type information for a field so that its automatically casted to
-	 * that value once its being returned from the database
-	 * @param string $fieldName the name of the attribute
-	 * @param string $type the type which will be used to call settype()
-	 * @since 7.0.0
-	 */
-	protected function addType($fieldName, $type){
-		$this->_fieldTypes[$fieldName] = $type;
-	}
-
-
-	/**
-	 * Slugify the value of a given attribute
-	 * Warning: This doesn't result in a unique value
-	 * @param string $attributeName the name of the attribute, which value should be slugified
-	 * @return string slugified value
-	 * @since 7.0.0
-	 */
-	public function slugify($attributeName){
-		// toSlug should only work for existing attributes
-		if(property_exists($this, $attributeName)){
-			$value = $this->$attributeName;
-			// replace everything except alphanumeric with a single '-'
-			$value = preg_replace('/[^A-Za-z0-9]+/', '-', $value);
-			$value = strtolower($value);
-			// trim '-'
-			return trim($value, '-');
-		} else {
-			throw new \BadFunctionCallException($attributeName .
-				' is not a valid attribute');
-		}
-	}
+    /**
+     * Marks the entity as clean needed for setting the id after the insertion
+     * @since 7.0.0
+     */
+    public function resetUpdatedFields(){
+        $this->_updatedFields = array();
+    }
+
+    /**
+     * Generic setter for properties
+     * @since 7.0.0
+     */
+    protected function setter($name, $args) {
+        // setters should only work for existing attributes
+        if(property_exists($this, $name)){
+            if($this->$name === $args[0]) {
+                return;
+            }
+            $this->markFieldUpdated($name);
+
+            // if type definition exists, cast to correct type
+            if($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
+                settype($args[0], $this->_fieldTypes[$name]);
+            }
+            $this->$name = $args[0];
+
+        } else {
+            throw new \BadFunctionCallException($name . 
+                ' is not a valid attribute');
+        }
+    }
+
+    /**
+     * Generic getter for properties
+     * @since 7.0.0
+     */
+    protected function getter($name) {
+        // getters should only work for existing attributes
+        if(property_exists($this, $name)){
+            return $this->$name;
+        } else {
+            throw new \BadFunctionCallException($name . 
+                ' is not a valid attribute');
+        }
+    }
+
+
+    /**
+     * Each time a setter is called, push the part after set
+     * into an array: for instance setId will save Id in the 
+     * updated fields array so it can be easily used to create the
+     * getter method
+     * @since 7.0.0
+     */
+    public function __call($methodName, $args){
+        $attr = lcfirst( substr($methodName, 3) );
+
+        if(strpos($methodName, 'set') === 0){
+            $this->setter($attr, $args);
+        } elseif(strpos($methodName, 'get') === 0) {
+            return $this->getter($attr);
+        } else {
+            throw new \BadFunctionCallException($methodName . 
+                    ' does not exist');
+        }
+
+    }
+
+
+    /**
+     * Mark am attribute as updated
+     * @param string $attribute the name of the attribute
+     * @since 7.0.0
+     */
+    protected function markFieldUpdated($attribute){
+        $this->_updatedFields[$attribute] = true;
+    }
+
+
+    /**
+     * Transform a database columnname to a property 
+     * @param string $columnName the name of the column
+     * @return string the property name
+     * @since 7.0.0
+     */
+    public function columnToProperty($columnName){
+        $parts = explode('_', $columnName);
+        $property = null;
+
+        foreach($parts as $part){
+            if($property === null){
+                $property = $part;
+            } else {
+                $property .= ucfirst($part);
+            }
+        }
+
+        return $property;
+    }
+
+
+    /**
+     * Transform a property to a database column name
+     * @param string $property the name of the property
+     * @return string the column name
+     * @since 7.0.0
+     */
+    public function propertyToColumn($property){
+        $parts = preg_split('/(?=[A-Z])/', $property);
+        $column = null;
+
+        foreach($parts as $part){
+            if($column === null){
+                $column = $part;
+            } else {
+                $column .= '_' . lcfirst($part);
+            }
+        }
+
+        return $column;
+    }
+
+
+    /**
+     * @return array array of updated fields for update query
+     * @since 7.0.0
+     */
+    public function getUpdatedFields(){
+        return $this->_updatedFields;
+    }
+
+
+    /**
+     * Adds type information for a field so that its automatically casted to
+     * that value once its being returned from the database
+     * @param string $fieldName the name of the attribute
+     * @param string $type the type which will be used to call settype()
+     * @since 7.0.0
+     */
+    protected function addType($fieldName, $type){
+        $this->_fieldTypes[$fieldName] = $type;
+    }
+
+
+    /**
+     * Slugify the value of a given attribute
+     * Warning: This doesn't result in a unique value
+     * @param string $attributeName the name of the attribute, which value should be slugified
+     * @return string slugified value
+     * @since 7.0.0
+     */
+    public function slugify($attributeName){
+        // toSlug should only work for existing attributes
+        if(property_exists($this, $attributeName)){
+            $value = $this->$attributeName;
+            // replace everything except alphanumeric with a single '-'
+            $value = preg_replace('/[^A-Za-z0-9]+/', '-', $value);
+            $value = strtolower($value);
+            // trim '-'
+            return trim($value, '-');
+        } else {
+            throw new \BadFunctionCallException($attributeName .
+                ' is not a valid attribute');
+        }
+    }
 
 }

Spacing +30 added lines, -30 removed lines

@@ -47,8 +47,8 @@ 
 	public static function fromParams(array $params) {
 		$instance = new static();
 
-		foreach($params as $key => $value) {
-			$method = 'set' . ucfirst($key);
+		foreach ($params as $key => $value) {
+			$method = 'set'.ucfirst($key);
 			$instance->$method($value);
 		}
 
@@ -61,12 +61,12 @@ 
 	 * @param array $row the row to map onto the entity
 	 * @since 7.0.0
 	 */
-	public static function fromRow(array $row){
+	public static function fromRow(array $row) {
 		$instance = new static();
 
-		foreach($row as $key => $value){
+		foreach ($row as $key => $value) {
 			$prop = ucfirst($instance->columnToProperty($key));
-			$setter = 'set' . $prop;
+			$setter = 'set'.$prop;
 			$instance->$setter($value);
 		}
 
@@ -89,7 +89,7 @@ 
 	 * Marks the entity as clean needed for setting the id after the insertion
 	 * @since 7.0.0
 	 */
-	public function resetUpdatedFields(){
+	public function resetUpdatedFields() {
 		$this->_updatedFields = array();
 	}
 
@@ -99,20 +99,20 @@ 
 	 */
 	protected function setter($name, $args) {
 		// setters should only work for existing attributes
-		if(property_exists($this, $name)){
-			if($this->$name === $args[0]) {
+		if (property_exists($this, $name)) {
+			if ($this->$name === $args[0]) {
 				return;
 			}
 			$this->markFieldUpdated($name);
 
 			// if type definition exists, cast to correct type
-			if($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
+			if ($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
 				settype($args[0], $this->_fieldTypes[$name]);
 			}
 			$this->$name = $args[0];
 
 		} else {
-			throw new \BadFunctionCallException($name . 
+			throw new \BadFunctionCallException($name. 
 				' is not a valid attribute');
 		}
 	}
@@ -123,10 +123,10 @@ 
 	 */
 	protected function getter($name) {
 		// getters should only work for existing attributes
-		if(property_exists($this, $name)){
+		if (property_exists($this, $name)) {
 			return $this->$name;
 		} else {
-			throw new \BadFunctionCallException($name . 
+			throw new \BadFunctionCallException($name. 
 				' is not a valid attribute');
 		}
 	}
@@ -139,15 +139,15 @@ 
 	 * getter method
 	 * @since 7.0.0
 	 */
-	public function __call($methodName, $args){
-		$attr = lcfirst( substr($methodName, 3) );
+	public function __call($methodName, $args) {
+		$attr = lcfirst(substr($methodName, 3));
 
-		if(strpos($methodName, 'set') === 0){
+		if (strpos($methodName, 'set') === 0) {
 			$this->setter($attr, $args);
-		} elseif(strpos($methodName, 'get') === 0) {
+		} elseif (strpos($methodName, 'get') === 0) {
 			return $this->getter($attr);
 		} else {
-			throw new \BadFunctionCallException($methodName . 
+			throw new \BadFunctionCallException($methodName. 
 					' does not exist');
 		}
 
@@ -159,7 +159,7 @@ 
 	 * @param string $attribute the name of the attribute
 	 * @since 7.0.0
 	 */
-	protected function markFieldUpdated($attribute){
+	protected function markFieldUpdated($attribute) {
 		$this->_updatedFields[$attribute] = true;
 	}
 
@@ -170,12 +170,12 @@ 
 	 * @return string the property name
 	 * @since 7.0.0
 	 */
-	public function columnToProperty($columnName){
+	public function columnToProperty($columnName) {
 		$parts = explode('_', $columnName);
 		$property = null;
 
-		foreach($parts as $part){
-			if($property === null){
+		foreach ($parts as $part) {
+			if ($property === null) {
 				$property = $part;
 			} else {
 				$property .= ucfirst($part);
@@ -192,15 +192,15 @@ 
 	 * @return string the column name
 	 * @since 7.0.0
 	 */
-	public function propertyToColumn($property){
+	public function propertyToColumn($property) {
 		$parts = preg_split('/(?=[A-Z])/', $property);
 		$column = null;
 
-		foreach($parts as $part){
-			if($column === null){
+		foreach ($parts as $part) {
+			if ($column === null) {
 				$column = $part;
 			} else {
-				$column .= '_' . lcfirst($part);
+				$column .= '_'.lcfirst($part);
 			}
 		}
 
@@ -212,7 +212,7 @@ 
 	 * @return array array of updated fields for update query
 	 * @since 7.0.0
 	 */
-	public function getUpdatedFields(){
+	public function getUpdatedFields() {
 		return $this->_updatedFields;
 	}
 
@@ -224,7 +224,7 @@ 
 	 * @param string $type the type which will be used to call settype()
 	 * @since 7.0.0
 	 */
-	protected function addType($fieldName, $type){
+	protected function addType($fieldName, $type) {
 		$this->_fieldTypes[$fieldName] = $type;
 	}
 
@@ -236,9 +236,9 @@ 
 	 * @return string slugified value
 	 * @since 7.0.0
 	 */
-	public function slugify($attributeName){
+	public function slugify($attributeName) {
 		// toSlug should only work for existing attributes
-		if(property_exists($this, $attributeName)){
+		if (property_exists($this, $attributeName)) {
 			$value = $this->$attributeName;
 			// replace everything except alphanumeric with a single '-'
 			$value = preg_replace('/[^A-Za-z0-9]+/', '-', $value);
@@ -246,7 +246,7 @@ 
 			// trim '-'
 			return trim($value, '-');
 		} else {
-			throw new \BadFunctionCallException($attributeName .
+			throw new \BadFunctionCallException($attributeName.
 				' is not a valid attribute');
 		}
 	}

lib/public/Share/IProviderFactory.php

Indentation +25 added lines, -25 removed lines

@@ -33,32 +33,32 @@
  */
 interface IProviderFactory {
 
-	/**
-	 * IProviderFactory constructor.
-	 * @param IServerContainer $serverContainer
-	 * @since 9.0.0
-	 */
-	public function __construct(IServerContainer $serverContainer);
+    /**
+     * IProviderFactory constructor.
+     * @param IServerContainer $serverContainer
+     * @since 9.0.0
+     */
+    public function __construct(IServerContainer $serverContainer);
 
-	/**
-	 * @param string $id
-	 * @return IShareProvider
-	 * @throws ProviderException
-	 * @since 9.0.0
-	 */
-	public function getProvider($id);
+    /**
+     * @param string $id
+     * @return IShareProvider
+     * @throws ProviderException
+     * @since 9.0.0
+     */
+    public function getProvider($id);
 
-	/**
-	 * @param int $shareType
-	 * @return IShareProvider
-	 * @throws ProviderException
-	 * @since 9.0.0
-	 */
-	public function getProviderForType($shareType);
+    /**
+     * @param int $shareType
+     * @return IShareProvider
+     * @throws ProviderException
+     * @since 9.0.0
+     */
+    public function getProviderForType($shareType);
 
-	/**
-	 * @return IShareProvider[]
-	 * @since 11.0.0
-	 */
-	public function getAllProviders();
+    /**
+     * @return IShareProvider[]
+     * @since 11.0.0
+     */
+    public function getAllProviders();
 }

lib/public/SabrePluginEvent.php

Indentation +53 added lines, -53 removed lines

@@ -33,65 +33,65 @@
  */
 class SabrePluginEvent extends Event {
 
-	/** @var int */
-	protected $statusCode;
+    /** @var int */
+    protected $statusCode;
 
-	/** @var string */
-	protected $message;
+    /** @var string */
+    protected $message;
 
-	/** @var Server */
-	protected $server;
+    /** @var Server */
+    protected $server;
 
-	/**
-	 * @since 8.2.0
-	 */
-	public function __construct($server = null) {
-		$this->message = '';
-		$this->statusCode = Http::STATUS_OK;
-		$this->server = $server;
-	}
+    /**
+     * @since 8.2.0
+     */
+    public function __construct($server = null) {
+        $this->message = '';
+        $this->statusCode = Http::STATUS_OK;
+        $this->server = $server;
+    }
 
-	/**
-	 * @param int $statusCode
-	 * @return self
-	 * @since 8.2.0
-	 */
-	public function setStatusCode($statusCode) {
-		$this->statusCode = (int) $statusCode;
-		return $this;
-	}
+    /**
+     * @param int $statusCode
+     * @return self
+     * @since 8.2.0
+     */
+    public function setStatusCode($statusCode) {
+        $this->statusCode = (int) $statusCode;
+        return $this;
+    }
 
-	/**
-	 * @param string $message
-	 * @return self
-	 * @since 8.2.0
-	 */
-	public function setMessage($message) {
-		$this->message = (string) $message;
-		return $this;
-	}
+    /**
+     * @param string $message
+     * @return self
+     * @since 8.2.0
+     */
+    public function setMessage($message) {
+        $this->message = (string) $message;
+        return $this;
+    }
 
-	/**
-	 * @return int
-	 * @since 8.2.0
-	 */
-	public function getStatusCode() {
-		return $this->statusCode;
-	}
+    /**
+     * @return int
+     * @since 8.2.0
+     */
+    public function getStatusCode() {
+        return $this->statusCode;
+    }
 
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getMessage() {
-		return $this->message;
-	}
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getMessage() {
+        return $this->message;
+    }
 
-	/**
-	 * @return null|Server
-	 * @since 9.0.0
-	 */
-	public function getServer() {
-		return $this->server;
-	}
+    /**
+     * @return null|Server
+     * @since 9.0.0
+     */
+    public function getServer() {
+        return $this->server;
+    }
 }

lib/public/RichObjectStrings/IValidator.php

Indentation +7 added lines, -7 removed lines

@@ -29,11 +29,11 @@
  */
 interface IValidator {
 
-	/**
-	 * @param string $subject
-	 * @param array[] $parameters
-	 * @throws InvalidObjectExeption
-	 * @since 11.0.0
-	 */
-	public function validate($subject, array $parameters);
+    /**
+     * @param string $subject
+     * @param array[] $parameters
+     * @throws InvalidObjectExeption
+     * @since 11.0.0
+     */
+    public function validate($subject, array $parameters);
 }

lib/public/DB/QueryBuilder/IQueryFunction.php

Indentation +5 added lines, -5 removed lines

@@ -26,9 +26,9 @@
  * @since 8.2.0
  */
 interface IQueryFunction {
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function __toString();
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function __toString();
 }

lib/public/DB/QueryBuilder/ILiteral.php

Indentation +5 added lines, -5 removed lines

@@ -26,9 +26,9 @@
  * @since 8.2.0
  */
 interface ILiteral {
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function __toString();
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function __toString();
 }

lib/public/DB/QueryBuilder/ICompositeExpression.php

Indentation +32 added lines, -32 removed lines

@@ -28,39 +28,39 @@
  * @since 8.2.0
  */
 interface ICompositeExpression {
-	/**
-	 * Adds multiple parts to composite expression.
-	 *
-	 * @param array $parts
-	 *
-	 * @return ICompositeExpression
-	 * @since 8.2.0
-	 */
-	public function addMultiple(array $parts = array());
+    /**
+     * Adds multiple parts to composite expression.
+     *
+     * @param array $parts
+     *
+     * @return ICompositeExpression
+     * @since 8.2.0
+     */
+    public function addMultiple(array $parts = array());
 
-	/**
-	 * Adds an expression to composite expression.
-	 *
-	 * @param mixed $part
-	 *
-	 * @return ICompositeExpression
-	 * @since 8.2.0
-	 */
-	public function add($part);
+    /**
+     * Adds an expression to composite expression.
+     *
+     * @param mixed $part
+     *
+     * @return ICompositeExpression
+     * @since 8.2.0
+     */
+    public function add($part);
 
-	/**
-	 * Retrieves the amount of expressions on composite expression.
-	 *
-	 * @return integer
-	 * @since 8.2.0
-	 */
-	public function count();
+    /**
+     * Retrieves the amount of expressions on composite expression.
+     *
+     * @return integer
+     * @since 8.2.0
+     */
+    public function count();
 
-	/**
-	 * Returns the type of this composite expression (AND/OR).
-	 *
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getType();
+    /**
+     * Returns the type of this composite expression (AND/OR).
+     *
+     * @return string
+     * @since 8.2.0
+     */
+    public function getType();
 }

lib/public/DB/QueryBuilder/IParameter.php

Indentation +5 added lines, -5 removed lines

@@ -26,9 +26,9 @@
  * @since 8.2.0
  */
 interface IParameter {
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function __toString();
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function __toString();
 }

lib/public/DB/QueryBuilder/IExpressionBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 	/**
 	 * @since 9.0.0
 	 */
-	const EQ  = ExpressionBuilder::EQ;
+	const EQ = ExpressionBuilder::EQ;
 	/**
 	 * @since 9.0.0
 	 */
@@ -43,7 +43,7 @@ 
 	/**
 	 * @since 9.0.0
 	 */
-	const LT  = ExpressionBuilder::LT;
+	const LT = ExpressionBuilder::LT;
 	/**
 	 * @since 9.0.0
 	 */
@@ -51,7 +51,7 @@ 
 	/**
 	 * @since 9.0.0
 	 */
-	const GT  = ExpressionBuilder::GT;
+	const GT = ExpressionBuilder::GT;
 	/**
 	 * @since 9.0.0
 	 */

Indentation +309 added lines, -309 removed lines

@@ -32,336 +32,336 @@
  * @since 8.2.0
  */
 interface IExpressionBuilder {
-	/**
-	 * @since 9.0.0
-	 */
-	const EQ  = ExpressionBuilder::EQ;
-	/**
-	 * @since 9.0.0
-	 */
-	const NEQ = ExpressionBuilder::NEQ;
-	/**
-	 * @since 9.0.0
-	 */
-	const LT  = ExpressionBuilder::LT;
-	/**
-	 * @since 9.0.0
-	 */
-	const LTE = ExpressionBuilder::LTE;
-	/**
-	 * @since 9.0.0
-	 */
-	const GT  = ExpressionBuilder::GT;
-	/**
-	 * @since 9.0.0
-	 */
-	const GTE = ExpressionBuilder::GTE;
+    /**
+     * @since 9.0.0
+     */
+    const EQ  = ExpressionBuilder::EQ;
+    /**
+     * @since 9.0.0
+     */
+    const NEQ = ExpressionBuilder::NEQ;
+    /**
+     * @since 9.0.0
+     */
+    const LT  = ExpressionBuilder::LT;
+    /**
+     * @since 9.0.0
+     */
+    const LTE = ExpressionBuilder::LTE;
+    /**
+     * @since 9.0.0
+     */
+    const GT  = ExpressionBuilder::GT;
+    /**
+     * @since 9.0.0
+     */
+    const GTE = ExpressionBuilder::GTE;
 
-	/**
-	 * 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
-	 * @since 8.2.0
-	 */
-	public function andX(...$x);
+    /**
+     * 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
+     * @since 8.2.0
+     */
+    public function andX(...$x);
 
-	/**
-	 * 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
-	 * @since 8.2.0
-	 */
-	public function orX(...$x);
+    /**
+     * 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
+     * @since 8.2.0
+     */
+    public function orX(...$x);
 
-	/**
-	 * 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
-	 * @since 8.2.0 - Parameter $type was added in 9.0.0
-	 */
-	public function comparison($x, $operator, $y, $type = null);
+    /**
+     * 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
+     * @since 8.2.0 - Parameter $type was added in 9.0.0
+     */
+    public function comparison($x, $operator, $y, $type = null);
 
-	/**
-	 * 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
-	 * @since 8.2.0 - Parameter $type was added in 9.0.0
-	 */
-	public function eq($x, $y, $type = null);
+    /**
+     * 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
+     * @since 8.2.0 - Parameter $type was added in 9.0.0
+     */
+    public function eq($x, $y, $type = null);
 
-	/**
-	 * 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
-	 * @since 8.2.0 - Parameter $type was added in 9.0.0
-	 */
-	public function neq($x, $y, $type = null);
+    /**
+     * 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
+     * @since 8.2.0 - Parameter $type was added in 9.0.0
+     */
+    public function neq($x, $y, $type = null);
 
-	/**
-	 * 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
-	 * @since 8.2.0 - Parameter $type was added in 9.0.0
-	 */
-	public function lt($x, $y, $type = null);
+    /**
+     * 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
+     * @since 8.2.0 - Parameter $type was added in 9.0.0
+     */
+    public function lt($x, $y, $type = null);
 
-	/**
-	 * 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
-	 * @since 8.2.0 - Parameter $type was added in 9.0.0
-	 */
-	public function lte($x, $y, $type = null);
+    /**
+     * 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
+     * @since 8.2.0 - Parameter $type was added in 9.0.0
+     */
+    public function lte($x, $y, $type = null);
 
-	/**
-	 * 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
-	 * @since 8.2.0 - Parameter $type was added in 9.0.0
-	 */
-	public function gt($x, $y, $type = null);
+    /**
+     * 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
+     * @since 8.2.0 - Parameter $type was added in 9.0.0
+     */
+    public function gt($x, $y, $type = null);
 
-	/**
-	 * 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
-	 * @since 8.2.0 - Parameter $type was added in 9.0.0
-	 */
-	public function gte($x, $y, $type = null);
+    /**
+     * 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
+     * @since 8.2.0 - Parameter $type was added in 9.0.0
+     */
+    public function gte($x, $y, $type = null);
 
-	/**
-	 * 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
-	 * @since 8.2.0
-	 */
-	public function 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
+     * @since 8.2.0
+     */
+    public function 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
-	 * @since 8.2.0
-	 */
-	public function 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
+     * @since 8.2.0
+     */
+    public function 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
-	 * @since 8.2.0 - Parameter $type was added in 9.0.0
-	 */
-	public function like($x, $y, $type = null);
+    /**
+     * 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
+     * @since 8.2.0 - Parameter $type was added in 9.0.0
+     */
+    public function like($x, $y, $type = null);
 
-	/**
-	 * 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
-	 * @since 8.2.0 - Parameter $type was added in 9.0.0
-	 */
-	public function notLike($x, $y, $type = null);
+    /**
+     * 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
+     * @since 8.2.0 - Parameter $type was added in 9.0.0
+     */
+    public function notLike($x, $y, $type = null);
 
-	/**
-	 * 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);
+    /**
+     * 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);
 
-	/**
-	 * 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
-	 * @since 8.2.0 - Parameter $type was added in 9.0.0
-	 */
-	public function in($x, $y, $type = null);
+    /**
+     * 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
+     * @since 8.2.0 - Parameter $type was added in 9.0.0
+     */
+    public function in($x, $y, $type = null);
 
-	/**
-	 * 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
-	 * @since 8.2.0 - Parameter $type was added in 9.0.0
-	 */
-	public function notIn($x, $y, $type = null);
+    /**
+     * 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
+     * @since 8.2.0 - Parameter $type was added in 9.0.0
+     */
+    public function notIn($x, $y, $type = null);
 
-	/**
-	 * 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);
+    /**
+     * 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);
 
-	/**
-	 * 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);
+    /**
+     * 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);
 
 
-	/**
-	 * Creates a bitwise AND comparison
-	 *
-	 * @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);
+    /**
+     * Creates a bitwise AND comparison
+     *
+     * @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);
 
-	/**
-	 * Creates a bitwise OR comparison
-	 *
-	 * @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);
+    /**
+     * Creates a bitwise OR comparison
+     *
+     * @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);
 
-	/**
-	 * Quotes a given input parameter.
-	 *
-	 * @param mixed $input The parameter to be quoted.
-	 * @param mixed|null $type One of the IQueryBuilder::PARAM_* constants
-	 *
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function literal($input, $type = null);
+    /**
+     * Quotes a given input parameter.
+     *
+     * @param mixed $input The parameter to be quoted.
+     * @param mixed|null $type One of the IQueryBuilder::PARAM_* constants
+     *
+     * @return string
+     * @since 8.2.0
+     */
+    public function literal($input, $type = null);
 
-	/**
-	 * Returns a IQueryFunction that casts the column to the given type
-	 *
-	 * @param string $column
-	 * @param mixed $type One of IQueryBuilder::PARAM_*
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function castColumn($column, $type);
+    /**
+     * Returns a IQueryFunction that casts the column to the given type
+     *
+     * @param string $column
+     * @param mixed $type One of IQueryBuilder::PARAM_*
+     * @return string
+     * @since 9.0.0
+     */
+    public function castColumn($column, $type);
 }