nextcloud / server

lib/public/AppFramework/Controller.php

Indentation +213 added lines, -213 removed lines

@@ -45,219 +45,219 @@
  */
 abstract class Controller {
 
-	/**
-	 * app name
-	 * @var string
-	 * @since 7.0.0
-	 */
-	protected $appName;
-
-	/**
-	 * current request
-	 * @var \OCP\IRequest
-	 * @since 6.0.0
-	 */
-	protected $request;
-
-	/**
-	 * @var array
-	 * @since 7.0.0
-	 */
-	private $responders;
-
-	/**
-	 * constructor of the controller
-	 * @param string $appName the name of the app
-	 * @param IRequest $request an instance of the request
-	 * @since 6.0.0 - parameter $appName was added in 7.0.0 - parameter $app was removed in 7.0.0
-	 */
-	public function __construct($appName,
-	                            IRequest $request) {
-		$this->appName = $appName;
-		$this->request = $request;
-
-		// default responders
-		$this->responders = array(
-			'json' => function ($data) {
-				if ($data instanceof DataResponse) {
-					$response = new JSONResponse(
-						$data->getData(),
-						$data->getStatus()
-					);
-					$dataHeaders = $data->getHeaders();
-					$headers = $response->getHeaders();
-					// do not overwrite Content-Type if it already exists
-					if (isset($dataHeaders['Content-Type'])) {
-						unset($headers['Content-Type']);
-					}
-					$response->setHeaders(array_merge($dataHeaders, $headers));
-					return $response;
-				}
-				return new JSONResponse($data);
-			}
-		);
-	}
-
-
-	/**
-	 * Parses an HTTP accept header and returns the supported responder type
-	 * @param string $acceptHeader
-	 * @return string the responder type
-	 * @since 7.0.0
-	 * @since 9.1.0 Added default parameter
-	 */
-	public function getResponderByHTTPHeader($acceptHeader, $default='json') {
-		$headers = explode(',', $acceptHeader);
-
-		// return the first matching responder
-		foreach ($headers as $header) {
-			$header = strtolower(trim($header));
-
-			$responder = str_replace('application/', '', $header);
-
-			if (array_key_exists($responder, $this->responders)) {
-				return $responder;
-			}
-		}
-
-		// no matching header return default
-		return $default;
-	}
-
-
-	/**
-	 * Registers a formatter for a type
-	 * @param string $format
-	 * @param \Closure $responder
-	 * @since 7.0.0
-	 */
-	protected function registerResponder($format, \Closure $responder) {
-		$this->responders[$format] = $responder;
-	}
-
-
-	/**
-	 * Serializes and formats a response
-	 * @param mixed $response the value that was returned from a controller and
-	 * is not a Response instance
-	 * @param string $format the format for which a formatter has been registered
-	 * @throws \DomainException if format does not match a registered formatter
-	 * @return Response
-	 * @since 7.0.0
-	 */
-	public function buildResponse($response, $format='json') {
-		if(array_key_exists($format, $this->responders)) {
-
-			$responder = $this->responders[$format];
-
-			return $responder($response);
-
-		}
-		throw new \DomainException('No responder registered for format '.
-			$format . '!');
-	}
-
-
-	/**
-	 * Lets you access post and get parameters by the index
-	 * @deprecated 7.0.0 write your parameters as method arguments instead
-	 * @param string $key the key which you want to access in the URL Parameter
-	 *                     placeholder, $_POST or $_GET array.
-	 *                     The priority how they're returned is the following:
-	 *                     1. URL parameters
-	 *                     2. POST parameters
-	 *                     3. GET parameters
-	 * @param string $default If the key is not found, this value will be returned
-	 * @return mixed the content of the array
-	 * @since 6.0.0
-	 */
-	public function params($key, $default=null){
-		return $this->request->getParam($key, $default);
-	}
-
-
-	/**
-	 * Returns all params that were received, be it from the request
-	 * (as GET or POST) or through the URL by the route
-	 * @deprecated 7.0.0 use $this->request instead
-	 * @return array the array with all parameters
-	 * @since 6.0.0
-	 */
-	public function getParams() {
-		return $this->request->getParams();
-	}
-
-
-	/**
-	 * Returns the method of the request
-	 * @deprecated 7.0.0 use $this->request instead
-	 * @return string the method of the request (POST, GET, etc)
-	 * @since 6.0.0
-	 */
-	public function method() {
-		return $this->request->getMethod();
-	}
-
-
-	/**
-	 * Shortcut for accessing an uploaded file through the $_FILES array
-	 * @deprecated 7.0.0 use $this->request instead
-	 * @param string $key the key that will be taken from the $_FILES array
-	 * @return array the file in the $_FILES element
-	 * @since 6.0.0
-	 */
-	public function getUploadedFile($key) {
-		return $this->request->getUploadedFile($key);
-	}
-
-
-	/**
-	 * Shortcut for getting env variables
-	 * @deprecated 7.0.0 use $this->request instead
-	 * @param string $key the key that will be taken from the $_ENV array
-	 * @return array the value in the $_ENV element
-	 * @since 6.0.0
-	 */
-	public function env($key) {
-		return $this->request->getEnv($key);
-	}
-
-
-	/**
-	 * Shortcut for getting cookie variables
-	 * @deprecated 7.0.0 use $this->request instead
-	 * @param string $key the key that will be taken from the $_COOKIE array
-	 * @return array the value in the $_COOKIE element
-	 * @since 6.0.0
-	 */
-	public function cookie($key) {
-		return $this->request->getCookie($key);
-	}
-
-
-	/**
-	 * Shortcut for rendering a template
-	 * @deprecated 7.0.0 return a template response instead
-	 * @param string $templateName the name of the template
-	 * @param array $params the template parameters in key => value structure
-	 * @param string $renderAs user renders a full page, blank only your template
-	 *                          admin an entry in the admin settings
-	 * @param string[] $headers set additional headers in name/value pairs
-	 * @return \OCP\AppFramework\Http\TemplateResponse containing the page
-	 * @since 6.0.0
-	 */
-	public function render($templateName, array $params=array(),
-							$renderAs='user', array $headers=array()){
-		$response = new TemplateResponse($this->appName, $templateName);
-		$response->setParams($params);
-		$response->renderAs($renderAs);
-
-		foreach($headers as $name => $value){
-			$response->addHeader($name, $value);
-		}
-
-		return $response;
-	}
+    /**
+     * app name
+     * @var string
+     * @since 7.0.0
+     */
+    protected $appName;
+
+    /**
+     * current request
+     * @var \OCP\IRequest
+     * @since 6.0.0
+     */
+    protected $request;
+
+    /**
+     * @var array
+     * @since 7.0.0
+     */
+    private $responders;
+
+    /**
+     * constructor of the controller
+     * @param string $appName the name of the app
+     * @param IRequest $request an instance of the request
+     * @since 6.0.0 - parameter $appName was added in 7.0.0 - parameter $app was removed in 7.0.0
+     */
+    public function __construct($appName,
+                                IRequest $request) {
+        $this->appName = $appName;
+        $this->request = $request;
+
+        // default responders
+        $this->responders = array(
+            'json' => function ($data) {
+                if ($data instanceof DataResponse) {
+                    $response = new JSONResponse(
+                        $data->getData(),
+                        $data->getStatus()
+                    );
+                    $dataHeaders = $data->getHeaders();
+                    $headers = $response->getHeaders();
+                    // do not overwrite Content-Type if it already exists
+                    if (isset($dataHeaders['Content-Type'])) {
+                        unset($headers['Content-Type']);
+                    }
+                    $response->setHeaders(array_merge($dataHeaders, $headers));
+                    return $response;
+                }
+                return new JSONResponse($data);
+            }
+        );
+    }
+
+
+    /**
+     * Parses an HTTP accept header and returns the supported responder type
+     * @param string $acceptHeader
+     * @return string the responder type
+     * @since 7.0.0
+     * @since 9.1.0 Added default parameter
+     */
+    public function getResponderByHTTPHeader($acceptHeader, $default='json') {
+        $headers = explode(',', $acceptHeader);
+
+        // return the first matching responder
+        foreach ($headers as $header) {
+            $header = strtolower(trim($header));
+
+            $responder = str_replace('application/', '', $header);
+
+            if (array_key_exists($responder, $this->responders)) {
+                return $responder;
+            }
+        }
+
+        // no matching header return default
+        return $default;
+    }
+
+
+    /**
+     * Registers a formatter for a type
+     * @param string $format
+     * @param \Closure $responder
+     * @since 7.0.0
+     */
+    protected function registerResponder($format, \Closure $responder) {
+        $this->responders[$format] = $responder;
+    }
+
+
+    /**
+     * Serializes and formats a response
+     * @param mixed $response the value that was returned from a controller and
+     * is not a Response instance
+     * @param string $format the format for which a formatter has been registered
+     * @throws \DomainException if format does not match a registered formatter
+     * @return Response
+     * @since 7.0.0
+     */
+    public function buildResponse($response, $format='json') {
+        if(array_key_exists($format, $this->responders)) {
+
+            $responder = $this->responders[$format];
+
+            return $responder($response);
+
+        }
+        throw new \DomainException('No responder registered for format '.
+            $format . '!');
+    }
+
+
+    /**
+     * Lets you access post and get parameters by the index
+     * @deprecated 7.0.0 write your parameters as method arguments instead
+     * @param string $key the key which you want to access in the URL Parameter
+     *                     placeholder, $_POST or $_GET array.
+     *                     The priority how they're returned is the following:
+     *                     1. URL parameters
+     *                     2. POST parameters
+     *                     3. GET parameters
+     * @param string $default If the key is not found, this value will be returned
+     * @return mixed the content of the array
+     * @since 6.0.0
+     */
+    public function params($key, $default=null){
+        return $this->request->getParam($key, $default);
+    }
+
+
+    /**
+     * Returns all params that were received, be it from the request
+     * (as GET or POST) or through the URL by the route
+     * @deprecated 7.0.0 use $this->request instead
+     * @return array the array with all parameters
+     * @since 6.0.0
+     */
+    public function getParams() {
+        return $this->request->getParams();
+    }
+
+
+    /**
+     * Returns the method of the request
+     * @deprecated 7.0.0 use $this->request instead
+     * @return string the method of the request (POST, GET, etc)
+     * @since 6.0.0
+     */
+    public function method() {
+        return $this->request->getMethod();
+    }
+
+
+    /**
+     * Shortcut for accessing an uploaded file through the $_FILES array
+     * @deprecated 7.0.0 use $this->request instead
+     * @param string $key the key that will be taken from the $_FILES array
+     * @return array the file in the $_FILES element
+     * @since 6.0.0
+     */
+    public function getUploadedFile($key) {
+        return $this->request->getUploadedFile($key);
+    }
+
+
+    /**
+     * Shortcut for getting env variables
+     * @deprecated 7.0.0 use $this->request instead
+     * @param string $key the key that will be taken from the $_ENV array
+     * @return array the value in the $_ENV element
+     * @since 6.0.0
+     */
+    public function env($key) {
+        return $this->request->getEnv($key);
+    }
+
+
+    /**
+     * Shortcut for getting cookie variables
+     * @deprecated 7.0.0 use $this->request instead
+     * @param string $key the key that will be taken from the $_COOKIE array
+     * @return array the value in the $_COOKIE element
+     * @since 6.0.0
+     */
+    public function cookie($key) {
+        return $this->request->getCookie($key);
+    }
+
+
+    /**
+     * Shortcut for rendering a template
+     * @deprecated 7.0.0 return a template response instead
+     * @param string $templateName the name of the template
+     * @param array $params the template parameters in key => value structure
+     * @param string $renderAs user renders a full page, blank only your template
+     *                          admin an entry in the admin settings
+     * @param string[] $headers set additional headers in name/value pairs
+     * @return \OCP\AppFramework\Http\TemplateResponse containing the page
+     * @since 6.0.0
+     */
+    public function render($templateName, array $params=array(),
+                            $renderAs='user', array $headers=array()){
+        $response = new TemplateResponse($this->appName, $templateName);
+        $response->setParams($params);
+        $response->renderAs($renderAs);
+
+        foreach($headers as $name => $value){
+            $response->addHeader($name, $value);
+        }
+
+        return $response;
+    }
 
 
 }

lib/public/AppFramework/ApiController.php

Indentation +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
      * defaults to 'Authorization, Content-Type, Accept'
      * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
      * request should be cached, defaults to 1728000 seconds
-	 * @since 7.0.0
+     * @since 7.0.0
      */
     public function __construct($appName,
                                 IRequest $request,
@@ -76,7 +76,7 @@ 
      * @NoAdminRequired
      * @NoCSRFRequired
      * @PublicPage
-	 * @since 7.0.0
+     * @since 7.0.0
      */
     public function preflightedCors() {
         if(isset($this->request->server['HTTP_ORIGIN'])) {

lib/public/AppFramework/Db/MultipleObjectsReturnedException.php

Indentation +8 added lines, -8 removed lines

@@ -32,13 +32,13 @@
  */
 class MultipleObjectsReturnedException extends \Exception {
 
-	/**
-	 * Constructor
-	 * @param string $msg the error message
-	 * @since 7.0.0
-	 */
-	public function __construct($msg){
-		parent::__construct($msg);
-	}
+    /**
+     * Constructor
+     * @param string $msg the error message
+     * @since 7.0.0
+     */
+    public function __construct($msg){
+        parent::__construct($msg);
+    }
 
 }

lib/public/AppFramework/Db/Mapper.php

Indentation +321 added lines, -321 removed lines

@@ -37,327 +37,327 @@
  */
 abstract class Mapper {
 
-	protected $tableName;
-	protected $entityClass;
-	protected $db;
-
-	/**
-	 * @param IDBConnection $db Instance of the Db abstraction layer
-	 * @param string $tableName the name of the table. set this to allow entity
-	 * @param string $entityClass the name of the entity that the sql should be
-	 * mapped to queries without using sql
-	 * @since 7.0.0
-	 */
-	public function __construct(IDBConnection $db, $tableName, $entityClass=null){
-		$this->db = $db;
-		$this->tableName = '*PREFIX*' . $tableName;
-
-		// if not given set the entity name to the class without the mapper part
-		// cache it here for later use since reflection is slow
-		if($entityClass === null) {
-			$this->entityClass = str_replace('Mapper', '', get_class($this));
-		} else {
-			$this->entityClass = $entityClass;
-		}
-	}
-
-
-	/**
-	 * @return string the table name
-	 * @since 7.0.0
-	 */
-	public function getTableName(){
-		return $this->tableName;
-	}
-
-
-	/**
-	 * Deletes an entity from the table
-	 * @param Entity $entity the entity that should be deleted
-	 * @return Entity the deleted entity
-	 * @since 7.0.0 - return value added in 8.1.0
-	 */
-	public function delete(Entity $entity){
-		$sql = 'DELETE FROM `' . $this->tableName . '` WHERE `id` = ?';
-		$stmt = $this->execute($sql, [$entity->getId()]);
-		$stmt->closeCursor();
-		return $entity;
-	}
-
-
-	/**
-	 * Creates a new entry in the db from an entity
-	 * @param Entity $entity the entity that should be created
-	 * @return Entity the saved entity with the set id
-	 * @since 7.0.0
-	 */
-	public function insert(Entity $entity){
-		// get updated fields to save, fields have to be set using a setter to
-		// be saved
-		$properties = $entity->getUpdatedFields();
-		$values = '';
-		$columns = '';
-		$params = [];
-
-		// build the fields
-		$i = 0;
-		foreach($properties as $property => $updated) {
-			$column = $entity->propertyToColumn($property);
-			$getter = 'get' . ucfirst($property);
-
-			$columns .= '`' . $column . '`';
-			$values .= '?';
-
-			// only append colon if there are more entries
-			if($i < count($properties)-1){
-				$columns .= ',';
-				$values .= ',';
-			}
-
-			$params[] = $entity->$getter();
-			$i++;
-
-		}
-
-		$sql = 'INSERT INTO `' . $this->tableName . '`(' .
-				$columns . ') VALUES(' . $values . ')';
-
-		$stmt = $this->execute($sql, $params);
-
-		$entity->setId((int) $this->db->lastInsertId($this->tableName));
-
-		$stmt->closeCursor();
-
-		return $entity;
-	}
-
-
-
-	/**
-	 * Updates an entry in the db from an entity
-	 * @throws \InvalidArgumentException if entity has no id
-	 * @param Entity $entity the entity that should be created
-	 * @return Entity the saved entity with the set id
-	 * @since 7.0.0 - return value was added in 8.0.0
-	 */
-	public function update(Entity $entity){
-		// if entity wasn't changed it makes no sense to run a db query
-		$properties = $entity->getUpdatedFields();
-		if(count($properties) === 0) {
-			return $entity;
-		}
-
-		// entity needs an id
-		$id = $entity->getId();
-		if($id === null){
-			throw new \InvalidArgumentException(
-				'Entity which should be updated has no id');
-		}
-
-		// get updated fields to save, fields have to be set using a setter to
-		// be saved
-		// do not update the id field
-		unset($properties['id']);
-
-		$columns = '';
-		$params = [];
-
-		// build the fields
-		$i = 0;
-		foreach($properties as $property => $updated) {
-
-			$column = $entity->propertyToColumn($property);
-			$getter = 'get' . ucfirst($property);
-
-			$columns .= '`' . $column . '` = ?';
-
-			// only append colon if there are more entries
-			if($i < count($properties)-1){
-				$columns .= ',';
-			}
-
-			$params[] = $entity->$getter();
-			$i++;
-		}
-
-		$sql = 'UPDATE `' . $this->tableName . '` SET ' .
-				$columns . ' WHERE `id` = ?';
-		$params[] = $id;
-
-		$stmt = $this->execute($sql, $params);
-		$stmt->closeCursor();
-
-		return $entity;
-	}
-
-	/**
-	 * Checks if an array is associative
-	 * @param array $array
-	 * @return bool true if associative
-	 * @since 8.1.0
-	 */
-	private function isAssocArray(array $array) {
-		return array_values($array) !== $array;
-	}
-
-	/**
-	 * Returns the correct PDO constant based on the value type
-	 * @param $value
-	 * @return int PDO constant
-	 * @since 8.1.0
-	 */
-	private function getPDOType($value) {
-		switch (gettype($value)) {
-			case 'integer':
-				return \PDO::PARAM_INT;
-			case 'boolean':
-				return \PDO::PARAM_BOOL;
-			default:
-				return \PDO::PARAM_STR;
-		}
-	}
-
-
-	/**
-	 * Runs an sql query
-	 * @param string $sql the prepare string
-	 * @param array $params the params which should replace the ? in the sql query
-	 * @param int $limit the maximum number of rows
-	 * @param int $offset from which row we want to start
-	 * @return \PDOStatement the database query result
-	 * @since 7.0.0
-	 */
-	protected function execute($sql, array $params=[], $limit=null, $offset=null){
-		$query = $this->db->prepare($sql, $limit, $offset);
-
-		if ($this->isAssocArray($params)) {
-			foreach ($params as $key => $param) {
-				$pdoConstant = $this->getPDOType($param);
-				$query->bindValue($key, $param, $pdoConstant);
-			}
-		} else {
-			$index = 1;  // bindParam is 1 indexed
-			foreach ($params as $param) {
-				$pdoConstant = $this->getPDOType($param);
-				$query->bindValue($index, $param, $pdoConstant);
-				$index++;
-			}
-		}
-
-		$result = $query->execute();
-
-		return $query;
-	}
-
-
-	/**
-	 * Returns an db result and throws exceptions when there are more or less
-	 * results
-	 * @see findEntity
-	 * @param string $sql the sql query
-	 * @param array $params the parameters of the sql query
-	 * @param int $limit the maximum number of rows
-	 * @param int $offset from which row we want to start
-	 * @throws DoesNotExistException if the item does not exist
-	 * @throws MultipleObjectsReturnedException if more than one item exist
-	 * @return array the result as row
-	 * @since 7.0.0
-	 */
-	protected function findOneQuery($sql, array $params=[], $limit=null, $offset=null){
-		$stmt = $this->execute($sql, $params, $limit, $offset);
-		$row = $stmt->fetch();
-
-		if($row === false || $row === null){
-			$stmt->closeCursor();
-			$msg = $this->buildDebugMessage(
-				'Did expect one result but found none when executing', $sql, $params, $limit, $offset
-			);
-			throw new DoesNotExistException($msg);
-		}
-		$row2 = $stmt->fetch();
-		$stmt->closeCursor();
-		//MDB2 returns null, PDO and doctrine false when no row is available
-		if( ! ($row2 === false || $row2 === null )) {
-			$msg = $this->buildDebugMessage(
-				'Did not expect more than one result when executing', $sql, $params, $limit, $offset
-			);
-			throw new MultipleObjectsReturnedException($msg);
-		} else {
-			return $row;
-		}
-	}
-
-	/**
-	 * Builds an error message by prepending the $msg to an error message which
-	 * has the parameters
-	 * @see findEntity
-	 * @param string $sql the sql query
-	 * @param array $params the parameters of the sql query
-	 * @param int $limit the maximum number of rows
-	 * @param int $offset from which row we want to start
-	 * @return string formatted error message string
-	 * @since 9.1.0
-	 */
-	private function buildDebugMessage($msg, $sql, array $params=[], $limit=null, $offset=null) {
-		return $msg .
-					': query "' .	$sql . '"; ' .
-					'parameters ' . print_r($params, true) . '; ' .
-					'limit "' . $limit . '"; '.
-					'offset "' . $offset . '"';
-	}
-
-
-	/**
-	 * Creates an entity from a row. Automatically determines the entity class
-	 * from the current mapper name (MyEntityMapper -> MyEntity)
-	 * @param array $row the row which should be converted to an entity
-	 * @return Entity the entity
-	 * @since 7.0.0
-	 */
-	protected function mapRowToEntity($row) {
-		return call_user_func($this->entityClass .'::fromRow', $row);
-	}
-
-
-	/**
-	 * Runs a sql query and returns an array of entities
-	 * @param string $sql the prepare string
-	 * @param array $params the params which should replace the ? in the sql query
-	 * @param int $limit the maximum number of rows
-	 * @param int $offset from which row we want to start
-	 * @return array all fetched entities
-	 * @since 7.0.0
-	 */
-	protected function findEntities($sql, array $params=[], $limit=null, $offset=null) {
-		$stmt = $this->execute($sql, $params, $limit, $offset);
-
-		$entities = [];
-
-		while($row = $stmt->fetch()){
-			$entities[] = $this->mapRowToEntity($row);
-		}
-
-		$stmt->closeCursor();
-
-		return $entities;
-	}
-
-
-	/**
-	 * Returns an db result and throws exceptions when there are more or less
-	 * results
-	 * @param string $sql the sql query
-	 * @param array $params the parameters of the sql query
-	 * @param int $limit the maximum number of rows
-	 * @param int $offset from which row we want to start
-	 * @throws DoesNotExistException if the item does not exist
-	 * @throws MultipleObjectsReturnedException if more than one item exist
-	 * @return Entity the entity
-	 * @since 7.0.0
-	 */
-	protected function findEntity($sql, array $params=[], $limit=null, $offset=null){
-		return $this->mapRowToEntity($this->findOneQuery($sql, $params, $limit, $offset));
-	}
+    protected $tableName;
+    protected $entityClass;
+    protected $db;
+
+    /**
+     * @param IDBConnection $db Instance of the Db abstraction layer
+     * @param string $tableName the name of the table. set this to allow entity
+     * @param string $entityClass the name of the entity that the sql should be
+     * mapped to queries without using sql
+     * @since 7.0.0
+     */
+    public function __construct(IDBConnection $db, $tableName, $entityClass=null){
+        $this->db = $db;
+        $this->tableName = '*PREFIX*' . $tableName;
+
+        // if not given set the entity name to the class without the mapper part
+        // cache it here for later use since reflection is slow
+        if($entityClass === null) {
+            $this->entityClass = str_replace('Mapper', '', get_class($this));
+        } else {
+            $this->entityClass = $entityClass;
+        }
+    }
+
+
+    /**
+     * @return string the table name
+     * @since 7.0.0
+     */
+    public function getTableName(){
+        return $this->tableName;
+    }
+
+
+    /**
+     * Deletes an entity from the table
+     * @param Entity $entity the entity that should be deleted
+     * @return Entity the deleted entity
+     * @since 7.0.0 - return value added in 8.1.0
+     */
+    public function delete(Entity $entity){
+        $sql = 'DELETE FROM `' . $this->tableName . '` WHERE `id` = ?';
+        $stmt = $this->execute($sql, [$entity->getId()]);
+        $stmt->closeCursor();
+        return $entity;
+    }
+
+
+    /**
+     * Creates a new entry in the db from an entity
+     * @param Entity $entity the entity that should be created
+     * @return Entity the saved entity with the set id
+     * @since 7.0.0
+     */
+    public function insert(Entity $entity){
+        // get updated fields to save, fields have to be set using a setter to
+        // be saved
+        $properties = $entity->getUpdatedFields();
+        $values = '';
+        $columns = '';
+        $params = [];
+
+        // build the fields
+        $i = 0;
+        foreach($properties as $property => $updated) {
+            $column = $entity->propertyToColumn($property);
+            $getter = 'get' . ucfirst($property);
+
+            $columns .= '`' . $column . '`';
+            $values .= '?';
+
+            // only append colon if there are more entries
+            if($i < count($properties)-1){
+                $columns .= ',';
+                $values .= ',';
+            }
+
+            $params[] = $entity->$getter();
+            $i++;
+
+        }
+
+        $sql = 'INSERT INTO `' . $this->tableName . '`(' .
+                $columns . ') VALUES(' . $values . ')';
+
+        $stmt = $this->execute($sql, $params);
+
+        $entity->setId((int) $this->db->lastInsertId($this->tableName));
+
+        $stmt->closeCursor();
+
+        return $entity;
+    }
+
+
+
+    /**
+     * Updates an entry in the db from an entity
+     * @throws \InvalidArgumentException if entity has no id
+     * @param Entity $entity the entity that should be created
+     * @return Entity the saved entity with the set id
+     * @since 7.0.0 - return value was added in 8.0.0
+     */
+    public function update(Entity $entity){
+        // if entity wasn't changed it makes no sense to run a db query
+        $properties = $entity->getUpdatedFields();
+        if(count($properties) === 0) {
+            return $entity;
+        }
+
+        // entity needs an id
+        $id = $entity->getId();
+        if($id === null){
+            throw new \InvalidArgumentException(
+                'Entity which should be updated has no id');
+        }
+
+        // get updated fields to save, fields have to be set using a setter to
+        // be saved
+        // do not update the id field
+        unset($properties['id']);
+
+        $columns = '';
+        $params = [];
+
+        // build the fields
+        $i = 0;
+        foreach($properties as $property => $updated) {
+
+            $column = $entity->propertyToColumn($property);
+            $getter = 'get' . ucfirst($property);
+
+            $columns .= '`' . $column . '` = ?';
+
+            // only append colon if there are more entries
+            if($i < count($properties)-1){
+                $columns .= ',';
+            }
+
+            $params[] = $entity->$getter();
+            $i++;
+        }
+
+        $sql = 'UPDATE `' . $this->tableName . '` SET ' .
+                $columns . ' WHERE `id` = ?';
+        $params[] = $id;
+
+        $stmt = $this->execute($sql, $params);
+        $stmt->closeCursor();
+
+        return $entity;
+    }
+
+    /**
+     * Checks if an array is associative
+     * @param array $array
+     * @return bool true if associative
+     * @since 8.1.0
+     */
+    private function isAssocArray(array $array) {
+        return array_values($array) !== $array;
+    }
+
+    /**
+     * Returns the correct PDO constant based on the value type
+     * @param $value
+     * @return int PDO constant
+     * @since 8.1.0
+     */
+    private function getPDOType($value) {
+        switch (gettype($value)) {
+            case 'integer':
+                return \PDO::PARAM_INT;
+            case 'boolean':
+                return \PDO::PARAM_BOOL;
+            default:
+                return \PDO::PARAM_STR;
+        }
+    }
+
+
+    /**
+     * Runs an sql query
+     * @param string $sql the prepare string
+     * @param array $params the params which should replace the ? in the sql query
+     * @param int $limit the maximum number of rows
+     * @param int $offset from which row we want to start
+     * @return \PDOStatement the database query result
+     * @since 7.0.0
+     */
+    protected function execute($sql, array $params=[], $limit=null, $offset=null){
+        $query = $this->db->prepare($sql, $limit, $offset);
+
+        if ($this->isAssocArray($params)) {
+            foreach ($params as $key => $param) {
+                $pdoConstant = $this->getPDOType($param);
+                $query->bindValue($key, $param, $pdoConstant);
+            }
+        } else {
+            $index = 1;  // bindParam is 1 indexed
+            foreach ($params as $param) {
+                $pdoConstant = $this->getPDOType($param);
+                $query->bindValue($index, $param, $pdoConstant);
+                $index++;
+            }
+        }
+
+        $result = $query->execute();
+
+        return $query;
+    }
+
+
+    /**
+     * Returns an db result and throws exceptions when there are more or less
+     * results
+     * @see findEntity
+     * @param string $sql the sql query
+     * @param array $params the parameters of the sql query
+     * @param int $limit the maximum number of rows
+     * @param int $offset from which row we want to start
+     * @throws DoesNotExistException if the item does not exist
+     * @throws MultipleObjectsReturnedException if more than one item exist
+     * @return array the result as row
+     * @since 7.0.0
+     */
+    protected function findOneQuery($sql, array $params=[], $limit=null, $offset=null){
+        $stmt = $this->execute($sql, $params, $limit, $offset);
+        $row = $stmt->fetch();
+
+        if($row === false || $row === null){
+            $stmt->closeCursor();
+            $msg = $this->buildDebugMessage(
+                'Did expect one result but found none when executing', $sql, $params, $limit, $offset
+            );
+            throw new DoesNotExistException($msg);
+        }
+        $row2 = $stmt->fetch();
+        $stmt->closeCursor();
+        //MDB2 returns null, PDO and doctrine false when no row is available
+        if( ! ($row2 === false || $row2 === null )) {
+            $msg = $this->buildDebugMessage(
+                'Did not expect more than one result when executing', $sql, $params, $limit, $offset
+            );
+            throw new MultipleObjectsReturnedException($msg);
+        } else {
+            return $row;
+        }
+    }
+
+    /**
+     * Builds an error message by prepending the $msg to an error message which
+     * has the parameters
+     * @see findEntity
+     * @param string $sql the sql query
+     * @param array $params the parameters of the sql query
+     * @param int $limit the maximum number of rows
+     * @param int $offset from which row we want to start
+     * @return string formatted error message string
+     * @since 9.1.0
+     */
+    private function buildDebugMessage($msg, $sql, array $params=[], $limit=null, $offset=null) {
+        return $msg .
+                    ': query "' .	$sql . '"; ' .
+                    'parameters ' . print_r($params, true) . '; ' .
+                    'limit "' . $limit . '"; '.
+                    'offset "' . $offset . '"';
+    }
+
+
+    /**
+     * Creates an entity from a row. Automatically determines the entity class
+     * from the current mapper name (MyEntityMapper -> MyEntity)
+     * @param array $row the row which should be converted to an entity
+     * @return Entity the entity
+     * @since 7.0.0
+     */
+    protected function mapRowToEntity($row) {
+        return call_user_func($this->entityClass .'::fromRow', $row);
+    }
+
+
+    /**
+     * Runs a sql query and returns an array of entities
+     * @param string $sql the prepare string
+     * @param array $params the params which should replace the ? in the sql query
+     * @param int $limit the maximum number of rows
+     * @param int $offset from which row we want to start
+     * @return array all fetched entities
+     * @since 7.0.0
+     */
+    protected function findEntities($sql, array $params=[], $limit=null, $offset=null) {
+        $stmt = $this->execute($sql, $params, $limit, $offset);
+
+        $entities = [];
+
+        while($row = $stmt->fetch()){
+            $entities[] = $this->mapRowToEntity($row);
+        }
+
+        $stmt->closeCursor();
+
+        return $entities;
+    }
+
+
+    /**
+     * Returns an db result and throws exceptions when there are more or less
+     * results
+     * @param string $sql the sql query
+     * @param array $params the parameters of the sql query
+     * @param int $limit the maximum number of rows
+     * @param int $offset from which row we want to start
+     * @throws DoesNotExistException if the item does not exist
+     * @throws MultipleObjectsReturnedException if more than one item exist
+     * @return Entity the entity
+     * @since 7.0.0
+     */
+    protected function findEntity($sql, array $params=[], $limit=null, $offset=null){
+        return $this->mapRowToEntity($this->findOneQuery($sql, $params, $limit, $offset));
+    }
 
 
 }

lib/public/AppFramework/Db/DoesNotExistException.php

Indentation +8 added lines, -8 removed lines

@@ -32,13 +32,13 @@
  */
 class DoesNotExistException extends \Exception {
 
-	/**
-	 * Constructor
-	 * @param string $msg the error message
-	 * @since 7.0.0
-	 */
-	public function __construct($msg){
-		parent::__construct($msg);
-	}
+    /**
+     * Constructor
+     * @param string $msg the error message
+     * @since 7.0.0
+     */
+    public function __construct($msg){
+        parent::__construct($msg);
+    }
 
 }

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');
+        }
+    }
 
 }

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/Share/Exceptions/GenericShareException.php

Indentation +13 added lines, -13 removed lines

@@ -31,18 +31,18 @@
  */
 class GenericShareException extends HintException {
 
-	/**
-	 * @param string $message
-	 * @param string $hint
-	 * @param int $code
-	 * @param \Exception $previous
-	 * @since 9.0.0
-	 */
-	public function __construct($message = '', $hint = '', $code = 0, \Exception $previous = null) {
-		if (empty($message)) {
-			$message = 'Unspecified share exception';
-		}
-		parent::__construct($message, $hint, $code, $previous);
-	}
+    /**
+     * @param string $message
+     * @param string $hint
+     * @param int $code
+     * @param \Exception $previous
+     * @since 9.0.0
+     */
+    public function __construct($message = '', $hint = '', $code = 0, \Exception $previous = null) {
+        if (empty($message)) {
+            $message = 'Unspecified share exception';
+        }
+        parent::__construct($message, $hint, $code, $previous);
+    }
 
 }

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;
+    }
 }